[FFmpeg-cvslog] r19530 - trunk/libavformat/mpegts.c

bcoudurier subversion
Wed Jul 29 04:17:08 CEST 2009


Author: bcoudurier
Date: Wed Jul 29 04:17:08 2009
New Revision: 19530

Log:
Stop parsing in read_header only after finding pmt, and
do not close pat filter so further pmt can be parsed.
Fix issue #1294.

Modified:
   trunk/libavformat/mpegts.c

Modified: trunk/libavformat/mpegts.c
==============================================================================
--- trunk/libavformat/mpegts.c	Tue Jul 28 19:51:12 2009	(r19529)
+++ trunk/libavformat/mpegts.c	Wed Jul 29 04:17:08 2009	(r19530)
@@ -640,6 +640,11 @@ static void pmt_cb(MpegTSFilter *filter,
     p += program_info_length;
     if (p >= p_end)
         return;
+
+    // stop parsing after pmt, we found header
+    if (!ts->stream->nb_streams)
+        ts->stop_parse = 1;
+
     for(;;) {
         st = 0;
         stream_type = get8(&p, p_end);
@@ -725,7 +730,6 @@ static void pmt_cb(MpegTSFilter *filter,
         p = desc_list_end;
     }
     /* all parameters are there */
-    ts->stop_parse++;
     mpegts_close_filter(ts, filter);
 }
 
@@ -762,17 +766,12 @@ static void pat_cb(MpegTSFilter *filter,
             /* NIT info */
         } else {
             av_new_program(ts->stream, sid);
-            ts->stop_parse--;
             mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);
             add_pat_entry(ts, sid);
             add_pid_to_pmt(ts, sid, 0); //add pat pid to program
             add_pid_to_pmt(ts, sid, pmt_pid);
         }
     }
-    /* not found */
-    ts->stop_parse++;
-
-    mpegts_close_filter(ts, filter);
 }
 
 static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len)



More information about the ffmpeg-cvslog mailing list