From patchwork Mon Mar 6 12:02:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 40597 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp2587464pzb; Sun, 5 Mar 2023 20:03:08 -0800 (PST) X-Google-Smtp-Source: AK7set+1Bs4cEvsyc7tQfOo3ujZ0dMYIGv9wh+qHCkud4pC+z60cAcxwd5arVFpCf1p0907RRgm5 X-Received: by 2002:a17:907:a04:b0:7e0:eed0:8beb with SMTP id bb4-20020a1709070a0400b007e0eed08bebmr12436681ejc.41.1678075388390; Sun, 05 Mar 2023 20:03:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678075388; cv=none; d=google.com; s=arc-20160816; b=CYzqLBumYikrYoknHUSDDbqjLXENFcMSNNWy+xg1G78VQCWaSuOb8e3Q2LSbTD5drs ae6eTEbWXdRDZKboMkAppABIvvY6s9OviiOV/An4AaIUuFOwzf42k+I2K0A0soTs++/N GuB01X74OavRpzf3Ritr7wBLAFcRREzo+rkzw9usq2clYK/ZHF5mrOfaUZtWoSAMbpGF wzcBJQ3RyC9QLi0EfiOlVhJ3BBwFQyg2COGrz/0YrUmb/m+UTqR2ybLh4QpKp81v3frm t8dxtAajf/yNvaz3bLIrMux1I/5Hogoj/debPJ8wBpssua2MOv+Wwja+LNYTRTNbVtIc cpew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=DUWvGiD0pa9qOPs1n2Eda5HoA2B/pxoJluJ5yov0Qss=; b=r1JcE9b0ZdQIGo2Aeu0+1NHRJQ78tsOzXCadlfzKd7s0wYxee2ehdtQ67v5TzWMntk O/nPcnwcLVmKpNkKaWi/JtMUZqusSsxpTjG8hjVEuinFBDuLj9t71Fgb69KeGCgsD4wR pBZdMZzkcUeTpQStxSsTm1Vt0unybhBcqWWTt535IDKvRMuAVXgWtk6ukixoR8uE0yiY ixq518VYwh13ttaMgbIrNXLHnZP02/fJecIRIePNMIeLsfb2Zg4Av4IFjqret4TicJ4v daPpUkriFN+9sC4dPeR22DWMPzXZ+KS371dbcf2hq+7m26DzOQGJO1dIDxy+ZYsa5gHQ +OOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=o7oH++uS; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id lu13-20020a170906facd00b008c25e1c05desi8391104ejb.392.2023.03.05.20.03.07; Sun, 05 Mar 2023 20:03:08 -0800 (PST) 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=@foxmail.com header.s=s201512 header.b=o7oH++uS; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B021468BB6A; Mon, 6 Mar 2023 06:02:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B73F68A5F7 for ; Mon, 6 Mar 2023 06:02:15 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1678075332; bh=GSGF+i+gx4QLcyhnGFPOVMLZmW0B0ZzOnd6hthKdmCc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=o7oH++uS8bOvhoVZkffIIoGU2EXYQKzGKeXcvomOA3E9NHqphX4xXrYso/AC8rP/e 29GfN2EQbhCxesmuqJPFtODKC2FHVBm46/Y0hUSxXQyKMnryw69UhRLNaDWWG3RPqQ zcD8IycyJNGrcb/qkgTeDkO0gZPu4FRAjA88wEpk= Received: from localhost.localdomain ([119.147.10.201]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id 88210DA; Mon, 06 Mar 2023 12:02:08 +0800 X-QQ-mid: xmsmtpt1678075331tbdjrxiua Message-ID: X-QQ-XMAILINFO: OfkeHAqGKDFbLwWqm3jBMT0/98LBUKAeq7pxVkBU/CRbav914761C9AKid+15H X/xnNLf0e+hhWElA97JFeeX04/jv6WTZPGtQViYlHyR4AnuG88k2sXe47uOoS/8v3FFLbfx8qm05 MHu73Xz3Od+bTSy/1Yh0nI6IgiaYNs8LZ0Uzra2iOv1UQUYV0TkCQliiURBqfTlzWfMhM3UzNc4Q tpEdl2A13BaLBtmFT4AOks8hDB78VDdXHEMKfn7RrGapsPOzlw8bckHdJCyMlDFmke5otH8A++5m esvR6VRE2mpQ39xS6hYNaXdEpZH3LYT4ulIj2AiHD15823f7sX3foameyZhf46l1nnmSOQOezxKE x3W3mn1gZowRGTLGpQI7b/2RPw/0kzVsWkwK+HID4dVFm7m4BWK/Arkq3rrvbUvdXYrMZU4bWmk3 tW8ELsmDVBBd4w38PLaWHu6HA9GXY62wxOpPSrKOGwICPd4aE/jb7uwn5sL4DLo8CVo1VmOxPHHl 9zHSYv/syHa5xeSfrBZFs7z51Jk9BYSvE9D4AIpE53yQ7p5pOsogEiwd2f6SgP0P7jplNAY59Ljs pUe1XIa1gokc8iJ/MPj8SZ1tFDRhcBfZlSAQgYphPU9QvTe5X+WjgMJRxBh2wCcibLMxB+eJZcP2 nJF0ni3o8SfgnUMblC75fKDFf/KX2OVYhAb/xkfA45LVkLnEwO7nUCOTZkw8Kw267UPMQyBRsc1/ d91ztMo1/KO4fRYMhEmvtXsil3B6xJDXvgRAxkwl1e3uiJNA6hs7FkxfxbCUsm2DUlBJpe3BADCN xASPyxTefgAoKaQlLzBiL+zzJJu6jX68zRO+qlM+Q0SPDW2vb/IbmYwwC43MsurpQWq4ZJKxNngA 9lvNIQxUMyfAcEkTwgmn8dmZxC+1x2KoqUUbDJbj7Jwb8VlNBoTfCvaB1m/iF2h/KQtda9bou+T+ bTILhgSALOFGa6mg8T5/eKdBD+Ulp7DqfJoWmj3JdoRR8Yc/5NTw== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Mar 2023 20:02:11 +0800 X-OQ-MSGID: <20230306120211.1249250-6-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306120211.1249250-1-quinkblack@foxmail.com> References: <20230306120211.1249250-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 5/5] fate/mov: add PCM in mp4 test 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: KOdP+MEYgDW5 From: Zhao Zhili Signed-off-by: Zhao Zhili --- tests/fate/mov.mak | 12 ++++++++++++ tests/filtergraphs/mov-mp4-pcm | 5 +++++ tests/ref/fate/mov-mp4-pcm | 27 +++++++++++++++++++++++++++ tests/ref/fate/mov-mp4-pcm-float | 7 +++++++ 4 files changed, 51 insertions(+) create mode 100644 tests/filtergraphs/mov-mp4-pcm create mode 100644 tests/ref/fate/mov-mp4-pcm create mode 100644 tests/ref/fate/mov-mp4-pcm-float diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 8a7218a215..d795445691 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -165,6 +165,18 @@ FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ fate-mov-channel-description: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-channel-description fate-mov-channel-description: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mov "-filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/mov-channel-description -map [outFL] -map [outFR] -map [outFC] -map [outLFE] -map [outBL] -map [outBR] -map [outDL] -map [outDR] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0" +# Test PCM in mp4 and channel layout +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ + += fate-mov-mp4-pcm +fate-mov-mp4-pcm: tests/data/asynth-44100-1.wav tests/data/filtergraphs/mov-mp4-pcm +fate-mov-mp4-pcm: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mp4 "-filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/mov-mp4-pcm -map [mono] -map [stereo] -map [2.1] -map [5.1] -map [7.1] -c:a pcm_s16le" "-map 0 -c copy -frames:a 0" + +# Test floating sample format PCM in mp4 and unusual channel layout +FATE_MOV_FFMPEG-$(call TRANSCODE, PCM_S16LE, MOV, WAV_DEMUXER PAN_FILTER) \ + += fate-mov-mp4-pcm-float +fate-mov-mp4-pcm-float: tests/data/asynth-44100-1.wav +fate-mov-mp4-pcm-float: CMD = transcode wav $(TARGET_PATH)/tests/data/asynth-44100-1.wav mp4 "-af aresample,pan=FL+LFE+BR|c0=c0|c1=c0|c2=c0 -c:a pcm_f32le" "-map 0 -c copy -frames:a 0" + FATE_FFMPEG += $(FATE_MOV_FFMPEG-yes) fate-mov: $(FATE_MOV) $(FATE_MOV_FFMPEG-yes) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART) $(FATE_MOV_FFMPEG_FFPROBE-yes) diff --git a/tests/filtergraphs/mov-mp4-pcm b/tests/filtergraphs/mov-mp4-pcm new file mode 100644 index 0000000000..7fa25a2c3c --- /dev/null +++ b/tests/filtergraphs/mov-mp4-pcm @@ -0,0 +1,5 @@ +[0:a:0]pan=mono|c0=c0[mono]; +[0:a:0]pan=stereo|c0=c0|c1=c0[stereo]; +[0:a:0]pan=2.1|c0=c0|c1=c0|c2=c0[2.1]; +[0:a:0]pan=5.1|c0=c0|c1=c0|c2=c0|c3=c0|c4=c0|c5=c0[5.1]; +[0:a:0]pan=7.1|c0=c0|c1=c0|c2=c0|c3=c0|c4=c0|c5=c0|c6=c0|c7=c0[7.1]; diff --git a/tests/ref/fate/mov-mp4-pcm b/tests/ref/fate/mov-mp4-pcm new file mode 100644 index 0000000000..b34f5e59e1 --- /dev/null +++ b/tests/ref/fate/mov-mp4-pcm @@ -0,0 +1,27 @@ +1573ecbd24a65a6ec23ef08a861614b3 *tests/data/fate/mov-mp4-pcm.mp4 +10589277 tests/data/fate/mov-mp4-pcm.mp4 +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16le +#sample_rate 0: 44100 +#channel_layout_name 0: mono +#tb 1: 1/44100 +#media_type 1: audio +#codec_id 1: pcm_s16le +#sample_rate 1: 44100 +#channel_layout_name 1: stereo +#tb 2: 1/44100 +#media_type 2: audio +#codec_id 2: pcm_s16le +#sample_rate 2: 44100 +#channel_layout_name 2: 2.1 +#tb 3: 1/44100 +#media_type 3: audio +#codec_id 3: pcm_s16le +#sample_rate 3: 44100 +#channel_layout_name 3: 5.1 +#tb 4: 1/44100 +#media_type 4: audio +#codec_id 4: pcm_s16le +#sample_rate 4: 44100 +#channel_layout_name 4: 7.1 diff --git a/tests/ref/fate/mov-mp4-pcm-float b/tests/ref/fate/mov-mp4-pcm-float new file mode 100644 index 0000000000..851b79090c --- /dev/null +++ b/tests/ref/fate/mov-mp4-pcm-float @@ -0,0 +1,7 @@ +691a76a847e0f3720c09cca341971f19 *tests/data/fate/mov-mp4-pcm-float.mp4 +3175929 tests/data/fate/mov-mp4-pcm-float.mp4 +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_f32le +#sample_rate 0: 44100 +#channel_layout_name 0: 3 channels (FL+LFE+BR)