From 2f4ef9cbdfad716bcf1b4d4c99161e23b7cf24f0 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 10 Apr 2021 21:20:00 +0200 Subject: fate/cover-art: Add test for writing id3v2 tags and apic with AIFF/MP3 Notice that the order of the APIC tracks is currently wrong. This is a superposition of two bugs: (i) Both muxers write the attached pictures in the order they arrive in the muxer and not in the stream_index order, leading to attached pictures that are copied being written earlier because their timestamp is AV_NOPTS_VALUE, whereas the timestamp of the encoded pictures is 0. (ii) A bug in the id3v2 parsing code reverses the order of the parsed pictures. Signed-off-by: Andreas Rheinhardt --- tests/ref/fate/cover-art-aiff-id3v2-remux | 82 +++++++++++++++++++++++++++++++ tests/ref/fate/cover-art-mp3-id3v2-remux | 55 +++++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 tests/ref/fate/cover-art-aiff-id3v2-remux create mode 100644 tests/ref/fate/cover-art-mp3-id3v2-remux (limited to 'tests/ref') diff --git a/tests/ref/fate/cover-art-aiff-id3v2-remux b/tests/ref/fate/cover-art-aiff-id3v2-remux new file mode 100644 index 0000000000..207721fc71 --- /dev/null +++ b/tests/ref/fate/cover-art-aiff-id3v2-remux @@ -0,0 +1,82 @@ +d4a9481090a8bab1a3f072a8108a1d6a *tests/data/fate/cover-art-aiff-id3v2-remux.aiff +608914 tests/data/fate/cover-art-aiff-id3v2-remux.aiff +#tb 0: 1/44100 +#media_type 0: audio +#codec_id 0: pcm_s16be +#sample_rate 0: 44100 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +#tb 1: 1/90000 +#media_type 1: video +#codec_id 1: bmp +#dimensions 1: 350x350 +#sar 1: 0/1 +#tb 2: 1/90000 +#media_type 2: video +#codec_id 2: png +#dimensions 2: 350x350 +#sar 2: 1/1 +#tb 3: 1/90000 +#media_type 3: video +#codec_id 3: mjpeg +#dimensions 3: 350x350 +#sar 3: 1/1 +#tb 4: 1/90000 +#media_type 4: video +#codec_id 4: mjpeg +#dimensions 4: 350x350 +#sar 4: 1/1 +0, 0, 0, 1024, 4096, 0xdac4695d +1, 0, 0, 0, 368254, 0xfa7f4bd8 +2, 0, 0, 0, 184497, 0xc33f8d44 +3, 0, 0, 0, 19650, 0xd5662610 +4, 0, 0, 0, 19650, 0xd5662610 +0, 1024, 1024, 1024, 4096, 0xad05c909 +0, 2048, 2048, 1024, 4096, 0x97e3b8f8 +0, 3072, 3072, 1024, 4096, 0xb08180fa +[STREAM] +index=0 +codec_name=pcm_s16be +DISPOSITION:attached_pic=0 +[/STREAM] +[STREAM] +index=1 +codec_name=bmp +DISPOSITION:attached_pic=1 +TAG:title=third +TAG:comment=Conductor +[/STREAM] +[STREAM] +index=2 +codec_name=png +DISPOSITION:attached_pic=1 +TAG:title=second +TAG:comment=Illustration +[/STREAM] +[STREAM] +index=3 +codec_name=mjpeg +DISPOSITION:attached_pic=1 +TAG:title=fourth +TAG:comment=Composer +[/STREAM] +[STREAM] +index=4 +codec_name=mjpeg +DISPOSITION:attached_pic=1 +TAG:title=first +TAG:comment=Other +[/STREAM] +[FORMAT] +TAG:artist=Мельница +TAG:RATING=0 +TAG:album=Ангелофрения +TAG:title=Дороги +TAG:tracktotal=11 +TAG:totaltracks=11 +TAG:genre=Folk +TAG:date=2012 +TAG:track=2 +TAG:unknown_key=unknown_value +TAG:compilation=foo +[/FORMAT] diff --git a/tests/ref/fate/cover-art-mp3-id3v2-remux b/tests/ref/fate/cover-art-mp3-id3v2-remux new file mode 100644 index 0000000000..a3bc8c7891 --- /dev/null +++ b/tests/ref/fate/cover-art-mp3-id3v2-remux @@ -0,0 +1,55 @@ +c1b55a9a92226cd72d3f53ccd830d127 *tests/data/fate/cover-art-mp3-id3v2-remux.mp3 +399346 tests/data/fate/cover-art-mp3-id3v2-remux.mp3 +#tb 0: 1/14112000 +#media_type 0: audio +#codec_id 0: mp3 +#sample_rate 0: 44100 +#channel_layout 0: 3 +#channel_layout_name 0: stereo +#tb 1: 1/90000 +#media_type 1: video +#codec_id 1: png +#dimensions 1: 263x263 +#sar 1: 1/1 +#tb 2: 1/90000 +#media_type 2: video +#codec_id 2: bmp +#dimensions 2: 263x263 +#sar 2: 0/1 +#tb 3: 1/90000 +#media_type 3: video +#codec_id 3: mjpeg +#dimensions 3: 263x263 +#sar 3: 96/96 +0, -353590, -353590, 368640, 417, 0x15848290, S=1, 10, 0x034e0055 +1, 0, 0, 0, 165671, 0x7c1c8070 +2, 0, 0, 0, 208350, 0x291b44d1 +3, 0, 0, 0, 15760, 0x71d5c418 +0, 15050, 15050, 368640, 418, 0x46f684a4 +0, 383690, 383690, 368640, 418, 0x46f684a4 +0, 752330, 752330, 368640, 418, 0x46f684a4 +0, 1120970, 1120970, 368640, 418, 0x46f684a4 +[STREAM] +index=0 +codec_name=mp3 +DISPOSITION:attached_pic=0 +TAG:encoder=Lavf +[/STREAM] +[STREAM] +index=1 +codec_name=png +DISPOSITION:attached_pic=1 +TAG:comment=Other +[/STREAM] +[STREAM] +index=2 +codec_name=bmp +DISPOSITION:attached_pic=1 +TAG:comment=Band/Orchestra +[/STREAM] +[STREAM] +index=3 +codec_name=mjpeg +DISPOSITION:attached_pic=1 +TAG:comment=Other +[/STREAM] -- cgit v1.2.3