Message ID | 20240608200919.2362726-1-remi@remlab.net |
---|---|
State | New |
Headers | show |
Series | [FFmpeg-devel,1/2] lavc/mpegvideo: use H263DSP dequant function | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | fail | Make failed |
Rémi Denis-Courmont: > --- > libavcodec/mpegvideo.c | 29 ++++------------------------- > 1 file changed, 4 insertions(+), 25 deletions(-) > > diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c > index 7af823b8bd..0eb4a1a865 100644 > --- a/libavcodec/mpegvideo.c > +++ b/libavcodec/mpegvideo.c > @@ -201,7 +201,7 @@ static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, > static void dct_unquantize_h263_intra_c(MpegEncContext *s, > int16_t *block, int n, int qscale) > { > - int i, level, qmul, qadd; > + int qmul, qadd; > int nCoeffs; > > av_assert2(s->block_last_index[n]>=0 || s->h263_aic); > @@ -219,23 +219,13 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s, > else > nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; > > - for(i=1; i<=nCoeffs; i++) { > - level = block[i]; > - if (level) { > - if (level < 0) { > - level = level * qmul - qadd; > - } else { > - level = level * qmul + qadd; > - } > - block[i] = level; > - } > - } > + s->h263dsp.h263_dct_unquantize(block, 1, nCoeffs, qmul, qadd); > } > > static void dct_unquantize_h263_inter_c(MpegEncContext *s, > int16_t *block, int n, int qscale) > { > - int i, level, qmul, qadd; > + int qmul, qadd; > int nCoeffs; > > av_assert2(s->block_last_index[n]>=0); > @@ -244,18 +234,7 @@ static void dct_unquantize_h263_inter_c(MpegEncContext *s, > qmul = qscale << 1; > > nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; > - > - for(i=0; i<=nCoeffs; i++) { > - level = block[i]; > - if (level) { > - if (level < 0) { > - level = level * qmul - qadd; > - } else { > - level = level * qmul + qadd; > - } > - block[i] = level; > - } > - } > + s->h263dsp.h263_dct_unquantize(block, 0, nCoeffs, qmul, qadd); > } > > There is no h263_dct_unquantize in H263DSPContext in master. - Andreas
Meh. This breaks FATE... on platforms that don't have an optimise function already.
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 7af823b8bd..0eb4a1a865 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -201,7 +201,7 @@ static void dct_unquantize_mpeg2_inter_c(MpegEncContext *s, static void dct_unquantize_h263_intra_c(MpegEncContext *s, int16_t *block, int n, int qscale) { - int i, level, qmul, qadd; + int qmul, qadd; int nCoeffs; av_assert2(s->block_last_index[n]>=0 || s->h263_aic); @@ -219,23 +219,13 @@ static void dct_unquantize_h263_intra_c(MpegEncContext *s, else nCoeffs= s->intra_scantable.raster_end[ s->block_last_index[n] ]; - for(i=1; i<=nCoeffs; i++) { - level = block[i]; - if (level) { - if (level < 0) { - level = level * qmul - qadd; - } else { - level = level * qmul + qadd; - } - block[i] = level; - } - } + s->h263dsp.h263_dct_unquantize(block, 1, nCoeffs, qmul, qadd); } static void dct_unquantize_h263_inter_c(MpegEncContext *s, int16_t *block, int n, int qscale) { - int i, level, qmul, qadd; + int qmul, qadd; int nCoeffs; av_assert2(s->block_last_index[n]>=0); @@ -244,18 +234,7 @@ static void dct_unquantize_h263_inter_c(MpegEncContext *s, qmul = qscale << 1; nCoeffs= s->inter_scantable.raster_end[ s->block_last_index[n] ]; - - for(i=0; i<=nCoeffs; i++) { - level = block[i]; - if (level) { - if (level < 0) { - level = level * qmul - qadd; - } else { - level = level * qmul + qadd; - } - block[i] = level; - } - } + s->h263dsp.h263_dct_unquantize(block, 0, nCoeffs, qmul, qadd); }