* [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags
@ 2022-09-10 19:58 Andreas Rheinhardt
2022-09-10 20:00 ` [FFmpeg-devel] [PATCH 2/2] fate/subtitles: Add PGS remux test Andreas Rheinhardt
2022-09-12 13:35 ` [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags Andreas Rheinhardt
0 siblings, 2 replies; 3+ messages in thread
From: Andreas Rheinhardt @ 2022-09-10 19:58 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
tests/fate/id3v2.mak | 5 ++++
tests/ref/fate/id3v2-utf16-bom | 42 ++++++++++++++++++++++++++++++++++
2 files changed, 47 insertions(+)
create mode 100644 tests/ref/fate/id3v2-utf16-bom
diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak
index 4dca681e38..7ad4d877a4 100644
--- a/tests/fate/id3v2.mak
+++ b/tests/fate/id3v2.mak
@@ -7,6 +7,11 @@ fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp
FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters
fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "-show_entries format_tags:chapters"
+# Tests reading and writing UTF-16 BOM strings; also tests
+# the AIFF muxer's and demuxer's ability to preserve channel layouts.
+FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER FLAC_DEMUXER PCM_S16LE_DECODER MJPEG_DECODER ARESAMPLE_FILTER CHANNELMAP_FILTER PCM_S24BE_ENCODER) += fate-id3v2-utf16-bom
+fate-id3v2-utf16-bom: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/yo.raw-short.wav aiff "-map 0:a -map 1:v -af aresample,channelmap=channel_layout=hexagonal,aresample -c:a pcm_s24be -c:v copy -write_id3v2 1 -id3v2_version 3 -map_metadata:g:0 1:g -map_metadata:s:v 1:g" "-c copy -t 0.05" "-show_entries stream=channel_layout:stream_tags:format_tags" "-i $(TARGET_SAMPLES)/cover_art/cover_art.flac"
+
FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes)
FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ID3V2_FFMPEG_FFPROBE-yes)
fate-id3v2: $(FATE_ID3V2_FFPROBE-yes) $(FATE_ID3V2_FFMPEG_FFPROBE-yes)
diff --git a/tests/ref/fate/id3v2-utf16-bom b/tests/ref/fate/id3v2-utf16-bom
new file mode 100644
index 0000000000..dd2566de2b
--- /dev/null
+++ b/tests/ref/fate/id3v2-utf16-bom
@@ -0,0 +1,42 @@
+9b8bfdf87a8d3d089819ef9f6f264ec4 *tests/data/fate/id3v2-utf16-bom.aiff
+885482 tests/data/fate/id3v2-utf16-bom.aiff
+#tb 0: 1/90000
+#media_type 0: video
+#codec_id 0: mjpeg
+#dimensions 0: 350x350
+#sar 0: 1/1
+#tb 1: 1/48000
+#media_type 1: audio
+#codec_id 1: pcm_s24be
+#sample_rate 1: 48000
+#channel_layout_name 1: hexagonal
+0, 0, 0, 0, 19650, 0xd5662610
+1, 0, 0, 227, 4086, 0x00000000
+1, 227, 227, 227, 4086, 0x00000000
+1, 454, 454, 227, 4086, 0x00000000
+1, 681, 681, 227, 4086, 0x667b2643
+1, 908, 908, 227, 4086, 0x9a09957d
+1, 1135, 1135, 227, 4086, 0x763e27c5
+1, 1362, 1362, 227, 4086, 0x2a47f536
+1, 1589, 1589, 227, 4086, 0xed32e5f2
+1, 1816, 1816, 227, 4086, 0x2e96c720
+1, 2043, 2043, 227, 4086, 0x84c5b5f0
+1, 2270, 2270, 227, 4086, 0xe3dfeefc
+[STREAM]
+channel_layout=hexagonal
+[/STREAM]
+[STREAM]
+TAG:title=Дороги
+TAG:comment=Other
+[/STREAM]
+[FORMAT]
+TAG:artist=Мельница
+TAG:RATING=0
+TAG:album=Ангелофрения
+TAG:title=Дороги
+TAG:tracktotal=11
+TAG:totaltracks=11
+TAG:genre=Folk
+TAG:track=2
+TAG:date=2012
+[/FORMAT]
--
2.34.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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] fate/subtitles: Add PGS remux test
2022-09-10 19:58 [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags Andreas Rheinhardt
@ 2022-09-10 20:00 ` Andreas Rheinhardt
2022-09-12 13:35 ` [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags Andreas Rheinhardt
1 sibling, 0 replies; 3+ messages in thread
From: Andreas Rheinhardt @ 2022-09-10 20:00 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Andreas Rheinhardt
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
tests/fate/subtitles.mak | 5 +++++
tests/ref/fate/sub-pgs-remux | 15 +++++++++++++++
2 files changed, 20 insertions(+)
create mode 100644 tests/ref/fate/sub-pgs-remux
diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak
index bc464edce6..e6684a814b 100644
--- a/tests/fate/subtitles.mak
+++ b/tests/fate/subtitles.mak
@@ -50,6 +50,11 @@ fate-sub-mpsub: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capability_te
FATE_SUBTITLES_ASS-$(call DEMDEC, MPSUB, TEXT) += fate-sub-mpsub-frames
fate-sub-mpsub-frames: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/MPSub_capability_tester_frames.sub
+# FIXME?: The dts in the input file are not monotonous and so the
+# timestamps of the remuxed file have been fixed up.
+FATE_SUBTITLES-$(call REMUX, SUP) += fate-sub-pgs-remux
+fate-sub-pgs-remux: CMD = transcode sup $(TARGET_SAMPLES)/sub/pgs_sub.sup sup "-copyts -c:s copy" "-copyts -c:s copy"
+
FATE_SUBTITLES_ASS-$(call DEMDEC, PJS, PJS) += fate-sub-pjs
fate-sub-pjs: CMD = fmtstdout ass -i $(TARGET_SAMPLES)/sub/PJS_capability_tester.pjs
diff --git a/tests/ref/fate/sub-pgs-remux b/tests/ref/fate/sub-pgs-remux
new file mode 100644
index 0000000000..e965d93bec
--- /dev/null
+++ b/tests/ref/fate/sub-pgs-remux
@@ -0,0 +1,15 @@
+cf306b7bc30122effc6429e35364f640 *tests/data/fate/sub-pgs-remux.sup
+49382 tests/data/fate/sub-pgs-remux.sup
+#tb 0: 1/90000
+#media_type 0: subtitle
+#codec_id 0: hdmv_pgs_subtitle
+0, 6072, 6072, 0, 30, 0x32b303ec
+0, 6072, 6072, 0, 22, 0x27510416
+0, 6072, 6072, 0, 160, 0xe2024133
+0, 6072, 6072, 0, 22943, 0xc011fe0e
+0, 6072, 6072, 0, 2969, 0x35604c6f
+0, 6072, 6072, 0, 3, 0x01800080
+0, 35426, 36102, 0, 30, 0x2db303ac
+0, 35426, 35862, 0, 22, 0x27510416
+0, 35426, 35426, 0, 160, 0xe2024133
+0, 35426, 35862, 0, 22943, 0xc011fe0e
--
2.34.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".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags
2022-09-10 19:58 [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags Andreas Rheinhardt
2022-09-10 20:00 ` [FFmpeg-devel] [PATCH 2/2] fate/subtitles: Add PGS remux test Andreas Rheinhardt
@ 2022-09-12 13:35 ` Andreas Rheinhardt
1 sibling, 0 replies; 3+ messages in thread
From: Andreas Rheinhardt @ 2022-09-12 13:35 UTC (permalink / raw)
To: ffmpeg-devel
Andreas Rheinhardt:
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> tests/fate/id3v2.mak | 5 ++++
> tests/ref/fate/id3v2-utf16-bom | 42 ++++++++++++++++++++++++++++++++++
> 2 files changed, 47 insertions(+)
> create mode 100644 tests/ref/fate/id3v2-utf16-bom
>
> diff --git a/tests/fate/id3v2.mak b/tests/fate/id3v2.mak
> index 4dca681e38..7ad4d877a4 100644
> --- a/tests/fate/id3v2.mak
> +++ b/tests/fate/id3v2.mak
> @@ -7,6 +7,11 @@ fate-id3v2-priv-remux: CMD = transcode mp3 $(TARGET_SAMPLES)/id3v2/id3v2_priv.mp
> FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER) += fate-id3v2-chapters
> fate-id3v2-chapters: CMD = transcode wav $(TARGET_SAMPLES)/wav/200828-005.wav aiff "-c copy -metadata:c:0 description=foo -metadata:c:0 date=2021 -metadata:c copyright=none -metadata:c:1 genre=nonsense -write_id3v2 1" "-c copy -t 0.05" "-show_entries format_tags:chapters"
>
> +# Tests reading and writing UTF-16 BOM strings; also tests
> +# the AIFF muxer's and demuxer's ability to preserve channel layouts.
> +FATE_ID3V2_FFMPEG_FFPROBE-$(call REMUX, AIFF, WAV_DEMUXER FLAC_DEMUXER PCM_S16LE_DECODER MJPEG_DECODER ARESAMPLE_FILTER CHANNELMAP_FILTER PCM_S24BE_ENCODER) += fate-id3v2-utf16-bom
> +fate-id3v2-utf16-bom: CMD = transcode wav $(TARGET_SAMPLES)/audio-reference/yo.raw-short.wav aiff "-map 0:a -map 1:v -af aresample,channelmap=channel_layout=hexagonal,aresample -c:a pcm_s24be -c:v copy -write_id3v2 1 -id3v2_version 3 -map_metadata:g:0 1:g -map_metadata:s:v 1:g" "-c copy -t 0.05" "-show_entries stream=channel_layout:stream_tags:format_tags" "-i $(TARGET_SAMPLES)/cover_art/cover_art.flac"
> +
> FATE_SAMPLES_FFPROBE += $(FATE_ID3V2_FFPROBE-yes)
> FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_ID3V2_FFMPEG_FFPROBE-yes)
> fate-id3v2: $(FATE_ID3V2_FFPROBE-yes) $(FATE_ID3V2_FFMPEG_FFPROBE-yes)
> diff --git a/tests/ref/fate/id3v2-utf16-bom b/tests/ref/fate/id3v2-utf16-bom
> new file mode 100644
> index 0000000000..dd2566de2b
> --- /dev/null
> +++ b/tests/ref/fate/id3v2-utf16-bom
> @@ -0,0 +1,42 @@
> +9b8bfdf87a8d3d089819ef9f6f264ec4 *tests/data/fate/id3v2-utf16-bom.aiff
> +885482 tests/data/fate/id3v2-utf16-bom.aiff
> +#tb 0: 1/90000
> +#media_type 0: video
> +#codec_id 0: mjpeg
> +#dimensions 0: 350x350
> +#sar 0: 1/1
> +#tb 1: 1/48000
> +#media_type 1: audio
> +#codec_id 1: pcm_s24be
> +#sample_rate 1: 48000
> +#channel_layout_name 1: hexagonal
> +0, 0, 0, 0, 19650, 0xd5662610
> +1, 0, 0, 227, 4086, 0x00000000
> +1, 227, 227, 227, 4086, 0x00000000
> +1, 454, 454, 227, 4086, 0x00000000
> +1, 681, 681, 227, 4086, 0x667b2643
> +1, 908, 908, 227, 4086, 0x9a09957d
> +1, 1135, 1135, 227, 4086, 0x763e27c5
> +1, 1362, 1362, 227, 4086, 0x2a47f536
> +1, 1589, 1589, 227, 4086, 0xed32e5f2
> +1, 1816, 1816, 227, 4086, 0x2e96c720
> +1, 2043, 2043, 227, 4086, 0x84c5b5f0
> +1, 2270, 2270, 227, 4086, 0xe3dfeefc
> +[STREAM]
> +channel_layout=hexagonal
> +[/STREAM]
> +[STREAM]
> +TAG:title=Дороги
> +TAG:comment=Other
> +[/STREAM]
> +[FORMAT]
> +TAG:artist=Мельница
> +TAG:RATING=0
> +TAG:album=Ангелофрения
> +TAG:title=Дороги
> +TAG:tracktotal=11
> +TAG:totaltracks=11
> +TAG:genre=Folk
> +TAG:track=2
> +TAG:date=2012
> +[/FORMAT]
Will apply this patchset tonight unless there are objections.
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-12 13:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-10 19:58 [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags Andreas Rheinhardt
2022-09-10 20:00 ` [FFmpeg-devel] [PATCH 2/2] fate/subtitles: Add PGS remux test Andreas Rheinhardt
2022-09-12 13:35 ` [FFmpeg-devel] [PATCH 1/2] fate/id3v2: Add test for reading and writing UTF-16 BOM tags Andreas Rheinhardt
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