From: Zhao Zhili <quinkblack@foxmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <zhilizhao@tencent.com>
Subject: [FFmpeg-devel] [PATCH v3 5/5] fate/mov: add PCM in mp4 test
Date: Mon, 6 Mar 2023 20:02:11 +0800
Message-ID: <tencent_BC69AE02156A5E7F4EAC723BE9C3F9B5600A@qq.com> (raw)
In-Reply-To: <20230306120211.1249250-1-quinkblack@foxmail.com>
From: Zhao Zhili <zhilizhao@tencent.com>
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
---
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)
--
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".
prev parent reply other threads:[~2023-03-06 4:03 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230306120211.1249250-1-quinkblack@foxmail.com>
2023-03-06 12:02 ` [FFmpeg-devel] [PATCH v3 1/5] avformat/mov: fix ISO/IEC 23003-5 support Zhao Zhili
2023-03-06 12:02 ` [FFmpeg-devel] [PATCH v3 2/5] avformat/isom_tags: remove ipcm from movaudio_tags Zhao Zhili
2023-03-06 12:02 ` [FFmpeg-devel] [PATCH v3 3/5] avformat/mov: parse ISO-14496-12 ChannelLayout Zhao Zhili
2023-03-06 12:26 ` Tomas Härdin
2023-03-07 2:27 ` "zhilizhao(赵志立)"
2023-03-06 12:02 ` [FFmpeg-devel] [PATCH v3 4/5] avformat/movenc: add PCM in mp4 support Zhao Zhili
2023-03-06 12:28 ` Tomas Härdin
2023-03-07 2:30 ` "zhilizhao(赵志立)"
2023-03-07 13:55 ` Tomas Härdin
2023-03-06 12:02 ` Zhao Zhili [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_BC69AE02156A5E7F4EAC723BE9C3F9B5600A@qq.com \
--to=quinkblack@foxmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=zhilizhao@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git