ffmpeg | branch: master | Andreas Rheinhardt <[email protected]> | Sat May 4 15:48:05 2024 +0200| [1dc1b6c5af626ed3b62c5c35f333e1f7ca570950] | committer: Andreas Rheinhardt
avcodec/mpegvideo: Remove fast_dct_quantize It has been added in 3a87ac948f0cd95218e62d5a98b8b8d5e4c11366, but there was never an implementation different from the ordinary dct_quantize of it. Signed-off-by: Andreas Rheinhardt <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dc1b6c5af626ed3b62c5c35f333e1f7ca570950 --- libavcodec/me_cmp.c | 6 +++--- libavcodec/mpegvideo.h | 1 - libavcodec/mpegvideo_enc.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index db3fb1260c..670103cc05 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -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; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8351f806b4..60dcf65288 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -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 diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 76243c160b..6adcd483f4 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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; _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
