From patchwork Mon May 14 22:54:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 8970 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp670488jad; Mon, 14 May 2018 15:59:36 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqrCnxyhka3SkjFwA/X0961jCEs2TF7+7fqnYmZ/uvtOqxpp91egLdIihQE41H3ge8kRL+a X-Received: by 2002:a1c:bf16:: with SMTP id p22-v6mr6349885wmf.112.1526338776353; Mon, 14 May 2018 15:59:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526338776; cv=none; d=google.com; s=arc-20160816; b=enJ/I36e5jYXqGVS/8leH/pZ9+mFrlETx1hUoMV2BVjmcNTqY52M/fipZitJh2OXm5 rk6q8DSbEnmsoVdyl98qyiR3IMpq4jcZIvUZ3/Knmsqydzezv8JVQqmKAJspnqUW9BFk 6jZ4EzI7MTqRtltPFO3UK4JCFrP0m38rl0YY1D1JvLuntoE5eMhdrSan1A2mjLNhJD90 fLZQKNCauhCGBPDqLbT+I1dobLVNUVhSYqTu2NASjfWEtlet5hfEXo7FxkoAJ/jSngak Ma/DyYtG4ly3j1qJpyJEmLTShTh2wxZvrhmLnrG5FN6A/mQa+1/HEoJI8ViTCuAmNPVq 6jWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=HrPR9E3MuNtAea3V5jYbodGRaa2HqRqoH+aNJNx9nF8=; b=hLP/MEuWrQ6EjhHkXK1MeN4dWWFDPW4Od6c0fcaOxBoIQPa6RJs1wHvVR0wNuh+s1W hsviVSVBCgYV+Nu2tGY6WyETfzU1HQJdDNiH8+m2ETHa9xylIMPGco+cf8GsDUz5y4Tp YuzuI9ZUsQUBRDVrR+Vn9VBgEEfqemSmL24Rgcsbav4DrHNJIdlqbsYCERXOyYQ0/xDC PQEoQyFOQVrS9PVEUC+8rdctozWsCo9yzBlgEIeVe4eKYrn9NvTmY2TqdxU5ORZh1fYs MkhszdwAw/pBcegPA7WfY0XN9ZJVc37dwuiTOJNqz55aCKtdxXw8dImhGUk2uNXedZM1 +UiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=vAMqiHvM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a64-v6si5871226wmf.129.2018.05.14.15.59.35; Mon, 14 May 2018 15:59:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=vAMqiHvM; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 21C90689DD6; Tue, 15 May 2018 01:58:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1AC76891D9 for ; Tue, 15 May 2018 01:58:48 +0300 (EEST) Received: by mail-pl0-f68.google.com with SMTP id t12-v6so8212104plo.7 for ; Mon, 14 May 2018 15:59:27 -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; bh=OGKc62V0cFKoTIuTdrK0pKvzNeKw634E8nEFYmZNQr8=; b=vAMqiHvM4ZUvq+RKJnj22SzTl5/+OUxhg4+hRn/JV4YvXs0KIUIp3cS7woXrFRlOkE DMcTvgJ5Ho6VE/GfjwKau1oc6Cn2+eaOwuqS6zxg3f4vj2urcN2PPhRWoZKupiOUjkco oT30OMazYAN2kdS//YKBBNl8NW/jvCEyG3FaosBGYZyGVMdwxeIQzl0MBYjFRKsYNnI6 wEKNmiyHf0fYDgrSljlHmg+gJRCWC44k9yYaLRJ8ItnfHxSw4IhPCJvAjmFlZhvfYXR4 yt8dg9YJhN0iEHrvAZGe11b+/aERBx6kVxChJnLybuGRuC4Bc6UiByXZXMqRB7cuFYvF NMHg== 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; bh=OGKc62V0cFKoTIuTdrK0pKvzNeKw634E8nEFYmZNQr8=; b=FfUrY2wgrK1I8/sM9vDyuoc8qkseTMataIrbLmfNeJguQOa6vu9PvNtrV5u+CWZU7r DfwtIzSS3OrGAEHsNUHEiu2CN5LlNiPVvHCFTKlzMuinzpaOE7mTKTN2jrSTj6S34fwO Ftg0hNq+gyuv2oGeGgTGB0+MEMPCvDc3FXgAM+wN1prKT9D8g75jfJHgX4M2bZwZNPT0 aryJU5w7wkYqaBag72dFXcoXEsybJi+6C3cgN7yiNoucWOvKJ+mda1W11z2x3hH9k7ca LstV1cGJxR0SPp7ebXQjn+CzDQXyhRn19s/dyuKPgMjmsOuzanbYHClWNiaeE82vof/r +Ppg== X-Gm-Message-State: ALKqPwcdYL7kMQ89uKvkaId+pAz+kV7RHxFVCDQz1gsYCiAsHIjMREV2 5a5waWVIDyddeCNFiTpA0FbAfP8R X-Received: by 2002:a17:902:8d81:: with SMTP id v1-v6mr11238212plo.383.1526338446725; Mon, 14 May 2018 15:54:06 -0700 (PDT) Received: from localhost.localdomain (c-69-181-54-242.hsd1.ca.comcast.net. [69.181.54.242]) by smtp.gmail.com with ESMTPSA id s4-v6sm15017171pgp.35.2018.05.14.15.54.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 14 May 2018 15:54:05 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 14 May 2018 15:54:01 -0700 Message-Id: <20180514225401.40824-1-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 Subject: [FFmpeg-devel] [PATCH] avformat/mpegts: add merge_pmt_versions option 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: michael@niedermayer.cc, cus@passwd.hu, Aman Gupta , jeebjp@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta This new optional flag makes it easier to deal with mpegts samples where the PMT is updated and elementary streams move to different PIDs in the middle of playback. Previously, new AVStreams were created per PID, and it was up to the user to figure out which streams had migrated to a new PID (by iterating over the list of AVProgram and making guesses), and switch seamlessly to the new AVStream during playback. Transcoding or remuxing these streams with ffmpeg on the CLI was also quite painful, and the user would need to extract each set of PIDs into a separate file and then stitch them back together. With this new option, the mpegts demuxer will automatically detect PMT changes and feed data from the new PID to the original AVStream that was created for the orignal PID. For mpegts samples with stream_identifier_descriptor available, the unique ID is used to merge PIDs together. If the stream id is not available, the demuxer attempts to map PIDs based on their order and relation to the PCR pid. With this change, I am able to playback and transcode/remux these two samples which previously caused issues: https://tmm1.s3.amazonaws.com/pmt-version-change.ts https://kuroko.fushizen.eu/videos/pid_switch_sample.ts I also have another longer sample which contains multiple PMT changes, some of which change the ES pids and others which do not: https://tmm1.s3.amazonaws.com/multiple-pmt-change.ts Demuxing this sample with the new option shows several new log messages as the PMT changes are handled: [mpegts @ 0x7ffe18801200] detected PMT change (version=3/4, pcr_pid=0xf98/0xf9b) [mpegts @ 0x7ffe18801200] re-using existing video stream 0 (pid=0xf98) for new pid=0xf9b [mpegts @ 0x7ffe18801200] re-using existing audio stream 1 (pid=0xf99) for new pid=0xf9c [mpegts @ 0x7ffe18801200] re-using existing audio stream 2 (pid=0xf9a) for new pid=0xf9d [mpegts @ 0x7ffe18801200] detected PMT change (version=4/5, pcr_pid=0xf9b/0xfa9) [mpegts @ 0x7ffe18801200] re-using existing video stream 0 (pid=0xf98) for new pid=0xfa9 [mpegts @ 0x7ffe18801200] re-using existing audio stream 1 (pid=0xf99) for new pid=0xfaa [mpegts @ 0x7ffe18801200] re-using existing audio stream 2 (pid=0xf9a) for new pid=0xfab Signed-off-by: Aman Gupta --- doc/demuxers.texi | 4 ++ libavformat/mpegts.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 105 insertions(+), 4 deletions(-) diff --git a/doc/demuxers.texi b/doc/demuxers.texi index e7c2abce57..2f7d7e0f3a 100644 --- a/doc/demuxers.texi +++ b/doc/demuxers.texi @@ -552,6 +552,10 @@ Show the detected raw packet size, cannot be set by the user. Scan and combine all PMTs. The value is an integer with value from -1 to 1 (-1 means automatic setting, 1 means enabled, 0 means disabled). Default value is -1. + +@item merge_pmt_versions +Re-use existing streams when a PMT's version is updated and elementary +streams move to different PIDs. Default value is 0. @end table @section mpjpeg diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 27b1c30a44..c42e564a7e 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -84,6 +84,8 @@ typedef struct MpegTSSectionFilter { unsigned int end_of_section_reached : 1; SectionCallback *section_cb; void *opaque; + int orig_pcr_pid; /* pmt specific */ + int last_pcr_pid; } MpegTSSectionFilter; struct MpegTSFilter { @@ -147,6 +149,7 @@ struct MpegTSContext { int scan_all_pmts; int resync_size; + int merge_pmt_versions; /******************************************/ /* private mpegts data */ @@ -172,6 +175,8 @@ static const AVOption options[] = { {.i64 = 0}, 0, 0, AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_EXPORT | AV_OPT_FLAG_READONLY }, {"scan_all_pmts", "scan and combine all PMTs", offsetof(MpegTSContext, scan_all_pmts), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_DECODING_PARAM }, + {"merge_pmt_versions", "re-use streams when PMT's version/pids change", offsetof(MpegTSContext, merge_pmt_versions), AV_OPT_TYPE_BOOL, + {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, {"skip_changes", "skip changing / adding streams / programs", offsetof(MpegTSContext, skip_changes), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, 0 }, {"skip_clear", "skip clearing programs", offsetof(MpegTSContext, skip_clear), AV_OPT_TYPE_BOOL, @@ -1073,7 +1078,8 @@ static int mpegts_push_data(MpegTSFilter *filter, if (ts->skip_changes) goto skip; - pes->st = avformat_new_stream(ts->stream, NULL); + if (!pes->st) + pes->st = avformat_new_stream(ts->stream, NULL); if (!pes->st) return AVERROR(ENOMEM); pes->st->id = pes->pid; @@ -1982,6 +1988,68 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type *pp = desc_end; return 0; } +static AVStream *find_matching_stream(MpegTSContext *ts, int pid, + int stream_id, + int pcr_pid, int orig_pcr_pid) +{ + AVFormatContext *s = ts->stream; + int i, orig_pid = orig_pcr_pid + (pid - pcr_pid); + AVStream *found = NULL; + + for (i = 0; i < s->nb_streams; i++) { + AVStream *st = s->streams[i]; + if (stream_id != -1) { + if (st->stream_identifier == stream_id+1) { + found = st; + break; + } + } else if (pcr_pid != orig_pcr_pid && st->id == orig_pid) { + found = st; + break; + } + } + + if (found) { + av_log(ts->stream, AV_LOG_DEBUG, "re-using existing %s stream %d (pid=0x%x) for new pid=0x%x\n", + av_get_media_type_string(found->codecpar->codec_type), i, found->id, pid); + } + + return found; +} + +static int parse_stream_identifier_desc(uint8_t *p, uint8_t *p_end) +{ + const uint8_t **pp = &p; + const uint8_t *desc_list_end; + const uint8_t *desc_end; + int desc_list_len; + int desc_len, desc_tag; + + desc_list_len = get16(&p, p_end); + if (desc_list_len < 0) + return -1; + desc_list_len &= 0xfff; + desc_list_end = p + desc_list_len; + if (desc_list_end > p_end) + return -1; + + while (1) { + desc_tag = get8(pp, desc_list_end); + if (desc_tag < 0) + return -1; + desc_len = get8(pp, desc_list_end); + if (desc_len < 0) + return -1; + desc_end = *pp + desc_len; + if (desc_end > desc_list_end) + return -1; + + if (desc_tag == 0x52) { + return get8(pp, desc_end); + } + *pp = desc_end; + } +} static int is_pes_stream(int stream_type, uint32_t prog_reg_desc) { @@ -2000,6 +2068,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len int program_info_length, pcr_pid, pid, stream_type; int desc_list_len; uint32_t prog_reg_desc = 0; /* registration descriptor */ + int last_ver = tssf->last_ver; + int stream_id = -1; int mp4_descr_count = 0; Mp4Descr mp4_descr[MAX_MP4_DESCR_COUNT] = { { 0 } }; @@ -2032,6 +2102,14 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len pcr_pid &= 0x1fff; add_pid_to_pmt(ts, h->id, pcr_pid); set_pcr_pid(ts->stream, h->id, pcr_pid); + if (!tssf->orig_pcr_pid) + tssf->orig_pcr_pid = pcr_pid; + + if (last_ver != -1 && h->version != last_ver) { + av_log(ts->stream, AV_LOG_DEBUG, "detected PMT change (version=%d/%d, pcr_pid=0x%x/0x%x)\n", + last_ver, h->version, tssf->last_pcr_pid, pcr_pid); + } + tssf->last_pcr_pid = pcr_pid; av_log(ts->stream, AV_LOG_TRACE, "pcr_pid=0x%x\n", pcr_pid); @@ -2083,14 +2161,22 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (pid < 0) goto out; pid &= 0x1fff; + stream_id = parse_stream_identifier_desc(p, p_end); if (pid == ts->current_pid) goto out; /* now create stream */ 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_id, pcr_pid, tssf->orig_pcr_pid); + if (st) { + pes->st = st; + pes->stream_type = stream_type; + } + } if (!pes->st) { - pes->st = avformat_new_stream(pes->stream, NULL); + pes->st = avformat_new_stream(pes->stream, NULL); if (!pes->st) goto out; pes->st->id = pes->pid; @@ -2100,7 +2186,14 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); // wrongly added sdt filter probably pes = add_pes_stream(ts, pid, pcr_pid); - if (pes) { + if (ts->merge_pmt_versions && pes && !pes->st) { + st = find_matching_stream(ts, pid, stream_id, pcr_pid, tssf->orig_pcr_pid); + if (st) { + pes->st = st; + pes->stream_type = stream_type; + } + } + if (pes && !pes->st) { st = avformat_new_stream(pes->stream, NULL); if (!st) goto out; @@ -2110,7 +2203,11 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len int idx = ff_find_stream_index(ts->stream, pid); if (idx >= 0) { st = ts->stream->streams[idx]; - } else { + } + if (ts->merge_pmt_versions && !st) { + st = find_matching_stream(ts, pid, stream_id, pcr_pid, tssf->orig_pcr_pid); + } + if (!st) { st = avformat_new_stream(ts->stream, NULL); if (!st) goto out;