https://github.com/bilibili/ijkplayer/pull/5366

TsubakiDev · May 13, 2024 · 01d1261 · 01d1261
1 parent 90966b1
commit 01d1261
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c
@@ -4837,20 +4837,24 @@ int ffp_set_stream_selected(FFPlayer *ffp, int stream, int selected)
     VideoState        *is = ffp->is;
     AVFormatContext   *ic = NULL;
     AVCodecParameters *codecpar = NULL;
-    if (!is)
-        return -1;
-    ic = is->ic;
-    if (!ic)
+    if (!is || !is->ic)
         return -1;
 
+    ic = is->ic;
     if (stream < 0 || stream >= ic->nb_streams) {
         av_log(ffp, AV_LOG_ERROR, "invalid stream index %d >= stream number (%d)\n", stream, ic->nb_streams);
         return -1;
     }
 
     codecpar = ic->streams[stream]->codecpar;
+    long current_pos = ffp_get_current_position_l(ffp);
 
     if (selected) {
+        if (stream == is->video_stream || stream == is->audio_stream || stream == is->subtitle_stream) {
+            av_log(ffp, AV_LOG_ERROR, "stream has been selected\n");
+            return 0;
+        }
+
         switch (codecpar->codec_type) {
             case AVMEDIA_TYPE_VIDEO:
                 if (stream != is->video_stream && is->video_stream >= 0)
@@ -4868,7 +4872,10 @@ int ffp_set_stream_selected(FFPlayer *ffp, int stream, int selected)
                 av_log(ffp, AV_LOG_ERROR, "select invalid stream %d of video type %d\n", stream, codecpar->codec_type);
                 return -1;
         }
-        return stream_component_open(ffp, stream);
+
+        int ret = stream_component_open(ffp, stream);
+        ffp_seek_to_l(ffp, current_pos);
+        return ret;
     } else {
         switch (codecpar->codec_type) {
             case AVMEDIA_TYPE_VIDEO:
@@ -4884,7 +4891,7 @@ int ffp_set_stream_selected(FFPlayer *ffp, int stream, int selected)
                     stream_component_close(ffp, is->subtitle_stream);
                 break;
             default:
-                av_log(ffp, AV_LOG_ERROR, "select invalid stream %d of audio type %d\n", stream, codecpar->codec_type);
+                av_log(ffp, AV_LOG_ERROR, "unselect invalid stream %d of audio type %d\n", stream, codecpar->codec_type);
                 return -1;
         }
         return 0;

diff --git a/ijkmedia/ijkplayer/ijkmeta.c b/ijkmedia/ijkplayer/ijkmeta.c
@@ -227,6 +227,7 @@ void ijkmeta_set_avformat_context_l(IjkMediaMeta *meta, AVFormatContext *ic)
         if (bitrate > 0) {
             ijkmeta_set_int64_l(stream_meta, IJKM_KEY_BITRATE, bitrate);
         }
+        ijkmeta_set_int64_l(stream_meta, IJKM_KEY_STREAM_INDEX, st->index);
 
         switch (codecpar->codec_type) {
             case AVMEDIA_TYPE_VIDEO: {

diff --git a/ijkmedia/ijkplayer/ijkmeta.h b/ijkmedia/ijkplayer/ijkmeta.h
@@ -43,6 +43,7 @@
 #define IJKM_VAL_TYPE__TIMEDTEXT "timedtext"
 #define IJKM_VAL_TYPE__UNKNOWN  "unknown"
 #define IJKM_KEY_LANGUAGE       "language"
+#define IJKM_KEY_STREAM_INDEX   "index"
 
 #define IJKM_KEY_CODEC_NAME         "codec_name"
 #define IJKM_KEY_CODEC_PROFILE      "codec_profile"

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.h b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.h
@@ -41,6 +41,8 @@
 #define k_IJKM_KEY_CODEC_NAME      @"codec_name"
 #define k_IJKM_KEY_CODEC_PROFILE   @"codec_profile"
 #define k_IJKM_KEY_CODEC_LONG_NAME @"codec_long_name"
+#define k_IJKM_KEY_LANGUAGE        @"language"
+#define k_IJKM_KEY_STREAM_INDEX    @"index"
 
 // stream: video
 #define k_IJKM_KEY_WIDTH          @"width"

diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
@@ -1091,6 +1091,7 @@ - (void)postEvent: (IJKFFMoviePlayerMessage *)msg
                             fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_CODEC_PROFILE, nil);
                             fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_CODEC_LONG_NAME, nil);
                             fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_BITRATE, nil);
+                            fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_STREAM_INDEX, nil);
 
                             if (0 == strcmp(type, IJKM_VAL_TYPE__VIDEO)) {
                                 fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_WIDTH, nil);
@@ -1116,10 +1117,13 @@ - (void)postEvent: (IJKFFMoviePlayerMessage *)msg
                             } else if (0 == strcmp(type, IJKM_VAL_TYPE__AUDIO)) {
                                 fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_SAMPLE_RATE, nil);
                                 fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_CHANNEL_LAYOUT, nil);
+                                fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_LANGUAGE, nil);
 
                                 if (audio_stream == i) {
                                     _monitor.audioMeta = streamMeta;
                                 }
+                            } else if (0 == strcmp(type, IJKM_VAL_TYPE__TIMEDTEXT)) {
+                                fillMetaInternal(streamMeta, streamRawMeta, IJKM_KEY_LANGUAGE, nil);
                             }
                         }
                     }