From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A1EA945842 for ; Fri, 24 Feb 2023 04:26:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2949068C109; Fri, 24 Feb 2023 06:25:43 +0200 (EET) 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 3147468C0DE for ; Fri, 24 Feb 2023 06:25:32 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1677212729; bh=Iz2QjK/UuCMxg7YxQ7GR9EEyIWiCXn7Ss2hx0J1Xsl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DAsHIYXUO2CVuwMU4Sonh2OgVc7+FBGAbDFAFWNmCPFX0ec79vWl6gvmi9Pz0G+zW 3snK3kRXw1MXkhO2ITa0+ndF/6HrZKA6qlAGsdhKMYmKt5STs9B4kGp0Cc4A1o3I4x c4ywD2vrbBuOcCi5Tiitc0VzNvXGfqhckRiBmNns= Received: from localhost.localdomain ([119.147.10.197]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 6588BCBD; Fri, 24 Feb 2023 12:25:24 +0800 X-QQ-mid: xmsmtpt1677212728t89go22sb Message-ID: X-QQ-XMAILINFO: MC9b57iUs2xB8/5pTIIE8IGLtjuIITcm9RaCjkefGYEiewjY59uMuKy+rGDAa5 m4SEvMJUmKMP5BekJGAq2GUPoZ0OAXJ4hFwp7UMwXMJ6e2tH8bk9jGRUBZWJDXuHHy+XMnzaEhSU mxB1PrkowyA9EtzJvPM6Jip1n6MJkXsGEFd2uu1MLnWI6wwiIksKDFKHTbP0+sKQvkfhK91lu76X A/2SP+oTtAplHaX2GGKVMOhGbUAGUuSiCPv19lY/8ItRgG6TvqyPnkgALuBizGO/7uSkTQPQ7N6N oDGKZxkLYtbamnVTXKShTT9CyKG+QYAusjQ/TNxdH+oY6AwhOdA43+2WL2tF4Q6cl0/7nfJbovpl WHFfLOMQuMivyQ7uztBwnlkH22wRplbKZySqT0EyDF2TYEMkr7M+d3co+z6zbnz+aUmrmIEUWNd0 2BkbqOmM09Zcod+KB15wwQ+Fk03EPWpY6krBdyWGatqB8bUPQLazAx2itZp+COubOTO5rduPNXdi QTU6ZvXCKmBsPGrFbCFUvtbxZRUlvVmTuog1Qk8mN57mu6QI1JNOwrM54nzBI8TklPl6QnR5jwUb b7Y8MU07IPaNHrvr5SXyOBhr4+Z3i45DwxPxUDDss+JrZoR41Vb3xdekvovkrIcdPdcvsiTrRLng 2Vv0aDXgrP6ddeubMXOxZqWiSegoWmLfgL/KCZ4Ot69JwmGmBbJZ3OM1a56ZIBxXMVlNsOwrn30b UQZPzj09s069G5+CdqmUV03rZEplzdvUImrX/2GGN3wMXyK3loPnApe5H+WGmJJMvPNjDJ/KOgVf IIpWmnHamFqprUHmr2TOCgYjNGwKc5oS8mePATHlOiAUFKjyM52vozhUfxKDfRY4tDRK+nKvrted fJrbKaeR/vzqFK4s9Cty/WU35B74tGY9dQT2eObgYVwMEXalwcoCvCthHvxIm7Djq1p5K8SsqMtc YDclwJvOw1RxUFBLTWqdrxMlz64tsW From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Feb 2023 20:25:23 +0800 X-OQ-MSGID: <20230224122523.143571-7-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224122523.143571-1-quinkblack@foxmail.com> References: <20230224122523.143571-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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..a37a0936dd 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 tests/data/filtergraphs/mov-mp4-pcm +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..bd08eb9885 --- /dev/null +++ b/tests/ref/fate/mov-mp4-pcm-float @@ -0,0 +1,7 @@ +77d82e3bef652692aaab31e1de4c7082 *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) -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".