From patchwork Sat Feb 20 16:00:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25841 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 28BC044A934 for ; Sat, 20 Feb 2021 18:00:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 02C2068A7D8; Sat, 20 Feb 2021 18:00:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A426568A5A8 for ; Sat, 20 Feb 2021 18:00:21 +0200 (EET) Received: by mail-wm1-f49.google.com with SMTP id o15so9636110wmq.5 for ; Sat, 20 Feb 2021 08:00:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lbi/Tw+VDleFG1WsCaKbdN+gVFVqi4U+KG10r+0+J3c=; b=DOV+QW036WLb9KsQycmrIkVKqEh2HGhbnSC+S9Bt4XPcv5p+H22wxDFxK5uQP/4Lp7 gZ18WQLjolmuHeEup+O2wP4XTNILsyj84S/i2SNWri1fCMenNT+Nug4e3+izrzA3bLDb 0qbifDX1c/7EG7VTt41IZ7MuJybhvoH1jInEn+3eurcfuLA9Oe99CeAIdvw2EYvsMHaH x/GKKVZke1coN6/VJC5yVX/xooQSB5Zh2PUmDSs9SWhUFWFItSHMarnh0OYxe71lVsZC 6HYf4x/ToqGnW/DApqIBxXZes4H8IRxrwu/d2GqnIPXcVetG7Z7BFM3tn2cjKo0+avo8 pBlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lbi/Tw+VDleFG1WsCaKbdN+gVFVqi4U+KG10r+0+J3c=; b=ZuQ9VWy0Xf92/mlJ5PQjfvLn1ryUCTrFtyE/FneChJAn9NVwheH0Qt9s+lMiiiMW6e qyjF3YmH6+q8cP9JgFJFWTmdrDbzFUoa2GBhwYcHiI2ojy93CCAZylWNAypDA8KuRLoF oUbl0jnTqoP7sPSjkS6FfDHlr9l6dhlTboGoJKHD43ScmNV8Tacqbwz7NcPbIePVTBVA 8dPKp1EZvpHEvzjMJ1xXB9gian/ME753XeEQ491//lYosrRVck8FIkvdIb1Ja/LJGGyI d6cn2QLRNUS0yF0zZo9tauY4Fh21/dTB53kMPRj3liWgHKazkmunrIzdS0pw+e0t3CDm V1lA== X-Gm-Message-State: AOAM5332IuZpd321I+XUWa0mYxuYbUHy6sQIKA8ulJNqBkGYYuaa8TOQ wYgVgV0ixC8V13ooJtfDq43fj+FXcaI= X-Google-Smtp-Source: ABdhPJxhloUltDwYy7zqIplYXn2CEugIrCmUcYguas47k9vZqfCipUdHV2w+cjhLhpJHAzjQEkQHKQ== X-Received: by 2002:a05:600c:228c:: with SMTP id 12mr12806536wmf.74.1613836820771; Sat, 20 Feb 2021 08:00:20 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id r14sm1350758wrc.9.2021.02.20.08.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Feb 2021 08:00:17 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Feb 2021 17:00:02 +0100 Message-Id: <20210220160002.90132-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210217101356.1723370-18-andreas.rheinhardt@gmail.com> References: <20210217101356.1723370-18-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 18/19] fate/matroska: Test remuxing tracks for hearing/visually impaired 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The tests also test the other dispositions: commentary, descriptions as well as dub and original language. Signed-off-by: Andreas Rheinhardt --- The first version of the matroska-wtv-remux test used the fixed-point mp2 decoder; given that no floats are involved I presumed that this would give reproducible results among different arches. I was wrong [1]. Therefore this version uses only streamcopy. I intend to apply this patchset tomorrow. [1]: https://patchwork.ffmpeg.org/project/ffmpeg/patch/20210217101356.1723370-18-andreas.rheinhardt@gmail.com/ tests/fate/matroska.mak | 21 +++++ tests/ref/fate/matroska-mpegts-remux | 52 +++++++++++++ tests/ref/fate/matroska-wtv-remux | 111 +++++++++++++++++++++++++++ 3 files changed, 184 insertions(+) create mode 100644 tests/ref/fate/matroska-mpegts-remux create mode 100644 tests/ref/fate/matroska-wtv-remux diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 4c10fe663f..74461107c9 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -100,6 +100,27 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MATROSKA_DEMUXER \ += fate-matroska-vp8-alpha-remux fate-matroska-vp8-alpha-remux: CMD = transcode matroska $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm matroska "-c copy -disposition +hearing_impaired -cluster_size_limit 100000" "-c copy -t 0.2" "" "-show_entries stream_disposition:stream_side_data_list" +# The sample has two audio tracks which are both streamcopied twice with +# different dispositions. The first input track is muxed once marked as +# original and once marked as dub; the second input audio track is already +# marked as being for the hearing impaired. It is muxed once as-is and once +# additionally marked as comment. +FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL WTV_DEMUXER \ + MPEGAUDIO_PARSER DVBSUB_PARSER \ + MP2_DECODER MATROSKA_MUXER \ + MATROSKA_DEMUXER FRAMECRC_MUXER \ + PIPE_PROTOCOL) \ + += fate-matroska-wtv-remux +fate-matroska-wtv-remux: CMD = transcode wtv $(TARGET_SAMPLES)/wtv/law-and-order-partial.wtv matroska "-map 0 -vn -map 0:a:1 -c copy -disposition:s +descriptions -disposition:a:0 +original -disposition:a:1 +comment -map 0:a:0 -disposition:a:3 +dub" "-map 0:0 -map 0:1 -map 0:2 -c copy -t 0.2" "" "-show_entries stream_disposition:stream=index,codec_name" + +# The audio stream to be remuxed here has AV_DISPOSITION_VISUAL_IMPAIRED. +FATE_MATROSKA_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MPEGTS_DEMUXER \ + AC3_DECODER MATROSKA_MUXER \ + MATROSKA_DEMUXER FRAMECRC_MUXER \ + PIPE_PROTOCOL) \ + += fate-matroska-mpegts-remux +fate-matroska-mpegts-remux: CMD = transcode mpegts $(TARGET_SAMPLES)/mpegts/pmtchange.ts matroska "-map 0:2 -map 0:2 -c copy -disposition:a:1 -visual_impaired+hearing_impaired" "-map 0 -c copy" "" "-show_entries stream_disposition:stream=index" + FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv diff --git a/tests/ref/fate/matroska-mpegts-remux b/tests/ref/fate/matroska-mpegts-remux new file mode 100644 index 0000000000..3c0b41cca9 --- /dev/null +++ b/tests/ref/fate/matroska-mpegts-remux @@ -0,0 +1,52 @@ +4e6253c1f5f96ff64ae855dea426547d *tests/data/fate/matroska-mpegts-remux.matroska +6509 tests/data/fate/matroska-mpegts-remux.matroska +#tb 0: 1/1000 +#media_type 0: audio +#codec_id 0: ac3 +#sample_rate 0: 48000 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +#tb 1: 1/1000 +#media_type 1: audio +#codec_id 1: ac3 +#sample_rate 1: 48000 +#channel_layout 1: 3 +#channel_layout_name 1: stereo +0, 0, 0, 32, 768, 0xa63778d4 +1, 0, 0, 32, 768, 0xa63778d4 +0, 32, 32, 32, 768, 0x7d577f3f +1, 32, 32, 32, 768, 0x7d577f3f +0, 64, 64, 32, 768, 0xd86b7c8f +1, 64, 64, 32, 768, 0xd86b7c8f +0, 96, 96, 32, 626, 0x09f4382f +1, 96, 96, 32, 626, 0x09f4382f +[STREAM] +index=0 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=1 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +[/STREAM] +[STREAM] +index=1 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=1 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +[/STREAM] diff --git a/tests/ref/fate/matroska-wtv-remux b/tests/ref/fate/matroska-wtv-remux new file mode 100644 index 0000000000..d0391d9fe5 --- /dev/null +++ b/tests/ref/fate/matroska-wtv-remux @@ -0,0 +1,111 @@ +2133e1a8f48507f0679f5a1995c08b48 *tests/data/fate/matroska-wtv-remux.matroska +162625 tests/data/fate/matroska-wtv-remux.matroska +#extradata 0: 5, 0x001c0014 +#extradata 1: 22, 0x12dc010c +#extradata 2: 22, 0x12dc010c +#tb 0: 1/1000 +#media_type 0: subtitle +#codec_id 0: dvb_subtitle +#tb 1: 1/1000 +#media_type 1: audio +#codec_id 1: mp2 +#sample_rate 1: 48000 +#channel_layout 1: 3 +#channel_layout_name 1: stereo +#tb 2: 1/1000 +#media_type 2: audio +#codec_id 2: mp2 +#sample_rate 2: 48000 +#channel_layout 2: 4 +#channel_layout_name 2: mono +1, 0, 0, 24, 576, 0x9b6e1638 +1, 24, 24, 24, 576, 0x0ca91183 +1, 48, 48, 24, 576, 0xec6a180f +1, 72, 72, 24, 576, 0x478a2b9b +1, 96, 96, 24, 576, 0x00fa15b3 +1, 120, 120, 24, 576, 0xfb551816 +1, 144, 144, 24, 576, 0x422e12bd +2, 163, 163, 24, 192, 0xc948791d +1, 168, 168, 24, 576, 0xa7581b29 +2, 187, 187, 24, 192, 0xc948791d +1, 192, 192, 24, 576, 0xd4b31a74 +[STREAM] +index=0 +codec_name=dvb_subtitle +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +[/STREAM] +[STREAM] +index=1 +codec_name=mp2 +DISPOSITION:default=1 +DISPOSITION:dub=0 +DISPOSITION:original=1 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +[/STREAM] +[STREAM] +index=2 +codec_name=mp2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=1 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=1 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +[/STREAM] +[STREAM] +index=3 +codec_name=mp2 +DISPOSITION:default=0 +DISPOSITION:dub=0 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=1 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +[/STREAM] +[STREAM] +index=4 +codec_name=mp2 +DISPOSITION:default=0 +DISPOSITION:dub=1 +DISPOSITION:original=0 +DISPOSITION:comment=0 +DISPOSITION:lyrics=0 +DISPOSITION:karaoke=0 +DISPOSITION:forced=0 +DISPOSITION:hearing_impaired=0 +DISPOSITION:visual_impaired=0 +DISPOSITION:clean_effects=0 +DISPOSITION:attached_pic=0 +DISPOSITION:timed_thumbnails=0 +[/STREAM]