Changeset 41219 for titan/libeplayer3/container/container_ffmpeg.c

Timestamp:

11/20/17 17:42:27 (6 years ago)

Author:

obi

Message:

update libeplayer3 v36

File:

• titan/libeplayer3/container/container_ffmpeg.c (modified) (9 diffs)

titan/libeplayer3/container/container_ffmpeg.c

@@ -142 +142 @@
 static int64_t seek_target_seconds = 0;
 static int8_t do_seek_target_seconds = 0;
+static int64_t prev_seek_time_sec = -1;
 
 static int32_t seek_target_flag = 0;
@@ -198 +199 @@
 static int32_t rtmp_proto_impl = 0; // 0 - auto, 1 - native, 2 - librtmp
 
+static int32_t g_sel_program_id = -1;
+
 #ifdef HAVE_FLV2MPEG4_CONVERTER
 static int32_t flv2mpeg4_converter = 1;
@@ -214 +217 @@
 
 static int32_t mutexInitialized = 0;
+
+void sel_program_id_set(const int32_t val)
+{
+    g_sel_program_id = val;
+}
 
 void wma_software_decoder_set(const int32_t val)
@@ -616 +624 @@
                 ffmpeg_printf(10, "seek_target_seconds[%lld]\n", seek_target_seconds);
                 uint32_t i = 0;
-                for(i=0; i<IPTV_AV_CONTEXT_MAX_NUM; i+=1)
+                for(; i<IPTV_AV_CONTEXT_MAX_NUM; i+=1)
                 {
                     if(NULL != avContextTab[i])
                     {
+                        if (i == 1)
+                        {
+                            prev_seek_time_sec = seek_target_seconds;
+                        }
                         if (avContextTab[i]->start_time != AV_NOPTS_VALUE)
                         {
@@ -654 +666 @@
                 if(NULL != avContextTab[i])
                 {
-                    wrapped_avcodec_flush_buffers(i);
+                    if (i != 1)
+                    {
+                        wrapped_avcodec_flush_buffers(i);
+                    }
                 }
                 else
@@ -680 +695 @@
             {
                 cAVIdx = currentVideoPts <= currentAudioPts ? 0 : 1;
+                if (1 == cAVIdx && prev_seek_time_sec >= 0 )
+                {
+                    avformat_seek_file(avContextTab[1], -1, (currentVideoPts / 90000) * AV_TIME_BASE - AV_TIME_BASE, (currentVideoPts / 90000) * AV_TIME_BASE, (currentVideoPts / 90000) * AV_TIME_BASE + AV_TIME_BASE, 0);
+                    prev_seek_time_sec = -1;
+                    wrapped_avcodec_flush_buffers(1);
+                }
             }
             else
@@ -1869 +1890 @@
     if(ostrstr(tmpstr, "debuglevel=99") != NULL)
         av_log_set_level( AV_LOG_DEBUG );
-        free(tmpstr), tmpstr = NULL;
+    else
+        av_log_set_callback(ffmpeg_silen_callback);
+    free(tmpstr), tmpstr = NULL;
 //obi (end) 
     // SULGE DEBUG ENABLED
     // make ffmpeg silen
     //av_log_set_level( AV_LOG_DEBUG );
-    av_log_set_callback(ffmpeg_silen_callback);
+    //av_log_set_callback(ffmpeg_silen_callback);
  
     context->playback->abortRequested = 0;
@@ -1950 +1973 @@
         }
         AVFormatContext *avContext = avContextTab[cAVIdx];
+        uint32_t *stream_index = NULL;
+        uint32_t nb_stream_indexes = 0;
+        
         ffmpeg_printf(1, "cAVIdx[%d]: number of streams: %d\n", cAVIdx, avContext->nb_streams);
+        
+        if (avContext->nb_programs > 0)
+        {
+            uint32_t n = 0;
+            ffmpeg_printf(1, "cAVIdx[%d]: stream with multi programs: num of programs %d\n", cAVIdx, avContext->nb_programs);
+            for (n = 0; n < avContext->nb_programs && (0 == nb_stream_indexes || stream_index == NULL); n++)
+            {
+                AVProgram *p = avContext->programs[n];
+                if (p->nb_stream_indexes)
+                {
+                    if (g_sel_program_id > 0)
+                    {
+                        if (g_sel_program_id == p->id)
+                        {
+                            stream_index = p->stream_index;
+                            nb_stream_indexes = p->nb_stream_indexes;
+                            ffmpeg_printf(1, "cAVIdx[%d]: select PROGRAM ID: %d\n", cAVIdx, (int32_t)p->id);
+                            break;
+                        }
+                    }
+                    else
+                    {
+                        uint32_t m = 0;
+                        for (m = 0; m < p->nb_stream_indexes; m++)
+                        {
+                            AVStream *s = avContext->streams[p->stream_index[m]];
+                            if (get_codecpar(s)->codec_type == AVMEDIA_TYPE_VIDEO && get_codecpar(s)->width > 0)
+                            {
+                                ffmpeg_printf(1, "cAVIdx[%d]: PROGRAM ID: %d, width [%d]\n", cAVIdx, (int32_t)p->id, (int32_t)get_codecpar(s)->width);
+                                stream_index = p->stream_index;
+                                nb_stream_indexes = p->nb_stream_indexes;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
         
         int32_t n = 0;
@@ -1958 +2022 @@
             AVStream *stream = avContext->streams[n];
             int32_t version = 0;
-
-            char *encoding = Codec2Encoding((int32_t)get_codecpar(stream)->codec_id, (int32_t)get_codecpar(stream)->codec_type, \
-                                            (uint8_t *)get_codecpar(stream)->extradata, \
-                                            (int)get_codecpar(stream)->extradata_size, \
-                                            (int)get_codecpar(stream)->profile, &version);
+            char *encoding = NULL;
+            
+            if (nb_stream_indexes > 0 && stream_index != NULL)
+            {
+                uint32_t isStreamFromSelProg = 0;
+                uint32_t m = 0;
+                for (m = 0; m < nb_stream_indexes; m++)
+                {
+                    if (n == stream_index[m]) 
+                    {
+                        isStreamFromSelProg = 1;
+                        break;
+                    }
+                }
+                
+                if (!isStreamFromSelProg)
+                    continue; // skip this stream
+            }
+
+            encoding = Codec2Encoding((int32_t)get_codecpar(stream)->codec_id, (int32_t)get_codecpar(stream)->codec_type, \
+                                      (uint8_t *)get_codecpar(stream)->extradata, \
+                                      (int)get_codecpar(stream)->extradata_size, \
+                                      (int)get_codecpar(stream)->profile, &version);
             
             if(encoding != NULL && !strncmp(encoding, "A_IPCM", 6) && insert_pcm_as_lpcm)