PR #23677 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23677 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/23677.patch
Use the fixed-point mp3 decoder to get identical output across plattforms. >From 7ffc0a137c04dd13c115690f36c6aea8a5002ac0 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt <[email protected]> Date: Wed, 1 Jul 2026 19:34:54 +0200 Subject: [PATCH] tests/fate/generic-tags: Fix generic-tags-remux-mov test Use the fixed-point mp3 decoder to get identical output across plattforms. Signed-off-by: Andreas Rheinhardt <[email protected]> --- tests/fate-run.sh | 4 +- tests/fate/generic-tags.mak | 2 +- tests/ref/fate/generic-tags-remux-mov | 60 +++++++++++++-------------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index a0aee7158d..577015422f 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -729,10 +729,12 @@ generic_tags(){ enc_fmt="$3" enc_codec="$4" extra_args="${5:-}" + enc_opt_in="$6" transcode "$src_fmt" "$srcfile" "$enc_fmt" \ "-c:a $enc_codec $extra_args" \ "-c copy" \ - "-show_entries format_tags" + "-show_entries format_tags" "" "" \ + "$enc_opt_in" } null(){ diff --git a/tests/fate/generic-tags.mak b/tests/fate/generic-tags.mak index 62ef2308b0..bcd11dec96 100644 --- a/tests/fate/generic-tags.mak +++ b/tests/fate/generic-tags.mak @@ -25,7 +25,7 @@ fate-generic-tags-remux-riff: CMD = generic_tags mp3 $(TARGET_PATH)/tests/data/g FATE_GENERIC_TAGS-$(call REMUX, MP3, MOV_MUXER MOV_DEMUXER AC3_FIXED_ENCODER AC3_DECODER ARESAMPLE_FILTER) += fate-generic-tags-remux-mov fate-generic-tags-remux-mov: tests/data/generic-tags.mp3 -fate-generic-tags-remux-mov: CMD = generic_tags mp3 $(TARGET_PATH)/tests/data/generic-tags.mp3 mp4 ac3_fixed "-af aresample" +fate-generic-tags-remux-mov: CMD = generic_tags mp3 $(TARGET_PATH)/tests/data/generic-tags.mp3 mp4 ac3_fixed "-af aresample" "-c:a mp3" FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_GENERIC_TAGS-yes) fate-generic-tags: $(FATE_GENERIC_TAGS-yes) diff --git a/tests/ref/fate/generic-tags-remux-mov b/tests/ref/fate/generic-tags-remux-mov index 3c613930e0..331d954f12 100644 --- a/tests/ref/fate/generic-tags-remux-mov +++ b/tests/ref/fate/generic-tags-remux-mov @@ -1,39 +1,39 @@ -6500c92bb8147ca1eb14ef41fbc4c220 *tests/data/fate/generic-tags-remux-mov.mp4 +6665148eac9653d97e4b36fecd15b905 *tests/data/fate/generic-tags-remux-mov.mp4 13392 tests/data/fate/generic-tags-remux-mov.mp4 #tb 0: 1/44100 #media_type 0: audio #codec_id 0: ac3 #sample_rate 0: 44100 #channel_layout_name 0: mono -0, -256, -256, 1536, 416, 0x4e08b907, S=1, Skip Samples, 10, 0x00090001 -0, 1280, 1280, 1536, 418, 0xe2bdb9cb -0, 2816, 2816, 1536, 418, 0x3a97c7c4 -0, 4352, 4352, 1536, 418, 0x2775c40f -0, 5888, 5888, 1536, 418, 0xd12ac751 -0, 7424, 7424, 1536, 418, 0xd97ac051 -0, 8960, 8960, 1536, 418, 0x60f9bb7e -0, 10496, 10496, 1536, 418, 0x418dc89b -0, 12032, 12032, 1536, 418, 0xa905c386 -0, 13568, 13568, 1536, 418, 0x6ab3c0e0 -0, 15104, 15104, 1536, 418, 0x8c47c129 -0, 16640, 16640, 1536, 418, 0x1f5ec5c9 -0, 18176, 18176, 1536, 418, 0xc8decb76 -0, 19712, 19712, 1536, 418, 0xd7fdc93a -0, 21248, 21248, 1536, 418, 0xf1bbc7ca -0, 22784, 22784, 1536, 418, 0x5d4bcd8d -0, 24320, 24320, 1536, 418, 0xd188c852 -0, 25856, 25856, 1536, 418, 0xc6ecc548 -0, 27392, 27392, 1536, 418, 0x5ca3cffb -0, 28928, 28928, 1536, 418, 0x9684bfed -0, 30464, 30464, 1536, 418, 0x9ec6ccfe -0, 32000, 32000, 1536, 418, 0x73a2c4cd -0, 33536, 33536, 1536, 418, 0x1738cc20 -0, 35072, 35072, 1536, 418, 0x46bac7b8 -0, 36608, 36608, 1536, 418, 0x5fe2b4ed -0, 38144, 38144, 1536, 418, 0x92c1c2fb -0, 39680, 39680, 1536, 418, 0xd01fc8b3 -0, 41216, 41216, 1536, 418, 0x1f1fcd05 -0, 42752, 42752, 1536, 418, 0xa35ecbab, S=1, Skip Samples, 10, 0x046800bc +0, -256, -256, 1536, 416, 0xa317b92e, S=1, Skip Samples, 10, 0x00090001 +0, 1280, 1280, 1536, 418, 0xefa8c351 +0, 2816, 2816, 1536, 418, 0x599bc72c +0, 4352, 4352, 1536, 418, 0x0b14c403 +0, 5888, 5888, 1536, 418, 0x65afc7cc +0, 7424, 7424, 1536, 418, 0x4028c2d1 +0, 8960, 8960, 1536, 418, 0xe4d9bd72 +0, 10496, 10496, 1536, 418, 0x69fcc7fc +0, 12032, 12032, 1536, 418, 0x7757c2a8 +0, 13568, 13568, 1536, 418, 0xb925c083 +0, 15104, 15104, 1536, 418, 0xee7cc172 +0, 16640, 16640, 1536, 418, 0x0cbec68b +0, 18176, 18176, 1536, 418, 0x4192ca68 +0, 19712, 19712, 1536, 418, 0xf8f2ca0c +0, 21248, 21248, 1536, 418, 0xa76cc83b +0, 22784, 22784, 1536, 418, 0x93b1cd30 +0, 24320, 24320, 1536, 418, 0x3a96c7a0 +0, 25856, 25856, 1536, 418, 0xbbb3c5c3 +0, 27392, 27392, 1536, 418, 0x1e7acfbc +0, 28928, 28928, 1536, 418, 0x2dccc08a +0, 30464, 30464, 1536, 418, 0xbb02cdcd +0, 32000, 32000, 1536, 418, 0x9535c5d1 +0, 33536, 33536, 1536, 418, 0xdfc7cb2a +0, 35072, 35072, 1536, 418, 0xf254c6ba +0, 36608, 36608, 1536, 418, 0x7c02b551 +0, 38144, 38144, 1536, 418, 0x47b6c41b +0, 39680, 39680, 1536, 418, 0x4227c8f0 +0, 41216, 41216, 1536, 418, 0x8266cdee +0, 42752, 42752, 1536, 418, 0xeca4caac, S=1, Skip Samples, 10, 0x046800bc [FORMAT] TAG:major_brand=isom TAG:minor_version=512 -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
