Andreas Rheinhardt: > Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@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-requ...@ffmpeg.org with subject "unsubscribe".
