Rémi Denis-Courmont:
> ---
> configure | 4 ++--
> libavcodec/mpegvideo.c | 40 +++++++++-------------------------------
> 2 files changed, 11 insertions(+), 33 deletions(-)
>
> diff --git a/configure b/configure
> index fed4c44cd1..42b9a72d5a 100755
> --- a/configure
> +++ b/configure
> @@ -2954,8 +2954,8 @@ ftr_decoder_select="adts_header"
> g2m_decoder_deps="zlib"
> g2m_decoder_select="blockdsp idctdsp jpegtables"
> g729_decoder_select="audiodsp"
> -h261_decoder_select="mpegvideodec"
> -h261_encoder_select="mpegvideoenc"
> +h261_decoder_select="h263dsp mpegvideodec"
Unnecessary since f793074784ae79dabc4f83b61710161b3fe3288c
(Btw: It was not only H.261 and H.263 using these; RV34 and VC-1 did so,
too, but only for the error-resilience code. But this is no longer an
issue since 7b539ca3e6bae701d88096ff8dc3db7f13b7318a.)
> +h261_encoder_select="h263dsp mpegvideoenc"
> h263_decoder_select="h263_parser h263dsp mpegvideodec qpeldsp"
> h263_encoder_select="h263dsp mpegvideoenc"
> h263i_decoder_select="h263_decoder"
> diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
> index b9a0469335..c9094d1cce 100644
> --- a/libavcodec/mpegvideo.c
> +++ b/libavcodec/mpegvideo.c
> @@ -202,13 +202,11 @@ 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 nCoeffs;
> + int qmul = qscale << 1;
> + int qadd, nCoeffs;
>
> av_assert2(s->block_last_index[n]>=0 || s->h263_aic);
>
> - qmul = qscale << 1;
> -
> if (!s->h263_aic) {
> block[0] *= n < 4 ? s->y_dc_scale : s->c_dc_scale;
> qadd = (qscale - 1) | 1;
> @@ -220,43 +218,20 @@ 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_intra(block, 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 = qscale << 1;
> + int qadd = (qscale - 1) | 1;
> int nCoeffs;
>
> av_assert2(s->block_last_index[n]>=0);
>
> - qadd = (qscale - 1) | 1;
> - 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_inter(block, nCoeffs, qmul, qadd);
This adds an indirection. I have asked you to actually benchmark this
code (and not only the DSP function you add), but you never did.
> }
>
>
> @@ -276,6 +251,9 @@ static void gray8(uint8_t *dst, const uint8_t *src,
> ptrdiff_t linesize, int h)
> static av_cold void dsp_init(MpegEncContext *s)
> {
> ff_blockdsp_init(&s->bdsp);
> +#if CONFIG_H263DSP
> + ff_h263dsp_init(&s->h263dsp);
> +#endif
> ff_hpeldsp_init(&s->hdsp, s->avctx->flags);
> ff_videodsp_init(&s->vdsp, s->avctx->bits_per_raw_sample);
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
