May 2022 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/libaomenc: Expose the allintra usage mode
by Vignesh Venkatasubramanian 31 May '22

31 May '22

ffmpeg | branch: master | Vignesh Venkatasubramanian <vigneshv(a)google.com> | Wed May 18 10:37:55 2022 -0700| [f55c91497d4d16d393ae9c034bd3032a683802ca] | committer: James Almer avcodec/libaomenc: Expose the allintra usage mode libaom added an usage=allintra mode for doing better with still images. Expose that in the ffmpeg's wrapper. This is especially useful for encoding still AVIF images. Signed-off-by: Vignesh Venkatasubramanian <vigneshv(a)google.com> Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f55c91497d4d16d39… --- libavcodec/libaomenc.c | 1 + libavcodec/version.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index ca5a581b3e..7865ae161f 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1364,6 +1364,7 @@ static const AVOption options[] = { { "usage", "Quality and compression efficiency vs speed trade-off", OFFSET(usage), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, VE, "usage"}, { "good", "Good quality", 0, AV_OPT_TYPE_CONST, {.i64 = 0 /* AOM_USAGE_GOOD_QUALITY */}, 0, 0, VE, "usage"}, { "realtime", "Realtime encoding", 0, AV_OPT_TYPE_CONST, {.i64 = 1 /* AOM_USAGE_REALTIME */}, 0, 0, VE, "usage"}, + { "allintra", "All Intra encoding", 0, AV_OPT_TYPE_CONST, {.i64 = 2 /* AOM_USAGE_ALL_INTRA */}, 0, 0, VE, "usage"}, { "tune", "The metric that the encoder tunes for. Automatically chosen by the encoder by default", OFFSET(tune), AV_OPT_TYPE_INT, {.i64 = -1}, -1, AOM_TUNE_SSIM, VE, "tune"}, { "psnr", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_PSNR}, 0, 0, VE, "tune"}, { "ssim", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = AOM_TUNE_SSIM}, 0, 0, VE, "tune"}, diff --git a/libavcodec/version.h b/libavcodec/version.h index 02192c86f7..d6f1440d54 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 32 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \

1 0

avcodec/vp9: ipred_hd_16x16_16 avx2 implementation
by Semen Belozerov 31 May '22

31 May '22

