Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec/mpegvideo: Remove fast_dct_quantize

Browse source 
It has been added in 3a87ac948f,
but there was never an implementation different from the ordinary
dct_quantize of it.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-05-04 15:48:05 +02:00
parent e80bd068c5
commit 1dc1b6c5af
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/me_cmp.c
View file

@ -751,7 +751,7 @@ static int quant_psnr8x8_c(MpegEncContext *s, const uint8_t *src1,
memcpy(bak, temp, 64 * sizeof(int16_t));
s->block_last_index[0 /* FIXME */] =
s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
s->dct_unquantize_inter(s, temp, 0, s->qscale);
ff_simple_idct_int16_8bit(temp); // FIXME
@ -779,7 +779,7 @@ static int rd8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2,
s->block_last_index[0 /* FIXME */] =
last =
s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
bits = 0;
@ -849,7 +849,7 @@ static int bit8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2,
s->block_last_index[0 /* FIXME */] =
last =
s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i);
bits = 0;

1
libavcodec/mpegvideo.h
View file

@ -501,7 +501,6 @@ typedef struct MpegEncContext {
void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both)
int16_t *block/*align 16*/, int n, int qscale);
int (*dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow);
int (*fast_dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow);
void (*denoise_dct)(struct MpegEncContext *s, int16_t *block);
int mpv_flags; ///< flags set by private options

1
libavcodec/mpegvideo_enc.c
View file

@ -302,7 +302,6 @@ av_cold int ff_dct_encode_init(MpegEncContext *s)
ff_dct_encode_init_x86(s);
#endif
s->fast_dct_quantize = s->dct_quantize;
if (s->avctx->trellis)
s->dct_quantize = dct_quantize_trellis_c;