mirrors/librempeg
1
0
Fork 0
mirror of https://github.com/librempeg/librempeg synced 2024-11-22 09:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/mpegvideo: Set dct_unquantize earlier

Browse Source 
Set them in ff_mpv_idct_init() so that they are already set
in ff_mpv_decode_init(). This is in preparation for avoiding
to set dct_unquantize in every ff_mpv_frame_start().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2024-06-02 06:20:12 +02:00 committed by Paul B Mahol
parent 71aaed6084
commit 64f0b12b07
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libavcodec/mpegvideo.c
View File

@ -273,7 +273,7 @@ static void gray8(uint8_t *dst, const uint8_t *src, ptrdiff_t linesize, int h)
} }
/* init common dct for both encoder and decoder */ /* init common dct for both encoder and decoder */
static av_cold void dct_init(MpegEncContext *s) static av_cold void dsp_init(MpegEncContext *s)
{ {
ff_blockdsp_init(&s->bdsp); ff_blockdsp_init(&s->bdsp);
ff_hpeldsp_init(&s->hdsp, s->avctx->flags); ff_hpeldsp_init(&s->hdsp, s->avctx->flags);
@ -291,29 +291,6 @@ static av_cold void dct_init(MpegEncContext *s)
s->hdsp.put_no_rnd_pixels_tab[1][i] = gray8; s->hdsp.put_no_rnd_pixels_tab[1][i] = gray8;
} }
} }
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c;
s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c;
s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c;
s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c;
s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c;
if (s->avctx->flags & AV_CODEC_FLAG_BITEXACT)
s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact;
s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
#if HAVE_INTRINSICS_NEON
ff_mpv_common_init_neon(s);
#endif
#if ARCH_ARM
ff_mpv_common_init_arm(s);
#elif ARCH_PPC
ff_mpv_common_init_ppc(s);
#elif ARCH_X86
ff_mpv_common_init_x86(s);
#elif ARCH_MIPS
ff_mpv_common_init_mips(s);
#endif
} }
av_cold void ff_init_scantable(const uint8_t *permutation, ScanTable *st, av_cold void ff_init_scantable(const uint8_t *permutation, ScanTable *st,
@ -357,6 +334,29 @@ av_cold void ff_mpv_idct_init(MpegEncContext *s)
s->idsp.idct_permutation); s->idsp.idct_permutation);
ff_permute_scantable(s->permutated_intra_v_scantable, ff_alternate_vertical_scan, ff_permute_scantable(s->permutated_intra_v_scantable, ff_alternate_vertical_scan,
s->idsp.idct_permutation); s->idsp.idct_permutation);
s->dct_unquantize_h263_intra = dct_unquantize_h263_intra_c;
s->dct_unquantize_h263_inter = dct_unquantize_h263_inter_c;
s->dct_unquantize_mpeg1_intra = dct_unquantize_mpeg1_intra_c;
s->dct_unquantize_mpeg1_inter = dct_unquantize_mpeg1_inter_c;
s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_c;
if (s->avctx->flags & AV_CODEC_FLAG_BITEXACT)
s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact;
s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
#if HAVE_INTRINSICS_NEON
ff_mpv_common_init_neon(s);
#endif
#if ARCH_ARM
ff_mpv_common_init_arm(s);
#elif ARCH_PPC
ff_mpv_common_init_ppc(s);
#elif ARCH_X86
ff_mpv_common_init_x86(s);
#elif ARCH_MIPS
ff_mpv_common_init_mips(s);
#endif
} }
static int init_duplicate_context(MpegEncContext *s) static int init_duplicate_context(MpegEncContext *s)
@ -716,7 +716,7 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
av_image_check_size(s->width, s->height, 0, s->avctx)) av_image_check_size(s->width, s->height, 0, s->avctx))
return AVERROR(EINVAL); return AVERROR(EINVAL);
dct_init(s); dsp_init(s);
/* set chroma shifts */ /* set chroma shifts */
ret = av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt, ret = av_pix_fmt_get_chroma_sub_sample(s->avctx->pix_fmt,