From patchwork Tue May 7 03:27:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 13021 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id BBBE14484D7 for ; Tue, 7 May 2019 06:34:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9D9F668ACF8; Tue, 7 May 2019 06:34:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A02B68ACF8 for ; Tue, 7 May 2019 06:34:12 +0300 (EEST) Received: by mail-oi1-f193.google.com with SMTP id r136so2631256oie.7 for ; Mon, 06 May 2019 20:34:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pNyN6k0hm+dI10x1QEWjVJejQQq1H6gXCqsfQhHbIxg=; b=jZeEze/b5O7kPSOhecx/14Jnh2KoeEjxNh93vlRcXaLbOqgu/fKnLq2qv6XnaEWwRj cfGDVJkUW3kaiARPqvJMwk3VTMpz75wAf33s2SwA0grrdMNk4ITQgeH9uUNgYpLU197B DHrRcbJ4cgtAuQzf/CjtHWzncxGIxKYS++YZHP+gJ+BMNb7tO35LqweBMh/8DKZOfN9B IVqzEFahNG7ZWXD/ZtwlwUMlVG6erpOsnYXdupqIMnQfVEAbWisB/XKWIT+hUFX26g2k bcHT0V0PPsGpb3/k4K0PnHJD+doY/JK2jBfoHnKknFWe+NTk6Sn/4e9xwj16KKjjmsI2 4MOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=pNyN6k0hm+dI10x1QEWjVJejQQq1H6gXCqsfQhHbIxg=; b=TKSai5auiqgeiO/54AM35K70PwaQfUvWxTUhLXRt1CmeT5wVP/EENTeYoFTHezaAjj qxbtH7WwjSPTk9xLsaqdjrT+RZMBAQxznmGWrCeVbF2LzHQAtiuLX2iPMhVU1fRK8LjL v8tYKNu+oo6lSAwNLA1dm1MDf44Vi793xzVV1W3KlDcFMLJo1pnb4NruDkA9UFeDN4xm DBtZQ5Nrk445sy9V1ndT9na9IFPTIdafhsR23gGNBQMkdmINyi4qg3rRpNzFrhMxbFlU XY4MEMrCgij9rgNQvh+MLqzkZqLM2A0Pmy54s+SFp8Vuk9c+RkT2AHxOxmzIRf6sNj9v 6Efw== X-Gm-Message-State: APjAAAUsjTtsh14TW+4fA5FnNdQD8gKJELfeIHJ1OlFOrguMv9Y3Dzkf b9gSAYnq4lFwBRmKlViMfh7TelSvlOS+lw== X-Google-Smtp-Source: APXvYqx4qv6MmraSNC+ImAdto1s0av39jAggVTSCwSCbSGMx4wCloB+xzwRl+6BQglNO6xz2rGRSTQ== X-Received: by 2002:aca:3405:: with SMTP id b5mr1013337oia.40.1557199653485; Mon, 06 May 2019 20:27:33 -0700 (PDT) Received: from tmm1-imac.lan (ip184-189-221-177.sb.sd.cox.net. [184.189.221.177]) by smtp.gmail.com with ESMTPSA id w131sm5251651oig.29.2019.05.06.20.27.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 May 2019 20:27:32 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 May 2019 20:27:26 -0700 Message-Id: <20190507032726.80597-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mpegts: apply -merge_pmt_versions only when versions change X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Aman Gupta Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Previously the code assumed that stream_identifier was unique per stream in the PMT, as suggested by the spec. However, I found some samples from Finland MTV3 where this is not the case. PID 0231 ( 561) -> Stream type 04 ( 4) 13818-3 audio (MPEG-2) ES info (17 bytes): 0a 04 66 69 6e 00 52 01 29 03 01 67 0e 03 c0 01 f6 Languages: fin Stream Identifier (82) (1 byte): 29 Audio stream (3) (1 byte): 67 Maximum bitrate (14) (3 bytes): c0 01 f6 PID 0234 ( 564) -> Stream type 04 ( 4) 13818-3 audio (MPEG-2) ES info (17 bytes): 0a 04 64 75 74 03 52 01 29 03 01 67 0e 03 c0 01 59 Languages: dut/visual impaired commentary Stream Identifier (82) (1 byte): 29 Audio stream (3) (1 byte): 67 Maximum bitrate (14) (3 bytes): c0 01 59 This patch updates the logic to merge streams only when they appear in different versions of the PMT. Signed-off-by: Aman Gupta --- libavformat/mpegts.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 8a84e5cc19..9928959025 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2130,7 +2130,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type return 0; } -static AVStream *find_matching_stream(MpegTSContext *ts, int pid, +static AVStream *find_matching_stream(MpegTSContext *ts, int pid, int pmt_version, int stream_identifier, int pmt_stream_idx) { AVFormatContext *s = ts->stream; @@ -2139,6 +2139,9 @@ static AVStream *find_matching_stream(MpegTSContext *ts, int pid, for (i = 0; i < s->nb_streams; i++) { AVStream *st = s->streams[i]; + if (st->pmt_version == pmt_version) { /* only merge across pmt version changes */ + continue; + } if (stream_identifier != -1) { /* match based on "stream identifier descriptor" if present */ if (st->stream_identifier == stream_identifier+1) { found = st; @@ -2309,7 +2312,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES) { pes = ts->pids[pid]->u.pes_filter.opaque; if (ts->merge_pmt_versions && !pes->st) { - st = find_matching_stream(ts, pid, stream_identifier, i); + st = find_matching_stream(ts, pid, h->version, stream_identifier, i); if (st) { pes->st = st; pes->stream_type = stream_type; @@ -2331,7 +2334,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len mpegts_close_filter(ts, ts->pids[pid]); // wrongly added sdt filter probably pes = add_pes_stream(ts, pid, pcr_pid); if (ts->merge_pmt_versions && pes && !pes->st) { - st = find_matching_stream(ts, pid, stream_identifier, i); + st = find_matching_stream(ts, pid, h->version, stream_identifier, i); if (st) { pes->st = st; pes->stream_type = stream_type; @@ -2353,7 +2356,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len st = ts->stream->streams[idx]; } if (ts->merge_pmt_versions && !st) { - st = find_matching_stream(ts, pid, stream_identifier, i); + st = find_matching_stream(ts, pid, h->version, stream_identifier, i); } if (!st) { st = avformat_new_stream(ts->stream, NULL);