March 2024 - ffmpeg-cvslog - lists.ffmpeg.org

swscale/swscale_internal: Don't export internal function
by Andreas Rheinhardt 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 17:14:30 2024 +0100| [2d38141ea610ef7d52ced09166b4f2b967a88a3e] | committer: Andreas Rheinhardt swscale/swscale_internal: Don't export internal function sws_alloc_set_opts() can actually be made internal to utils.c. This commit does so. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2d38141ea610ef7d5… --- libswscale/swscale_internal.h | 11 ------ libswscale/utils.c | 83 ++++++++++++++++++++++--------------------- 2 files changed, 43 insertions(+), 51 deletions(-) diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index d7faa5e165..c2cc736dd2 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -1003,17 +1003,6 @@ void ff_hcscale_fast_mmxext(SwsContext *c, int16_t *dst1, int16_t *dst2, int dstWidth, const uint8_t *src1, const uint8_t *src2, int srcW, int xInc); -/** - * Allocate and return an SwsContext. - * This is like sws_getContext() but does not perform the init step, allowing - * the user to set additional AVOptions. - * - * @see sws_getContext() - */ -struct SwsContext *sws_alloc_set_opts(int srcW, int srcH, enum AVPixelFormat srcFormat, - int dstW, int dstH, enum AVPixelFormat dstFormat, - int flags, const double *param); - int ff_sws_alphablendaway(SwsContext *c, const uint8_t *src[], int srcStride[], int srcSliceY, int srcSliceH, uint8_t *dst[], int dstStride[]); diff --git a/libswscale/utils.c b/libswscale/utils.c index ab8a68e241..cb6e91db06 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -269,6 +269,34 @@ static const FormatEntry format_entries[] = { [AV_PIX_FMT_XV36LE] = { 1, 1 }, }; +/** + * Allocate and return an SwsContext without performing initialization. + */ +static SwsContext *alloc_set_opts(int srcW, int srcH, enum AVPixelFormat srcFormat, + int dstW, int dstH, enum AVPixelFormat dstFormat, + int flags, const double *param) +{ + SwsContext *c = sws_alloc_context(); + + if (!c) + return NULL; + + c->flags = flags; + c->srcW = srcW; + c->srcH = srcH; + c->dstW = dstW; + c->dstH = dstH; + c->srcFormat = srcFormat; + c->dstFormat = dstFormat; + + if (param) { + c->param[0] = param[0]; + c->param[1] = param[1]; + } + + return c; +} + int ff_shuffle_filter_coefficients(SwsContext *c, int *filterPos, int filterSize, int16_t *filter, int dstW) @@ -1101,9 +1129,9 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], if (ret < 0) return ret; - c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, c->srcFormat, - tmp_width, tmp_height, tmp_format, - c->flags, c->param); + c->cascaded_context[0] = alloc_set_opts(srcW, srcH, c->srcFormat, + tmp_width, tmp_height, tmp_format, + c->flags, c->param); if (!c->cascaded_context[0]) return -1; @@ -1116,9 +1144,9 @@ int sws_setColorspaceDetails(struct SwsContext *c, const int inv_table[4], srcRange, table, dstRange, brightness, contrast, saturation); - c->cascaded_context[1] = sws_alloc_set_opts(tmp_width, tmp_height, tmp_format, - dstW, dstH, c->dstFormat, - c->flags, c->param); + c->cascaded_context[1] = alloc_set_opts(tmp_width, tmp_height, tmp_format, + dstW, dstH, c->dstFormat, + c->flags, c->param); if (!c->cascaded_context[1]) return -1; c->cascaded_context[1]->srcRange = srcRange; @@ -1682,9 +1710,9 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, if (ret < 0) return ret; - c->cascaded_context[0] = sws_alloc_set_opts(srcW, srcH, srcFormat, - srcW, srcH, tmpFormat, - flags, c->param); + c->cascaded_context[0] = alloc_set_opts(srcW, srcH, srcFormat, + srcW, srcH, tmpFormat, + flags, c->param); if (!c->cascaded_context[0]) return AVERROR(EINVAL); c->cascaded_context[0]->alphablend = c->alphablend; @@ -1692,9 +1720,9 @@ static av_cold int sws_init_single_context(SwsContext *c, SwsFilter *srcFilter, if (ret < 0) return ret; - c->cascaded_context[1] = sws_alloc_set_opts(srcW, srcH, tmpFormat, - dstW, dstH, dstFormat, - flags, c->param); + c->cascaded_context[1] = alloc_set_opts(srcW, srcH, tmpFormat, + dstW, dstH, dstFormat, + flags, c->param); if (!c->cascaded_context[1]) return AVERROR(EINVAL); @@ -2066,31 +2094,6 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, return sws_init_single_context(c, srcFilter, dstFilter); } -SwsContext *sws_alloc_set_opts(int srcW, int srcH, enum AVPixelFormat srcFormat, - int dstW, int dstH, enum AVPixelFormat dstFormat, - int flags, const double *param) -{ - SwsContext *c; - - if (!(c = sws_alloc_context())) - return NULL; - - c->flags = flags; - c->srcW = srcW; - c->srcH = srcH; - c->dstW = dstW; - c->dstH = dstH; - c->srcFormat = srcFormat; - c->dstFormat = dstFormat; - - if (param) { - c->param[0] = param[0]; - c->param[1] = param[1]; - } - - return c; -} - SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, int dstW, int dstH, enum AVPixelFormat dstFormat, int flags, SwsFilter *srcFilter, @@ -2098,9 +2101,9 @@ SwsContext *sws_getContext(int srcW, int srcH, enum AVPixelFormat srcFormat, { SwsContext *c; - c = sws_alloc_set_opts(srcW, srcH, srcFormat, - dstW, dstH, dstFormat, - flags, param); + c = alloc_set_opts(srcW, srcH, srcFormat, + dstW, dstH, dstFormat, + flags, param); if (!c) return NULL;

