Mercurial > libavformat.hg

changeset 5116:c4e22fecdcaa libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Stop parsing in read_header only after finding pmt, and do not close pat filter so further pmt can be parsed. Fix issue #1294.
author bcoudurier
date Wed, 29 Jul 2009 02:17:08 +0000
parents 640c875b3bfe
children 0a1a6377ec5d
files mpegts.c
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mpegts.c	Tue Jul 28 17:51:12 2009 +0000
+++ b/mpegts.c	Wed Jul 29 02:17:08 2009 +0000
@@ -640,6 +640,11 @@
     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 @@
         p = desc_list_end;
     }
     /* all parameters are there */
-    ts->stop_parse++;
     mpegts_close_filter(ts, filter);
 }
 
@@ -762,17 +766,12 @@
             /* 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)