From patchwork Mon Apr 11 10:50:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 35253 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:671c:b0:7c:62c8:b2d1 with SMTP id q28csp972866pzh; Mon, 11 Apr 2022 03:50:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjXiBfABFziJtBsgEZsv1jR8kuOMLcwMUm8RNbE9/eYS3TfS5y0Ox8wL4fWRoI1+J8+IYf X-Received: by 2002:a05:6402:3496:b0:419:82d5:f1d9 with SMTP id v22-20020a056402349600b0041982d5f1d9mr32398500edc.36.1649674248743; Mon, 11 Apr 2022 03:50:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649674248; cv=none; d=google.com; s=arc-20160816; b=XivJ1hFsN1P2nxk360xAT0OevWNVOu7l3UjZX1H2nRE8zhVL90WgcOuJP6+L2kM8zG n5GHEsl8Xtw0CYUZObMhcaaDOSJAoG60GcgJCPTPTUzBaUrD97NVk2hrgBQ26yqAhhUM nbfpOiBKcLRic7Ve9/aZDpfl+wAucFCRi8n9pP6hmXsvliyoK1tXsXFdRadBF2G/W2cn m6XpYbRZ/JcKoAXCjqG6sziWm+q0c7RYvNdlezwaNbhumtn5u/5X0xkvkIaF0AJebscO u4KaHkfesfMtqPr7KvHu4FX1EQeeUFg4Ff9mMkXfp9EQnvUoBobAdwLxVdcQyCYWPayp 98sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=unkahIOrVfVF/xEJNzCK/3jZCQOuWUqxj2MB6nRpAfU=; b=AaZe6Rep1OuuAsPZHS2S4nDCnCoM9UIqaRn+A4PnwbFYID2WOnMd4IQI5qYWMzcvhJ 3qPtp/FlO6K1L7207VwhIoyWnvFoKyWQt1vc7KDsVreUasz/WKwq8qtpT+hpiZeqvxcz Zc1ezAorweUHCjUq+5fO0bNEfqT4RqVrD8UpGY0MKxeZk1zDBblwSXa1aA6gfyEeNulz vaCwg8y51H3RwlEmph5KoYG/KeD2JgiQwShqegCcsNAoedaIaKxUeY3yUg53BqQatJf4 /7clsiWg03U4qVwo4prCqfaEaNOGI81fIbwPNXqjrIc/xgUTYSMLNiDdraDC4ydWrRx/ DTFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IK5N9lPF; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y6-20020aa7ccc6000000b0041d7a812aeasi2021593edt.98.2022.04.11.03.50.48; Mon, 11 Apr 2022 03:50:48 -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=@gmail.com header.s=20210112 header.b=IK5N9lPF; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 67A2B68B3AD; Mon, 11 Apr 2022 13:50:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 94FA468B245 for ; Mon, 11 Apr 2022 13:50:39 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id bu29so25979512lfb.0 for ; Mon, 11 Apr 2022 03:50:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1rGwFhB3X8Aqp7upuae8uSLRPPPRTj70/bKookLxLDA=; b=IK5N9lPFu1iqTmV6iB7BGCLbaozlkiQdqNuNT411C4FY2VsXHuXmi6t99clEa0qfzB ltUtmLIMGnOqoMGUkfYdePOBEibXukmmdCdRlUWY0k/5oU3RA8jS1gfuGQdIY3y66bgt ALs0HrzMvRWEgH0C9USga7ZMXeDHdzsEwFf7YqRHgTmfrxQvDaKmMuw/Loo+y2DKj2og IGbPJMLxyFjEyAbKMbFI1haQCq1j3XFG7GxvWbrfueg0QZOXY7/iAl4PceFE49oYfHsW O8z5J1uWiADeH4T+X1Q5djkY1q4/nSmeWTd8FDzPgNf/M+iEFORkbvAiyfyIDtFE6mRq f/Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1rGwFhB3X8Aqp7upuae8uSLRPPPRTj70/bKookLxLDA=; b=hspi4Unhzi6SYx0vp1Fcrframz4/Y6wkwdPFOUErcf4H4W1kl9ftxezebLMINeash8 XTzof6b79smU3qOQvY1xEej+XxqQ4cvpP6D+21JlakZtloRvo1Bd0RAom6vsOl5By3Vl nbLFw9Y95MFeDYfqa//tPpCTzHtxYCXY15uan1R0nMV3giVaUQb34E1nS5dhfPAKYSrR nsj4WBOeoeM6MJ4mPAEp3qopbT39Gh9isT3YCd7n0gaAO7Ev+31aOIzmVLfRz3YSa1Pq wnA2LF5Dd+1sYhH1CAmehxKlNTcRVyVN8/134sWB2ciPLEPA6Ik/RuHcwVmM3dYO1gH4 IBTA== X-Gm-Message-State: AOAM532AlmhLkwZRy4J/6/PUoIlpBWvS9FFZ4pJ/OozHqckLdVckYYDA uQPkp1d3Cl62J+0kf/aOA+WTsCfJWZE= X-Received: by 2002:a05:6512:2208:b0:46b:82c7:677b with SMTP id h8-20020a056512220800b0046b82c7677bmr11523119lfu.24.1649674237034; Mon, 11 Apr 2022 03:50:37 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id n23-20020a056512311700b0046b926fd343sm728834lfb.142.2022.04.11.03.50.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Apr 2022 03:50:36 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Apr 2022 13:50:31 +0300 Message-Id: <20220411105031.7924-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/mpegts: set data broadcast streams as such X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jMF0Nxk+D3ZW From: Jan Ekström Additionally, they should not be probed, as this is essentially various types of binary data. Signed-off-by: Jan Ekström --- libavformat/mpegts.c | 53 +++++++++++++++++++++ tests/fate/mpegts.mak | 3 ++ tests/ref/fate/mpegts-probe-sdt-data-stream | 14 ++++++ 3 files changed, 70 insertions(+) create mode 100644 tests/ref/fate/mpegts-probe-sdt-data-stream diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 49f7735123..d41f7fc8bd 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2516,6 +2516,13 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len } } p = desc_list_end; + + if (!ts->pkt && (stream_type >= 0x80 && stream_type <= 0xFF) && + st->codecpar->codec_id == AV_CODEC_ID_NONE) + // if we are reading headers, and still have a user private stream + // with no proper codec set, do not stop reading at PMT. Data + // streams are marked within SDT. + ts->stop_parse = 0; } if (!ts->pids[pcr_pid]) @@ -2699,6 +2706,7 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (val < 0) return; for (;;) { + struct Program *program = NULL; sid = get16(&p, p_end); if (sid < 0) break; @@ -2712,6 +2720,15 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len desc_list_end = p + desc_list_len; if (desc_list_end > p_end) break; + + program = get_program(ts, sid); + + if (!ts->pkt && program && program->pmt_found) + // if during header reading we have already received a PMT for + // this program and now have received an SDT for it, stop further + // reading at this point. + ts->stop_parse = 2; + for (;;) { desc_tag = get8(&p, desc_list_end); if (desc_tag < 0) @@ -2744,6 +2761,42 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len av_free(name); av_free(provider_name); break; + case 0x64: /* ETSI data broadcast descriptor; EN 300 468 6.2.11 */ + if (desc_len < 3) + // length of the always available header part, up to and + // including the component_tag field. + break; + + { + AVStream *st = NULL; + FFStream *sti = NULL; + + int data_broadcast_id = get16(&p, desc_end); // TS 101 162 + int component_tag = get8(&p, desc_end); + if (!component_tag) + // no stream mapping according to component_tag + break; + + av_log(ts->stream, AV_LOG_TRACE, + "data broadcast id: %d, component tag: %d\n", + data_broadcast_id, component_tag); + + if (!program) + break; + + st = find_matching_stream(ts, 0, sid, component_tag + 1, 0, + program); + if (!st) + break; + + sti = ffstream(st); + + st->codecpar->codec_type = AVMEDIA_TYPE_DATA; + st->codecpar->codec_id = AV_CODEC_ID_BIN_DATA; + sti->request_probe = sti->need_parsing = 0; + sti->need_context_update = 1; + break; + } default: break; } diff --git a/tests/fate/mpegts.mak b/tests/fate/mpegts.mak index bbcbfc47b2..ae21ee87d0 100644 --- a/tests/fate/mpegts.mak +++ b/tests/fate/mpegts.mak @@ -19,6 +19,9 @@ FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS) += fate-mpegts-probe-pmt-merge fate-mpegts-probe-pmt-merge: SRC = $(TARGET_SAMPLES)/mpegts/pmtchange.ts fate-mpegts-probe-pmt-merge: CMD = run $(PROBE_CODEC_NAME_COMMAND) -merge_pmt_versions 1 -i "$(SRC)" +FATE_MPEGTS_PROBE-$(call DEMDEC, MPEGTS, MP2) += fate-mpegts-probe-sdt-data-stream +fate-mpegts-probe-sdt-data-stream: SRC = $(TARGET_SAMPLES)/mpegts/mpegts_sdt_data_stream.ts +fate-mpegts-probe-sdt-data-stream: CMD = run $(PROBE_CODEC_NAME_COMMAND) -i "$(SRC)" FATE_SAMPLES_FFPROBE += $(FATE_MPEGTS_PROBE-yes) diff --git a/tests/ref/fate/mpegts-probe-sdt-data-stream b/tests/ref/fate/mpegts-probe-sdt-data-stream new file mode 100644 index 0000000000..0b8e90962f --- /dev/null +++ b/tests/ref/fate/mpegts-probe-sdt-data-stream @@ -0,0 +1,14 @@ +[PROGRAM] +[STREAM] +codec_name=mp2 +[/STREAM] +[STREAM] +codec_name=bin_data +[/STREAM] +[/PROGRAM] +[STREAM] +codec_name=mp2 +[/STREAM] +[STREAM] +codec_name=bin_data +[/STREAM]