This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 2268ba89f0acd76f73321d08b4cd7cfa1a6ba9a5 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Wed Feb 25 20:33:04 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Sun Mar 1 11:56:57 2026 +0100 avcodec/huffyuvencdsp: Pass bpp, not AVPixelFormat for init Avoids having to get a pixel format descriptor. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/huffyuvenc.c | 3 ++- libavcodec/huffyuvencdsp.c | 4 ++-- libavcodec/huffyuvencdsp.h | 6 ++---- libavcodec/x86/huffyuvencdsp_init.c | 6 ++---- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/libavcodec/huffyuvenc.c b/libavcodec/huffyuvenc.c index a048197bfe..e90fe645d1 100644 --- a/libavcodec/huffyuvenc.c +++ b/libavcodec/huffyuvenc.c @@ -254,7 +254,6 @@ static av_cold int encode_init(AVCodecContext *avctx) s->flags = avctx->flags; ff_bswapdsp_init(&s->bdsp); - ff_huffyuvencdsp_init(&s->hencdsp, avctx->pix_fmt); ff_llvidencdsp_init(&s->llvidencdsp); avctx->extradata = av_mallocz(3*MAX_N + 4); @@ -279,6 +278,8 @@ static av_cold int encode_init(AVCodecContext *avctx) s->mask = (1 << s->bps) - 1; s->vlc_n = FFMIN(1 << s->bps, MAX_VLC_N); + ff_huffyuvencdsp_init(&s->hencdsp, s->bps); + switch (avctx->pix_fmt) { case AV_PIX_FMT_YUV420P: case AV_PIX_FMT_YUV422P: diff --git a/libavcodec/huffyuvencdsp.c b/libavcodec/huffyuvencdsp.c index e332f678d4..dcae51f4f8 100644 --- a/libavcodec/huffyuvencdsp.c +++ b/libavcodec/huffyuvencdsp.c @@ -84,12 +84,12 @@ static void sub_hfyu_median_pred_int16_c(uint16_t *dst, const uint16_t *src1, co *left_top = lt; } -av_cold void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, enum AVPixelFormat pix_fmt) +av_cold void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, int bpp) { c->diff_int16 = diff_int16_c; c->sub_hfyu_median_pred_int16 = sub_hfyu_median_pred_int16_c; #if ARCH_X86 && HAVE_X86ASM - ff_huffyuvencdsp_init_x86(c, pix_fmt); + ff_huffyuvencdsp_init_x86(c, bpp); #endif } diff --git a/libavcodec/huffyuvencdsp.h b/libavcodec/huffyuvencdsp.h index 779a51ac79..fae182add1 100644 --- a/libavcodec/huffyuvencdsp.h +++ b/libavcodec/huffyuvencdsp.h @@ -21,8 +21,6 @@ #include <stdint.h> -#include "libavutil/pixfmt.h" - typedef struct HuffYUVEncDSPContext { void (*diff_int16)(uint16_t *dst /* align 16 */, const uint16_t *src1 /* align 16 */, @@ -34,7 +32,7 @@ typedef struct HuffYUVEncDSPContext { int w, int *left, int *left_top); } HuffYUVEncDSPContext; -void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, enum AVPixelFormat pix_fmt); -void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, enum AVPixelFormat pix_fmt); +void ff_huffyuvencdsp_init(HuffYUVEncDSPContext *c, int bpp); +void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, int bpp); #endif /* AVCODEC_HUFFYUVENCDSP_H */ diff --git a/libavcodec/x86/huffyuvencdsp_init.c b/libavcodec/x86/huffyuvencdsp_init.c index c9c33b75b4..fd54fdcc00 100644 --- a/libavcodec/x86/huffyuvencdsp_init.c +++ b/libavcodec/x86/huffyuvencdsp_init.c @@ -24,7 +24,6 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" -#include "libavutil/pixdesc.h" #include "libavutil/x86/cpu.h" #include "libavcodec/huffyuvencdsp.h" @@ -35,12 +34,11 @@ void ff_diff_int16_avx2(uint16_t *dst, const uint16_t *src1, const uint16_t *src void ff_sub_hfyu_median_pred_int16_mmxext(uint16_t *dst, const uint16_t *src1, const uint16_t *src2, unsigned mask, int w, int *left, int *left_top); -av_cold void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, enum AVPixelFormat pix_fmt) +av_cold void ff_huffyuvencdsp_init_x86(HuffYUVEncDSPContext *c, int bpp) { av_unused int cpu_flags = av_get_cpu_flags(); - const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(pix_fmt); - if (EXTERNAL_MMXEXT(cpu_flags) && pix_desc && pix_desc->comp[0].depth<16) { + if (EXTERNAL_MMXEXT(cpu_flags) && bpp < 16) { c->sub_hfyu_median_pred_int16 = ff_sub_hfyu_median_pred_int16_mmxext; } _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
