diff mbox series

[FFmpeg-devel,v1] avformat/mpegts: fix avformat_find_stream_info take too time with open single video/audio TS stream

Message ID TYCP286MB2608ADF800E6A464B1BB9F4BC7CF9@TYCP286MB2608.JPNP286.PROD.OUTLOOK.COM
State New
Headers show
Series [FFmpeg-devel,v1] avformat/mpegts: fix avformat_find_stream_info take too time with open single video/audio TS stream | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

gaojiangjie@live.com May 16, 2022, 11:35 a.m. UTC 
From: Jiangjie Gao <gaojiangjie@live.com>

1. ref https://trac.ffmpeg.org/ticket/9782.
2. just check `codec_type`.
3. remove `pos > 100000`, we have AVFormatContext::probesize.

Signed-off-by: Jiangjie Gao <gaojiangjie@live.com>
---
 libavformat/mpegts.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 6e761c07f1..80ffee0f41 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2870,13 +2870,12 @@  static int handle_packet(MpegTSContext *ts, const uint8_t *packet, int64_t pos)
                     break;
             }
             if (i == ts->nb_prg && ts->nb_prg > 0) {
-                int types = 0;
                 for (i = 0; i < ts->stream->nb_streams; i++) {
                     AVStream *st = ts->stream->streams[i];
-                    if (st->codecpar->codec_type >= 0)
-                        types |= 1<<st->codecpar->codec_type;
+                    if (st->codecpar->codec_type < 0)
+                        break;
                 }
-                if ((types & (1<<AVMEDIA_TYPE_AUDIO) && types & (1<<AVMEDIA_TYPE_VIDEO)) || pos > 100000) {
+                if (i == ts->stream->nb_streams) {
                     av_log(ts->stream, AV_LOG_DEBUG, "All programs have pmt, headers found\n");
                     ts->stream->ctx_flags &= ~AVFMTCTX_NOHEADER;
                 }