1 0

swscale/swscale_internal: Hoist branch out of loop
by Andreas Rheinhardt 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 16:53:53 2024 +0100| [ad1cef04a9b21a891535234d5951774d072939ef] | committer: Andreas Rheinhardt swscale/swscale_internal: Hoist branch out of loop Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad1cef04a9b21a891… --- libswscale/swscale_internal.h | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 2f6cc70946..d7faa5e165 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -1021,28 +1021,20 @@ int ff_sws_alphablendaway(SwsContext *c, const uint8_t *src[], static inline void fillPlane16(uint8_t *plane, int stride, int width, int height, int y, int alpha, int bits, const int big_endian) { - int i, j; uint8_t *ptr = plane + stride * y; int v = alpha ? 0xFFFF>>(16-bits) : (1<<(bits-1)); - for (i = 0; i < height; i++) { -#define FILL(wfunc) \ - for (j = 0; j < width; j++) {\ - wfunc(ptr+2*j, v);\ - } - if (big_endian) { - FILL(AV_WB16); - } else { - FILL(AV_WL16); - } + if (big_endian != HAVE_BIGENDIAN) + v = av_bswap16(v); + for (int i = 0; i < height; i++) { + for (int j = 0; j < width; j++) + AV_WN16(ptr + 2 * j, v); ptr += stride; } -#undef FILL } static inline void fillPlane32(uint8_t *plane, int stride, int width, int height, int y, int alpha, int bits, const int big_endian, int is_float) { - int i, j; uint8_t *ptr = plane + stride * y; uint32_t v; uint32_t onef32 = 0x3f800000; @@ -1050,20 +1042,14 @@ static inline void fillPlane32(uint8_t *plane, int stride, int width, int height v = alpha ? onef32 : 0; else v = alpha ? 0xFFFFFFFF>>(32-bits) : (1<<(bits-1)); + if (big_endian != HAVE_BIGENDIAN) + v = av_bswap32(v); - for (i = 0; i < height; i++) { -#define FILL(wfunc) \ - for (j = 0; j < width; j++) {\ - wfunc(ptr+4*j, v);\ - } - if (big_endian) { - FILL(AV_WB32); - } else { - FILL(AV_WL32); - } + for (int i = 0; i < height; i++) { + for (int j = 0; j < width; j++) + AV_WN32(ptr + 4 * j, v); ptr += stride; } -#undef FILL }

1 0

avcodec/msmpeg4: Don't include x86-specific header unconditionally
by Andreas Rheinhardt 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 19:19:52 2024 +0100| [c8549d480f752308540f7060e2c050d6824e6793] | committer: Andreas Rheinhardt avcodec/msmpeg4: Don't include x86-specific header unconditionally Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8549d480f7523085… --- libavcodec/msmpeg4.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index a2c4c57728..e327bf36a7 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -27,13 +27,17 @@ * MSMPEG4 backend for encoder and decoder */ +#include "config.h" + #include "libavutil/thread.h" +#if ARCH_X86 +#include "libavutil/x86/asm.h" +#endif #include "avcodec.h" #include "idctdsp.h" #include "mpegvideo.h" #include "msmpeg4.h" -#include "libavutil/x86/asm.h" #include "mpeg4videodata.h" #include "msmpeg4data.h" #include "msmpeg4_vc1_data.h"

1 0

avcodec, avfilter: Don't use "" for system headers
by Andreas Rheinhardt 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 09:20:15 2024 +0100| [a265e8ca92662f1a2248b72dcf20375c88ffc400] | committer: Andreas Rheinhardt avcodec, avfilter: Don't use "" for system headers Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a265e8ca92662f1a2… --- libavcodec/qsv.c | 3 +-- libavfilter/avf_aphasemeter.c | 3 ++- libavfilter/f_drawgraph.c | 2 -- libavfilter/f_graphmonitor.c | 2 -- libavfilter/vf_lut3d.c | 4 ++-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index 7563625627..01ce186dae 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -20,6 +20,7 @@ #include <mfxvideo.h> #include <mfxjpeg.h> +#include <mfxvp8.h> #include <stdio.h> #include <string.h> @@ -39,8 +40,6 @@ #define QSV_HAVE_USER_PLUGIN !QSV_ONEVPL #define QSV_HAVE_AUDIO !QSV_ONEVPL -#include "mfxvp8.h" - #if QSV_HAVE_USER_PLUGIN #include <mfxplugin.h> #endif diff --git a/libavfilter/avf_aphasemeter.c b/libavfilter/avf_aphasemeter.c index fac8d7c048..6632bae3ec 100644 --- a/libavfilter/avf_aphasemeter.c +++ b/libavfilter/avf_aphasemeter.c @@ -23,6 +23,8 @@ * audio to video multimedia aphasemeter filter */ +#include <float.h> + #include "libavutil/channel_layout.h" #include "libavutil/intreadwrite.h" #include "libavutil/opt.h" @@ -34,7 +36,6 @@ #include "audio.h" #include "video.h" #include "internal.h" -#include "float.h" typedef struct AudioPhaseMeterContext { const AVClass *class; diff --git a/libavfilter/f_drawgraph.c b/libavfilter/f_drawgraph.c index fd8641ff75..1eca7df975 100644 --- a/libavfilter/f_drawgraph.c +++ b/libavfilter/f_drawgraph.c @@ -20,8 +20,6 @@ #include "config_components.h" -#include "float.h" - #include "libavutil/avstring.h" #include "libavutil/eval.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/f_graphmonitor.c b/libavfilter/f_graphmonitor.c index e0b20114e0..3fefa49138 100644 --- a/libavfilter/f_graphmonitor.c +++ b/libavfilter/f_graphmonitor.c @@ -20,8 +20,6 @@ #include "config_components.h" -#include "float.h" - #include "libavutil/pixdesc.h" #include "libavutil/eval.h" #include "libavutil/intreadwrite.h" diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index a312ca76c9..ba2d425198 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -24,9 +24,9 @@ * 3D Lookup table filter */ -#include "config_components.h" +#include <float.h> -#include "float.h" +#include "config_components.h" #include "libavutil/opt.h" #include "libavutil/file_open.h"

1 0

swscale/ppc/swscale_altivec: Simplify macro
by Andreas Rheinhardt 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 05:59:08 2024 +0100| [b49e621c83209a4f3d2c525a4ce33bd87aa02a84] | committer: Andreas Rheinhardt swscale/ppc/swscale_altivec: Simplify macro Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b49e621c83209a4f3… --- libswscale/ppc/swscale_altivec.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c index 8e35e0372f..9bf72738df 100644 --- a/libswscale/ppc/swscale_altivec.c +++ b/libswscale/ppc/swscale_altivec.c @@ -109,17 +109,12 @@ #define SHIFT 3 -#define output_pixel(pos, val, bias, signedness) \ - if (big_endian) { \ - AV_WB16(pos, bias + av_clip_ ## signedness ## 16(val >> shift)); \ - } else { \ - AV_WL16(pos, bias + av_clip_ ## signedness ## 16(val >> shift)); \ - } +#define get_pixel(val, bias, signedness) \ + (bias + av_clip_ ## signedness ## 16(val >> shift)) static void yuv2plane1_float_u(const int32_t *src, float *dest, int dstW, int start) { - static const int big_endian = HAVE_BIGENDIAN; static const int shift = 3; static const float float_mult = 1.0f / 65535.0f; int i, val; @@ -127,7 +122,7 @@ yuv2plane1_float_u(const int32_t *src, float *dest, int dstW, int start) for (i = start; i < dstW; ++i){ val = src[i] + (1 << (shift - 1)); - output_pixel(&val_uint, val, 0, uint); + val_uint = get_pixel(val, 0, uint); dest[i] = float_mult * (float)val_uint; } } @@ -135,7 +130,6 @@ yuv2plane1_float_u(const int32_t *src, float *dest, int dstW, int start) static void yuv2plane1_float_bswap_u(const int32_t *src, uint32_t *dest, int dstW, int start) { - static const int big_endian = HAVE_BIGENDIAN; static const int shift = 3; static const float float_mult = 1.0f / 65535.0f; int i, val; @@ -143,7 +137,7 @@ yuv2plane1_float_bswap_u(const int32_t *src, uint32_t *dest, int dstW, int start for (i = start; i < dstW; ++i){ val = src[i] + (1 << (shift - 1)); - output_pixel(&val_uint, val, 0, uint); + val_uint = get_pixel(val, 0, uint); dest[i] = av_bswap32(av_float2int(float_mult * (float)val_uint)); } }

1 0

swscale/ppc/swscale_altivec: Fix build with -O0
by Andreas Rheinhardt 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 05:54:43 2024 +0100| [72f4f1dafbddb266b53695e4c8b5e2df4927c1ba] | committer: Andreas Rheinhardt swscale/ppc/swscale_altivec: Fix build with -O0 In this case GCC does not treat a const variable initialized to the compile-time constant "3" as a compile-time constant and errors out because the argument is not a literal value. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=72f4f1dafbddb266b… --- libswscale/ppc/swscale_altivec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libswscale/ppc/swscale_altivec.c b/libswscale/ppc/swscale_altivec.c index 1630355f51..8e35e0372f 100644 --- a/libswscale/ppc/swscale_altivec.c +++ b/libswscale/ppc/swscale_altivec.c @@ -107,6 +107,8 @@ #endif /* HAVE_BIGENDIAN */ +#define SHIFT 3 + #define output_pixel(pos, val, bias, signedness) \ if (big_endian) { \ AV_WB16(pos, bias + av_clip_ ## signedness ## 16(val >> shift)); \ @@ -149,12 +151,11 @@ yuv2plane1_float_bswap_u(const int32_t *src, uint32_t *dest, int dstW, int start static void yuv2plane1_float_altivec(const int32_t *src, float *dest, int dstW) { const int dst_u = -(uintptr_t)dest & 3; - const int shift = 3; - const int add = (1 << (shift - 1)); + const int add = (1 << (SHIFT - 1)); const int clip = (1 << 16) - 1; const float fmult = 1.0f / 65535.0f; const vec_u32 vadd = (vec_u32) {add, add, add, add}; - const vec_u32 vshift = (vec_u32) vec_splat_u32(shift); + const vec_u32 vshift = (vec_u32) vec_splat_u32(SHIFT); const vec_u32 vlargest = (vec_u32) {clip, clip, clip, clip}; const vec_f vmul = (vec_f) {fmult, fmult, fmult, fmult}; const vec_f vzero = (vec_f) {0, 0, 0, 0}; @@ -182,12 +183,11 @@ static void yuv2plane1_float_altivec(const int32_t *src, float *dest, int dstW) static void yuv2plane1_float_bswap_altivec(const int32_t *src, uint32_t *dest, int dstW) { const int dst_u = -(uintptr_t)dest & 3; - const int shift = 3; - const int add = (1 << (shift - 1)); + const int add = (1 << (SHIFT - 1)); const int clip = (1 << 16) - 1; const float fmult = 1.0f / 65535.0f; const vec_u32 vadd = (vec_u32) {add, add, add, add}; - const vec_u32 vshift = (vec_u32) vec_splat_u32(shift); + const vec_u32 vshift = (vec_u32) vec_splat_u32(SHIFT); const vec_u32 vlargest = (vec_u32) {clip, clip, clip, clip}; const vec_f vmul = (vec_f) {fmult, fmult, fmult, fmult}; const vec_f vzero = (vec_f) {0, 0, 0, 0};

1 0

avcodec/pcm-bluray/dvd: Use correct pointer types on BE
by Andreas Rheinhardt 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 05:35:36 2024 +0100| [347a70f101be28f8d78e8fd62ffc3a78324f49e9] | committer: Andreas Rheinhardt avcodec/pcm-bluray/dvd: Use correct pointer types on BE Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=347a70f101be28f8d… --- libavcodec/pcm-bluray.c | 5 +++-- libavcodec/pcm-dvd.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/pcm-bluray.c b/libavcodec/pcm-bluray.c index f65609514a..235020d78f 100644 --- a/libavcodec/pcm-bluray.c +++ b/libavcodec/pcm-bluray.c @@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, samples *= num_source_channels; if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, buf_size); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size); #else do { *dst16++ = bytestream2_get_be16u(&gb); @@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCodecContext *avctx, AVFrame *frame, if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) { do { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, + avctx->ch_layout.nb_channels * 2); dst16 += avctx->ch_layout.nb_channels; #else channel = avctx->ch_layout.nb_channels; diff --git a/libavcodec/pcm-dvd.c b/libavcodec/pcm-dvd.c index 419b2a138f..319746c62e 100644 --- a/libavcodec/pcm-dvd.c +++ b/libavcodec/pcm-dvd.c @@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCodecContext *avctx, const uint8_t *src, switch (avctx->bits_per_coded_sample) { case 16: { #if HAVE_BIGENDIAN - bytestream2_get_buffer(&gb, dst16, blocks * s->block_size); + bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size); dst16 += blocks * s->block_size / 2; #else int samples = blocks * avctx->ch_layout.nb_channels;

1 0

avcodec/mips/ac3dsp_mips: Add missing includes
by Andreas Rheinhardt 31 Mar '24

31 Mar '24

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Mar 28 05:31:59 2024 +0100| [cd63dab55cde491afd7e7b24197c8745ce6bc71a] | committer: Andreas Rheinhardt avcodec/mips/ac3dsp_mips: Add missing includes Likely broken in d7a75d21635eab4f4a1efea22945933059c2e36f. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd63dab55cde491af… --- libavcodec/mips/ac3dsp_mips.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/mips/ac3dsp_mips.c b/libavcodec/mips/ac3dsp_mips.c index e97a412922..cc49ba3888 100644 --- a/libavcodec/mips/ac3dsp_mips.c +++ b/libavcodec/mips/ac3dsp_mips.c @@ -54,11 +54,13 @@ */ #include <stddef.h> +#include <string.h> #include "config.h" #include "libavcodec/ac3dsp.h" #include "libavcodec/ac3.h" #include "libavcodec/ac3tab.h" +#include "libavutil/macros.h" #include "libavutil/mips/asmdefs.h" #if HAVE_INLINE_ASM

1 0

avfilter/buffersrc: fix overriding unknown channel layouts with negotiated one
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/5.1 | Marton Balint <cus(a)passwd.hu> | Sat Mar 23 16:10:22 2024 +0100| [defa085fc88d018d398b00ccefbe386659864694] | committer: Marton Balint avfilter/buffersrc: fix overriding unknown channel layouts with negotiated one Fixes ffplay playback of unknown layouts, when SDL directly supports the audio format, such as: ffplay -f lavfi anullsrc=cl=2C,aformat=s16 Without the patch, "Channel layout change is not supported" errors are generated because buffersrc (unknown 2 channel) and buffersink (stereo) negotiated a stereo layout, but the stereo layout was never stored in the BufferSourceContext. This fixes a regression of 7251f909721a570726775acf61b2b9c28a950c76, but this is more of a regression of the avfilter channel layout conversion (1f96db959c1235bb7079d354e09914a0a2608f62). Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 2df2b4067ed01b9076a5dda073521551a32336cd) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=defa085fc88d018d3… --- libavfilter/buffersrc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index a3190468bb..4949605d30 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -450,7 +450,7 @@ static int config_props(AVFilterLink *link) } break; case AVMEDIA_TYPE_AUDIO: - if (!c->ch_layout.nb_channels) { + if (!c->ch_layout.nb_channels || c->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) { int ret = av_channel_layout_copy(&c->ch_layout, &link->ch_layout); if (ret < 0) return ret;

1 0

avfilter/af_channelmap: disallow channel index 64
by Marton Balint 30 Mar '24

30 Mar '24

ffmpeg | branch: release/5.1 | Marton Balint <cus(a)passwd.hu> | Mon Mar 18 23:35:26 2024 +0100| [19c3f055b2e29632be2f8e99e7b26b4f597c0173] | committer: Marton Balint avfilter/af_channelmap: disallow channel index 64 MAX_CH is 64, therefore the maximum index is 63. Signed-off-by: Marton Balint <cus(a)passwd.hu> (cherry picked from commit 2f754a96bd4ae4932923fe03c2d53f8273b6273c) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=19c3f055b2e29632b… --- libavfilter/af_channelmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/af_channelmap.c b/libavfilter/af_channelmap.c index aa2468f941..18355eb43b 100644 --- a/libavfilter/af_channelmap.c +++ b/libavfilter/af_channelmap.c @@ -85,7 +85,7 @@ static char* split(char *message, char delim) { return next; } -static int get_channel_idx(char **map, int *ch, char delim, int max_ch) +static int get_channel_idx(char **map, int *ch, char delim, int max_nb_channels) { char *next; int len; @@ -99,7 +99,7 @@ static int get_channel_idx(char **map, int *ch, char delim, int max_ch) sscanf(*map, "%d%n", ch, &n); if (n != len) return AVERROR(EINVAL); - if (*ch < 0 || *ch > max_ch) + if (*ch < 0 || *ch >= max_nb_channels) return AVERROR(EINVAL); *map = next; return 0;

1 0