From patchwork Mon Apr 4 09:53:12 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: 35156 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp1871550pzb; Mon, 4 Apr 2022 02:53:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRHKITEZFwfAzhTQbUvGMTWJdo9YyULYnkxcXXMYli6qmRyafHHZC9sOkZ4NpdQSxG0Y0i X-Received: by 2002:a17:906:dc8f:b0:6e0:5ce7:d80e with SMTP id cs15-20020a170906dc8f00b006e05ce7d80emr10325496ejc.435.1649066009585; Mon, 04 Apr 2022 02:53:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649066009; cv=none; d=google.com; s=arc-20160816; b=spU3dEb/xqaN+r3hvTbd0BFNYa9y2HkC5sHPAJ9mLRYn1Eo7gFHfrv1eVpfjVvUKQj AcEXkEOmzVWftGhG6C1afrtHiLP0y+2v0+oB4ZyXzOQNCcSMtCUosYfOzUnQmroFq+y2 uo6FZnf6oSQKVNpZFzs1L9rjY1ON7PblK/Oo4hv5OY4BexWXX6E+lutnzKnTofjzJecD xuCV6yIREOh6P2MqOQDUDAqzm2jM2alY0fQVTAYDeQuCfYDqZAyF2IIZYhwtyxI9uwvH iZMi6lj49GAcPakzZ0sSaPHmF2pFXPoSRdTFPKpfG1U+JRup3MqsMCA52szPPDINc6vr 9Gng== 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=PuzIhI3lsuwheeyE3pxCQUDVKBz6Gm7xBJlLpOTw2CY=; b=PvNOb/TmaYwcrnabpT3W5XWdcYXWu52TGhuLAwlIiXMTN64VIGYo6XKZ5NAnAcDu76 KltUlfY2jZzvS+mH/ynKc2KHDHYo8royAmKdidVJa+AraAhBsBKhkKsmL2xY+s9Y88X9 ySoB6IsU8e6hUEQQeM5RCA7UxzeROIaKUArnmxGLPMC01SI+z1BLRCpDefVfyK7lR5/B RiPyiT6qm7sXNrk02QGTWQ0hrkynBItDEDX4LgpY6e5VKif1DCwwzu5kgspc+2ZWGB7c YbFGM2AYkQh85H30VneOAEHIB/f6QkZ1g/qhI0g8+NVINdXs5z1VaOx1fOObs/1Z3vU8 2Ajg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lzAmjo9p; 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 lj15-20020a170906f9cf00b006e6f0c5f887si3237805ejb.172.2022.04.04.02.53.29; Mon, 04 Apr 2022 02:53:29 -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=lzAmjo9p; 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 3B7A368B101; Mon, 4 Apr 2022 12:53:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F2E568AB3B for ; Mon, 4 Apr 2022 12:53:19 +0300 (EEST) Received: by mail-lf1-f54.google.com with SMTP id h7so16222230lfl.2 for ; Mon, 04 Apr 2022 02:53:19 -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=qatbag9sg5YOT4rKrhqrjDuyGe6GBxk3CLOhPc2BVHY=; b=lzAmjo9pP44iDi8g9XTorerzrvPCarOKQIn4ajcB0kkMjIMFNS4Y3MLJDWsOr3QIV9 7lUr4As9QlkgAFp0Uz2m2o+f3qx3xrs2jyRvsZHwcqkAQBy9LOpyxhPWfJ6YfVsMHHMp OW/1PiU32vthhtGIkHR6Sf3hGanFYbtApnLS3ePlIwv//k77Dbr+9MDBtL+7DDbkGfyN CRxAxqXMuCArZVrdw21pUjz7DH9L17r9+r1l4Ei1G4ek0ksRwSMu00Vx3Sd74uznxGaJ E2qHiT7OJzhj/3dmNhh1Xd3LVsI3ZiUnYgR8KarDX2mTP/vSDH8OsS96LMGAo0SgJjkk KOdg== 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=qatbag9sg5YOT4rKrhqrjDuyGe6GBxk3CLOhPc2BVHY=; b=ZsoAXCtv2Tk/9ClKARU4nGaIUlgAFei89sxc3Ek04gmhQrouCzAQpo61CVCwemYVb0 Rw/Cp+UEX8G1ysr1JGmL9rkBQLUiWCwlq/VZTHnQMiKPs1XyZqSTTyskOAzN21I/atDO zyRmntqE7UJVQ/CW+pZV15Jnnd5Wq9s2cyO0VYd0w2zh2gOI5T0bxPYUkauy0Jxxj4+/ nhtUTfQMA7p+tLq7SFZUklJJHb09rmmORSMKRetcuXX8f0LvTBxkDux5nRznWJw528K3 zst3Y/Hbh4DoRRkqzm6PfvRbaM9a5pWy4PI3Op7K1VJax5YqdycpYJ/vOJ16ikKcNTaN tbRQ== X-Gm-Message-State: AOAM531dfG7R+h653BMqF8rDEy0NDWcotjHTz9I2r3zxWpnHx3Ia1488 OjN9vKj5LI1U7aKxwmgXPsjgu+7iGN4= X-Received: by 2002:ac2:510f:0:b0:44a:5ccc:99fb with SMTP id q15-20020ac2510f000000b0044a5ccc99fbmr21716117lfb.38.1649065998218; Mon, 04 Apr 2022 02:53:18 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id v10-20020a056512348a00b0044b01214545sm399555lfr.231.2022.04.04.02.53.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Apr 2022 02:53:17 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Apr 2022 12:53:12 +0300 Message-Id: <20220404095312.21140-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: Ud5xwMT/TMFg 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 | 48 +++++++++++++++++++++ tests/fate/mpegts.mak | 3 ++ tests/ref/fate/mpegts-probe-sdt-data-stream | 14 ++++++ 3 files changed, 65 insertions(+) create mode 100644 tests/ref/fate/mpegts-probe-sdt-data-stream diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index da77b50669..3788faf848 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2512,6 +2512,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]) @@ -2691,6 +2698,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; @@ -2704,6 +2712,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) @@ -2736,6 +2753,37 @@ 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 */ + { + AVStream *st = NULL; + FFStream *sti = NULL; + + uint16_t data_broadcast_id = get16(&p, p_end); // TS 101 162 + uint8_t component_tag = get8(&p, p_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]