ffmpeg | branch: master | Semen Belozerov <sinonim147(a)gmail.com> | Thu May 26 11:42:25 2022 +0700| [3a7e9caf920c9949076c5e51651d3e99b19e295b] | committer: Ronald S. Bultje avcodec/vp9: ipred_hd_16x16_16 avx2 implementation Signed-off-by: Ronald S. Bultje <rsbultje(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a7e9caf920c99490… --- libavcodec/x86/vp9dsp_init_16bpp.c | 2 ++ libavcodec/x86/vp9intrapred_16bpp.asm | 54 +++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/libavcodec/x86/vp9dsp_init_16bpp.c b/libavcodec/x86/vp9dsp_init_16bpp.c index b17826326f..e5afea1512 100644 --- a/libavcodec/x86/vp9dsp_init_16bpp.c +++ b/libavcodec/x86/vp9dsp_init_16bpp.c @@ -55,6 +55,7 @@ decl_ipred_fn(dl, 32, 16, avx2); decl_ipred_fn(dr, 16, 16, avx2); decl_ipred_fn(dr, 32, 16, avx2); decl_ipred_fn(vl, 16, 16, avx2); +decl_ipred_fn(hd, 16, 16, avx2); #define decl_ipred_dir_funcs(type) \ decl_ipred_fns(type, 16, sse2, sse2); \ @@ -141,6 +142,7 @@ av_cold void ff_vp9dsp_init_16bpp_x86(VP9DSPContext *dsp) init_ipred_func(dl, DIAG_DOWN_LEFT, 32, 16, avx2); init_ipred_func(dr, DIAG_DOWN_RIGHT, 16, 16, avx2); init_ipred_func(vl, VERT_LEFT, 16, 16, avx2); + init_ipred_func(hd, HOR_DOWN, 16, 16, avx2); #if ARCH_X86_64 init_ipred_func(dr, DIAG_DOWN_RIGHT, 32, 16, avx2); #endif diff --git a/libavcodec/x86/vp9intrapred_16bpp.asm b/libavcodec/x86/vp9intrapred_16bpp.asm index 0dad91ac5c..808056a809 100644 --- a/libavcodec/x86/vp9intrapred_16bpp.asm +++ b/libavcodec/x86/vp9intrapred_16bpp.asm @@ -1273,6 +1273,60 @@ cglobal vp9_ipred_vl_16x16_16, 4, 5, 7, dst, stride, l, a mova [dst4q+stride3q*4], m1 ; 15 IJKLMNOPPPPPPPPP RET +cglobal vp9_ipred_hd_16x16_16, 4, 5, 7, dst, stride, l, a + movu m0, [aq-2] ; *abcdefghijklmno + mova m1, [lq] ; klmnopqrstuvwxyz + vperm2i128 m2, m1, m0, q0201 ; stuvwxyz*abcdefg + vpalignr m3, m2, m1, 2 ; lmnopqrstuvwxyz* + vpalignr m4, m2, m1, 4 ; mnopqrstuvwxyz*a + LOWPASS 4, 3, 1 ; LMNOPQRSTUVWXYZ# + pavgw m3, m1 ; klmnopqrstuvwxyz + mova m1, [aq] ; abcdefghijklmnop + movu m2, [aq+2] ; bcdefghijklmnop. + LOWPASS 2, 1, 0 ; ABCDEFGHIJKLMNO. + vpunpcklwd m0, m3, m4 ; kLlMmNnOsTtUuVvW + vpunpckhwd m1, m3, m4 ; oPpQqRrSwXxYyZz# + vperm2i128 m3, m1, m0, q0002 ; kLlMmNnOoPpQqRrS + vperm2i128 m4, m0, m1, q0301 ; sTtUuVvWwXxYyZz# + vperm2i128 m0, m4, m2, q0201 ; wXxYyZz#ABCDEFGH + vperm2i128 m1, m3, m4, q0201 ; oPpQqRrSsTtUuVvW + DEFINE_ARGS dst, stride, stride3, stride5, dst5 + lea stride3q, [strideq*3] + lea stride5q, [stride3q+strideq*2] + lea dst5q, [dstq+stride5q] + + mova [dst5q+stride5q*2], m3 ; 15 kLlMmNnOoPpQqRrS + mova [dst5q+stride3q*2], m1 ; 11 oPpQqRrSsTtUuVvW + mova [dst5q+strideq*2], m4 ; 7 sTtUuVvWwXxYyZz# + mova [dstq+stride3q*1], m0 ; 3 wXxYyZz#ABCDEFGH + vpalignr m5, m4, m1, 4 + mova [dstq+stride5q*2], m5 ; 10 pQqRrSsTtUuVvWwX + vpalignr m5, m0, m4, 4 + vpalignr m6, m2, m0, 4 + mova [dstq+stride3q*2], m5 ; 6 tUuVvWwXxYyZz#AB + mova [dstq+strideq*2], m6 ; 2 xYyZz#ABCDEFGHIJ + vpalignr m5, m4, m1, 8 + mova [dst5q+strideq*4], m5 ; 9 qRrSsTtUuVvWwXxY + vpalignr m5, m0, m4, 8 + vpalignr m6, m2, m0, 8 + mova [dstq+stride5q*1], m5 ; 5 uVvWwXxYyZz#ABCD + mova [dstq+strideq*1], m6 ; 1 yZz#ABCDEFGHIJKL + vpalignr m5, m1, m3, 12 + vpalignr m6, m4, m1, 12 + mova [dstq+stride3q*4], m5 ; 12 nOoPpQqRrSsTtUuV + mova [dst5q+stride3q], m6 ; 8 rSsTtUuVvWwXxYyZ + vpalignr m5, m0, m4, 12 + vpalignr m6, m2, m0, 12 + mova [dstq+strideq*4], m5 ; 4 nOoPpQqRrSsTtUuV + mova [dstq+strideq*0], m6 ; 0 z#ABCDEFGHIJKLMN + sub dst5q, strideq + vpalignr m5, m1, m3, 4 + mova [dst5q+stride5q*2], m5 ; 14 lMmNnOoPpQqRrSsT + sub dst5q, strideq + vpalignr m5, m1, m3, 8 + mova [dst5q+stride5q*2], m5 ; 13 mNnOoPpQqRrSsTtU + RET + %if ARCH_X86_64 cglobal vp9_ipred_dr_32x32_16, 4, 7, 10, dst, stride, l, a mova m0, [lq+mmsize*0+0] ; l[0-15]

1 0

fate/wavpack: Test APE cuesheet tags
by Andreas Rheinhardt 31 May '22

31 May '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon May 30 15:04:35 2022 +0200| [bdba8ecce2402dcecd767c044cba49d7de12abec] | committer: Andreas Rheinhardt fate/wavpack: Test APE cuesheet tags The cue_sheet.wv sample contains a cue sheet as APE tags, yet this is not really covered by fate-wavpack-cuesheet because the metadata does not affect the output of said test. So add a proper test for this. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bdba8ecce2402dcec… --- tests/fate/wavpack.mak | 7 ++- tests/ref/fate/wavpack-cuesheet-tags | 98 ++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index 900e509aba..c684d93f99 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -77,6 +77,10 @@ fate-wavpack-clipping: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/clippi FATE_WAVPACK_S16 += fate-wavpack-cuesheet fate-wavpack-cuesheet: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample +# The sample file has APE tags containing a cuesheet. +FATE_WAVPACK_FFPROBE-$(call ALLYES, WV_DEMUXER FILE_PROTOCOL) += fate-wavpack-cuesheet-tags +fate-wavpack-cuesheet-tags: CMD = probetags $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv + FATE_WAVPACK_S16 += fate-wavpack-falsestereo fate-wavpack-falsestereo: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample @@ -102,5 +106,6 @@ FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S32) FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_F32) +FATE_SAMPLES_FFPROBE += $(FATE_WAVPACK_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_WAVPACK-yes) -fate-wavpack: $(FATE_WAVPACK-yes) +fate-wavpack: $(FATE_WAVPACK-yes) $(FATE_WAVPACK_FFPROBE-yes) diff --git a/tests/ref/fate/wavpack-cuesheet-tags b/tests/ref/fate/wavpack-cuesheet-tags new file mode 100644 index 0000000000..be6b694ae5 --- /dev/null +++ b/tests/ref/fate/wavpack-cuesheet-tags @@ -0,0 +1,98 @@ +[FORMAT] +TAG:Cuesheet=REM GENRE Zydeco/Cajun +REM DATE 1997 +PERFORMER "BeauSoliel" +TITLE "L'Amour ou la Folie" +REM REPLAYGAIN_ALBUM_GAIN -6.54 dB +REM REPLAYGAIN_ALBUM_PEAK 0.972900 +FILE "CDImage.wv" WAVE + TRACK 01 AUDIO + TITLE "Newz Reel" + REM REPLAYGAIN_TRACK_GAIN -6.47 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 00:00:00 + INDEX 01 00:00:32 + TRACK 02 AUDIO + TITLE "Les Blues de Crève de Faim" + REM REPLAYGAIN_TRACK_GAIN -4.56 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 02:18:58 + INDEX 01 02:21:30 + TRACK 03 AUDIO + TITLE "L'Amour ou la Folie" + REM REPLAYGAIN_TRACK_GAIN -7.06 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 06:08:40 + INDEX 01 06:10:47 + TRACK 04 AUDIO + TITLE "It's A Sin To Tell A Lie (C'est un Péché de Dire un Menterie)" + REM REPLAYGAIN_TRACK_GAIN -5.28 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 11:29:30 + INDEX 01 11:31:40 + TRACK 05 AUDIO + TITLE "Eunice Two-Step" + REM REPLAYGAIN_TRACK_GAIN -7.72 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 16:18:13 + INDEX 01 16:21:10 + TRACK 06 AUDIO + TITLE "Charivari" + REM REPLAYGAIN_TRACK_GAIN -5.47 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 20:57:53 + INDEX 01 21:00:37 + TRACK 07 AUDIO + TITLE "Boudreaux" + REM REPLAYGAIN_TRACK_GAIN -4.71 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 26:23:25 + INDEX 01 26:25:65 + TRACK 08 AUDIO + TITLE "Valse à Pop" + REM REPLAYGAIN_TRACK_GAIN -5.20 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 29:25:33 + INDEX 01 29:27:12 + TRACK 09 AUDIO + TITLE "Can't You See (Tu Vas Voir)" + REM REPLAYGAIN_TRACK_GAIN -6.17 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 32:50:25 + INDEX 01 32:53:10 + TRACK 10 AUDIO + TITLE "Les Blues de la Prison" + REM REPLAYGAIN_TRACK_GAIN -5.44 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 35:59:05 + INDEX 01 36:01:62 + TRACK 11 AUDIO + TITLE "Danse Caribe" + REM REPLAYGAIN_TRACK_GAIN -7.46 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 39:26:73 + INDEX 01 39:29:47 + TRACK 12 AUDIO + TITLE "Valse J'Aime" + REM REPLAYGAIN_TRACK_GAIN -7.92 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 43:35:25 + INDEX 01 43:38:15 + TRACK 13 AUDIO + TITLE "Courir avec Walker" + REM REPLAYGAIN_TRACK_GAIN -5.19 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 47:30:05 + INDEX 01 47:32:70 + TRACK 14 AUDIO + TITLE "Ma Vie S'est Arrêtée" + REM REPLAYGAIN_TRACK_GAIN -5.60 dB + REM REPLAYGAIN_TRACK_PEAK 0.972900 + INDEX 00 51:31:08 + INDEX 01 51:33:72 + +TAG:Artist=BeauSoliel +TAG:Album=L'Amour ou la Folie +TAG:Year=1997 +TAG:Genre=Zydeco/Cajun +[/FORMAT]

1 0

fate/wavpack: Avoid temp files
by Andreas Rheinhardt 31 May '22

31 May '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon May 30 13:52:02 2022 +0200| [2351212227337faed7e36647fdd511fd9817d4b0] | committer: Andreas Rheinhardt fate/wavpack: Avoid temp files Use the md5 protocol instead of creating a file just to calculate its MD5 checksum. This is possible because there are no output seeks involved in any of these tests. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2351212227337faed… --- tests/fate/wavpack.mak | 64 +++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index dc9cc29268..900e509aba 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -1,90 +1,90 @@ # lossless FATE_WAVPACK_S8 += fate-wavpack-lossless-8bit -fate-wavpack-lossless-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8 -af aresample +fate-wavpack-lossless-8bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8 -af aresample FATE_WAVPACK_S16 += fate-wavpack-lossless-12bit -fate-wavpack-lossless-12bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le -af aresample +fate-wavpack-lossless-12bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-lossless-16bit -fate-wavpack-lossless-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le -af aresample +fate-wavpack-lossless-16bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le -af aresample FATE_WAVPACK_S24 += fate-wavpack-lossless-24bit -fate-wavpack-lossless-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le -af aresample +fate-wavpack-lossless-24bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le -af aresample FATE_WAVPACK_S32 += fate-wavpack-lossless-32bit -fate-wavpack-lossless-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le -af aresample +fate-wavpack-lossless-32bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le -af aresample FATE_WAVPACK_F32 += fate-wavpack-lossless-float -fate-wavpack-lossless-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le -af aresample +fate-wavpack-lossless-float: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le -af aresample # lossy FATE_WAVPACK_S8 += fate-wavpack-lossy-8bit -fate-wavpack-lossy-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8 -af aresample +fate-wavpack-lossy-8bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8 -af aresample FATE_WAVPACK_S16 += fate-wavpack-lossy-16bit -fate-wavpack-lossy-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le -af aresample +fate-wavpack-lossy-16bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le -af aresample FATE_WAVPACK_S24 += fate-wavpack-lossy-24bit -fate-wavpack-lossy-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le -af aresample +fate-wavpack-lossy-24bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le -af aresample FATE_WAVPACK_S32 += fate-wavpack-lossy-32bit -fate-wavpack-lossy-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le -af aresample +fate-wavpack-lossy-32bit: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le -af aresample FATE_WAVPACK_F32 += fate-wavpack-lossy-float -fate-wavpack-lossy-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le -af aresample +fate-wavpack-lossy-float: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le -af aresample # channel configurations FATE_WAVPACK_F32 += fate-wavpack-channels-monofloat -fate-wavpack-channels-monofloat: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le -af aresample +fate-wavpack-channels-monofloat: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le -af aresample FATE_WAVPACK_S16 += fate-wavpack-channels-monoint -fate-wavpack-channels-monoint: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le -af aresample +fate-wavpack-channels-monoint: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-channels-4.0 -fate-wavpack-channels-4.0: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le -af aresample +fate-wavpack-channels-4.0: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-channels-5.1 -fate-wavpack-channels-5.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le -af aresample +fate-wavpack-channels-5.1: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-channels-6.1 -fate-wavpack-channels-6.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le -af aresample +fate-wavpack-channels-6.1: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-channels-7.1 -fate-wavpack-channels-7.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le -af aresample +fate-wavpack-channels-7.1: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le -af aresample # speed modes FATE_WAVPACK_S16 += fate-wavpack-speed-default -fate-wavpack-speed-default: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv -f s16le -af aresample +fate-wavpack-speed-default: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-speed-fast -fate-wavpack-speed-fast: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv -f s16le -af aresample +fate-wavpack-speed-fast: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-speed-high -fate-wavpack-speed-high: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv -f s16le -af aresample +fate-wavpack-speed-high: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-speed-vhigh -fate-wavpack-speed-vhigh: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv -f s16le -af aresample +fate-wavpack-speed-vhigh: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv -f s16le -af aresample # special cases FATE_WAVPACK_S16 += fate-wavpack-clipping -fate-wavpack-clipping: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le -af aresample +fate-wavpack-clipping: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-cuesheet -fate-wavpack-cuesheet: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample +fate-wavpack-cuesheet: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-falsestereo -fate-wavpack-falsestereo: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample +fate-wavpack-falsestereo: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample FATE_WAVPACK_S16 += fate-wavpack-zerolsbs -fate-wavpack-zerolsbs: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le -af aresample +fate-wavpack-zerolsbs: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le -af aresample -FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, WAVPACK, PCM_S16LE, PCM_S16LE) += fate-wavpack-matroskamode -fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le -af aresample +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, WAVPACK, PCM_S16LE, PCM_S16LE, MD5_PROTOCOL) += fate-wavpack-matroskamode +fate-wavpack-matroskamode: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le -af aresample FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA, MD5_PROTOCOL) += fate-wavpack-matroska_mux-mono fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska @@ -96,11 +96,11 @@ fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_cha fate-wavpack-matroska_mux-61: CMP = oneline fate-wavpack-matroska_mux-61: REF = 2bbb393d060fa841f1172028f2c69b3a -FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S8, PCM_S8) += $(FATE_WAVPACK_S8) -FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S16LE, PCM_S16LE) += $(FATE_WAVPACK_S16) -FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S24LE) += $(FATE_WAVPACK_S24) -FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE) += $(FATE_WAVPACK_S32) -FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE) += $(FATE_WAVPACK_F32) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S8, PCM_S8, MD5_PROTOCOL) += $(FATE_WAVPACK_S8) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S16LE, PCM_S16LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S16) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S24LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S24) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_S32) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE, MD5_PROTOCOL) += $(FATE_WAVPACK_F32) FATE_SAMPLES_FFMPEG += $(FATE_WAVPACK-yes) fate-wavpack: $(FATE_WAVPACK-yes)

1 0

fate/wavpack: Fix test requirements
by Andreas Rheinhardt 31 May '22

31 May '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon May 30 13:22:49 2022 +0200| [3b770682ddcd5bfd836b3f219edcffdec8552db1] | committer: Andreas Rheinhardt fate/wavpack: Fix test requirements Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b770682ddcd5bfd8… --- tests/fate/wavpack.mak | 66 ++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index 8a15e536cc..dc9cc29268 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -1,102 +1,106 @@ -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += $(FATE_WAVPACK) - # lossless -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-8bit +FATE_WAVPACK_S8 += fate-wavpack-lossless-8bit fate-wavpack-lossless-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/8bit-partial.wv -f s8 -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-12bit +FATE_WAVPACK_S16 += fate-wavpack-lossless-12bit fate-wavpack-lossless-12bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/12bit-partial.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-16bit +FATE_WAVPACK_S16 += fate-wavpack-lossless-16bit fate-wavpack-lossless-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/16bit-partial.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-24bit +FATE_WAVPACK_S24 += fate-wavpack-lossless-24bit fate-wavpack-lossless-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/24bit-partial.wv -f s24le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-32bit +FATE_WAVPACK_S32 += fate-wavpack-lossless-32bit fate-wavpack-lossless-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_int-partial.wv -f s32le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossless-float +FATE_WAVPACK_F32 += fate-wavpack-lossless-float fate-wavpack-lossless-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossless/32bit_float-partial.wv -f f32le -af aresample # lossy -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-8bit +FATE_WAVPACK_S8 += fate-wavpack-lossy-8bit fate-wavpack-lossy-8bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_8-bit.wv -f s8 -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-16bit +FATE_WAVPACK_S16 += fate-wavpack-lossy-16bit fate-wavpack-lossy-16bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_16-bit.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-24bit +FATE_WAVPACK_S24 += fate-wavpack-lossy-24bit fate-wavpack-lossy-24bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_24-bit.wv -f s24le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-32bit +FATE_WAVPACK_S32 += fate-wavpack-lossy-32bit fate-wavpack-lossy-32bit: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/4.0_32-bit_int.wv -f s32le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-lossy-float +FATE_WAVPACK_F32 += fate-wavpack-lossy-float fate-wavpack-lossy-float: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/lossy/2.0_32-bit_float.wv -f f32le -af aresample # channel configurations -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-monofloat +FATE_WAVPACK_F32 += fate-wavpack-channels-monofloat fate-wavpack-channels-monofloat: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_float-partial.wv -f f32le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-monoint +FATE_WAVPACK_S16 += fate-wavpack-channels-monoint fate-wavpack-channels-monoint: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-4.0 +FATE_WAVPACK_S16 += fate-wavpack-channels-4.0 fate-wavpack-channels-4.0: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/edward_4.0_16bit-partial.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-5.1 +FATE_WAVPACK_S16 += fate-wavpack-channels-5.1 fate-wavpack-channels-5.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_5.1_16bit-partial.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-6.1 +FATE_WAVPACK_S16 += fate-wavpack-channels-6.1 fate-wavpack-channels-6.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-channels-7.1 +FATE_WAVPACK_S16 += fate-wavpack-channels-7.1 fate-wavpack-channels-7.1: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/panslab_sample_7.1_16bit-partial.wv -f s16le -af aresample # speed modes -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-default +FATE_WAVPACK_S16 += fate-wavpack-speed-default fate-wavpack-speed-default: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/default-partial.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-fast +FATE_WAVPACK_S16 += fate-wavpack-speed-fast fate-wavpack-speed-fast: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/fast-partial.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-high +FATE_WAVPACK_S16 += fate-wavpack-speed-high fate-wavpack-speed-high: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/high-partial.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-speed-vhigh +FATE_WAVPACK_S16 += fate-wavpack-speed-vhigh fate-wavpack-speed-vhigh: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/speed_modes/vhigh-partial.wv -f s16le -af aresample # special cases -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-clipping +FATE_WAVPACK_S16 += fate-wavpack-clipping fate-wavpack-clipping: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/clipping.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-cuesheet +FATE_WAVPACK_S16 += fate-wavpack-cuesheet fate-wavpack-cuesheet: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/cue_sheet.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-falsestereo +FATE_WAVPACK_S16 += fate-wavpack-falsestereo fate-wavpack-falsestereo: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/false_stereo.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, WV, WAVPACK) += fate-wavpack-zerolsbs +FATE_WAVPACK_S16 += fate-wavpack-zerolsbs fate-wavpack-zerolsbs: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/zero_lsbs.wv -f s16le -af aresample -FATE_WAVPACK-$(call DEMDEC, MATROSKA, WAVPACK) += fate-wavpack-matroskamode +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, WAVPACK, PCM_S16LE, PCM_S16LE) += fate-wavpack-matroskamode fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matroska_mode.mka -f s16le -af aresample -FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono +FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA, MD5_PROTOCOL) += fate-wavpack-matroska_mux-mono fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska fate-wavpack-matroska_mux-mono: CMP = oneline fate-wavpack-matroska_mux-mono: REF = 5863eb94f7583aa9c5fded17474f2e7c -FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61 +FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA, MD5_PROTOCOL) += fate-wavpack-matroska_mux-61 fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska fate-wavpack-matroska_mux-61: CMP = oneline fate-wavpack-matroska_mux-61: REF = 2bbb393d060fa841f1172028f2c69b3a -FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S8, PCM_S8) += $(FATE_WAVPACK_S8) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S16LE, PCM_S16LE) += $(FATE_WAVPACK_S16) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S24LE, PCM_S24LE) += $(FATE_WAVPACK_S24) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_S32LE, PCM_S32LE) += $(FATE_WAVPACK_S32) +FATE_WAVPACK-$(call FILTERDEMDECENCMUX, ARESAMPLE, WV, WAVPACK, PCM_F32LE, PCM_F32LE) += $(FATE_WAVPACK_F32) + +FATE_SAMPLES_FFMPEG += $(FATE_WAVPACK-yes) fate-wavpack: $(FATE_WAVPACK-yes)

1 0

avcodec/wavpack: Remove redundant av_channel_layout_uninit()
by Andreas Rheinhardt 31 May '22

31 May '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon May 30 11:05:58 2022 +0200| [6d037537c1a91b1803f6fe0cb772f9708895209d] | committer: Andreas Rheinhardt avcodec/wavpack: Remove redundant av_channel_layout_uninit() av_channel_layout_copy() will uninit the dst channel layout before copying the new one. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d037537c1a91b180… --- libavcodec/wavpack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c index efd9e0fdd0..8bfbb654e8 100644 --- a/libavcodec/wavpack.c +++ b/libavcodec/wavpack.c @@ -1541,7 +1541,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no, } ff_thread_release_ext_buffer(avctx, &wc->curr_frame); } - av_channel_layout_uninit(&avctx->ch_layout); av_channel_layout_copy(&avctx->ch_layout, &new_ch_layout); avctx->sample_rate = new_samplerate; avctx->sample_fmt = sample_fmt;

1 0

fate/vpx: Remove unused define parameters
by Andreas Rheinhardt 31 May '22

31 May '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun May 29 11:10:09 2022 +0200| [38ef9cf39e41d21e57f51bd1f2f30d98158d18bc] | committer: Andreas Rheinhardt fate/vpx: Remove unused define parameters Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=38ef9cf39e41d21e5… --- tests/fate/vpx.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 9b27a4a657..e18f3df38b 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -88,9 +88,9 @@ FATE_SAMPLES_AVCONV += $(FATE_VP8-yes) fate-vp8: $(FATE_VP8-yes) define FATE_VP9_SUITE -FATE_VP9-$(call FRAMEMD5, MATROSKA, VP9) += fate-vp9$(2)-$(1) -fate-vp9$(2)-$(1): CMD = framemd5 $(3) -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-$(1).webm -fate-vp9$(2)-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1) +FATE_VP9-$(call FRAMEMD5, MATROSKA, VP9) += fate-vp9-$(1) +fate-vp9-$(1): CMD = framemd5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-$(1).webm +fate-vp9-$(1): REF = $(SRC_PATH)/tests/ref/fate/vp9-$(1) endef define FATE_VP9_PROFILE_SUITE

1 0

fate/opus: Restore fate-opus-(celt|hybrid|silk)
by Andreas Rheinhardt 31 May '22

31 May '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun May 29 10:47:31 2022 +0200| [120aa6173c732027fd5817b494dd558a0e6d7afe] | committer: Andreas Rheinhardt fate/opus: Restore fate-opus-(celt|hybrid|silk) Also fix the test requirements. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=120aa6173c732027f… --- tests/fate/opus.mak | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak index cf8eeb555d..573044ed15 100644 --- a/tests/fate/opus.mak +++ b/tests/fate/opus.mak @@ -5,21 +5,18 @@ OPUS_CELT_SAMPLES = $(addprefix testvector, 01 11) tron.6ch.tinypkts OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06) OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04) -OPUS_SAMPLES = $(addprefix testvector, 07 08 09 10 12) +OPUS_OTHER_SAMPLES = $(addprefix testvector, 07 08 09 10 12) define FATE_OPUS_TEST -FATE_OPUS += fate-opus-$(1) -FATE_OPUS$(2) += fate-opus-$(1) -fate-opus-$(1): CMD = ffmpeg -i $(TARGET_SAMPLES)/opus/$(1).mka -f s16le -af aresample - -fate-opus-$(1): REF = $(SAMPLES)/opus/$(1)$(2).dec +FATE_OPUS_$(1)-$(call FILTERDEMDECENCMUX, ARESAMPLE, MATROSKA, OPUS, PCM_S16LE, PCM_S16LE, PIPE_PROTOCOL) := $(addprefix fate-opus-,$(OPUS_$(1)_SAMPLES)) +FATE_OPUS += $$(FATE_OPUS_$(1)-yes) endef -$(foreach N,$(OPUS_CELT_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N)))) -$(foreach N,$(OPUS_HYBRID_SAMPLES),$(eval $(call FATE_OPUS_TEST,$(N),_v2))) -$(foreach N,$(OPUS_SILK_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N)))) -$(foreach N,$(OPUS_SAMPLES), $(eval $(call FATE_OPUS_TEST,$(N),))) +$(foreach N, CELT HYBRID SILK OTHER, $(eval $(call FATE_OPUS_TEST,$(N)))) -FATE_OPUS := $(sort $(FATE_OPUS)) +$(FATE_OPUS): CMD = ffmpeg -i $(TARGET_SAMPLES)/opus/$(@:fate-opus-%=%).mka -f s16le -af aresample - +$(FATE_OPUS): REF = $(SAMPLES)/opus/$(@:fate-opus-%=%).dec +$(FATE_OPUS_HYBRID-yes): REF = $(SAMPLES)/opus/$(@:fate-opus-%=%)_v2.dec $(FATE_OPUS): CMP = stddev $(FATE_OPUS): CMP_UNIT = s16 @@ -39,11 +36,8 @@ fate-opus-testvector12: CMP_TARGET = 160 fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440 fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0 -$(FATE_OPUS_CELT): CMP = oneoff -$(FATE_OPUS_CELT): FUZZ = 6 - -FATE_SAMPLES_AVCONV-$(call DEMDEC, MATROSKA, OPUS) += $(FATE_OPUS) -fate-opus-celt: $(FATE_OPUS_CELT) -fate-opus-hybrid: $(FATE_OPUS_HYBRID) -fate-opus-silk: $(FATE_OPUS_SILK) +FATE_SAMPLES_FFMPEG += $(FATE_OPUS) +fate-opus-celt: $(FATE_OPUS_CELT-yes) +fate-opus-hybrid: $(FATE_OPUS_HYBRID-yes) +fate-opus-silk: $(FATE_OPUS_SILK-yes) fate-opus: $(FATE_OPUS)

1 0

avcodec/ffv1enc: Fix undefined left shifts of negative numbers
by Andreas Rheinhardt 30 May '22

30 May '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon May 30 18:26:40 2022 +0200| [415f012359364a77e8394436f222b74a8641a3ee] | committer: Andreas Rheinhardt avcodec/ffv1enc: Fix undefined left shifts of negative numbers Maybe this fixes the FPE encountered here: https://fate.ffmpeg.org/report.cgi?slot=alpha-debian-qemu-gcc-4.7&time=2022… Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=415f012359364a77e… --- libavcodec/ffv1enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index 311f377b1e..9849082e44 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -143,7 +143,7 @@ static void find_best_state(uint8_t best_state[256][256], uint32_t l2tab[256]; for (i = 1; i < 256; i++) - l2tab[i] = log2(i / 256.0) * ((-1<<31) / 8); + l2tab[i] = -log2(i / 256.0) * ((1U << 31) / 8); for (i = 0; i < 256; i++) { uint64_t best_len[256];

1 0

avcodec/iff: Remove redundant #if
by Andreas Rheinhardt 30 May '22

30 May '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Mon May 30 18:58:24 2022 +0200| [c5b2ddfe18a0fccab25723676b2a0b2c348ccf00] | committer: Andreas Rheinhardt avcodec/iff: Remove redundant #if Since ec0275843d8eb933699807da81f6f366291f034a this file is compiled iff the IFF ILBM decoder is enabled. Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c5b2ddfe18a0fccab… --- libavcodec/iff.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 36c9535d54..74ebddc621 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -26,8 +26,6 @@ * IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN bitmap decoder */ -#include "config_components.h" - #include <stdint.h> #include "libavutil/imgutils.h" @@ -1908,7 +1906,6 @@ static int decode_frame(AVCodecContext *avctx, AVFrame *frame, return buf_size; } -#if CONFIG_IFF_ILBM_DECODER const FFCodec ff_iff_ilbm_decoder = { .p.name = "iff", .p.long_name = NULL_IF_CONFIG_SMALL("IFF ACBM/ANIM/DEEP/ILBM/PBM/RGB8/RGBN"), @@ -1921,4 +1918,3 @@ const FFCodec ff_iff_ilbm_decoder = { .p.capabilities = AV_CODEC_CAP_DR1, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, }; -#endif

1 0