[FFmpeg-devel] [PATCH 10/20] avcodec/snow: Move initializing QpelDSPContext to snowenc.c

[Andreas Rheinhardt]

Andreas Rheinhardt:
> Only used by the encoder.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> ---
>  libavcodec/snow.c    | 25 -------------------------
>  libavcodec/snowenc.c | 26 ++++++++++++++++++++++++++
>  2 files changed, 26 insertions(+), 25 deletions(-)
> 
> diff --git a/libavcodec/snow.c b/libavcodec/snow.c
> index cde09902c3..c9bc4dbab9 100644
> --- a/libavcodec/snow.c
> +++ b/libavcodec/snow.c
> @@ -438,31 +438,6 @@ av_cold int ff_snow_common_init(AVCodecContext *avctx){
>      ff_dwt_init(&s->dwt);
>      ff_h264qpel_init(&s->h264qpel, 8);
>  
> -#define mcf(dx,dy)\
> -    s->qdsp.put_qpel_pixels_tab       [0][dy+dx/4]=\
> -    s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\
> -        s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\
> -    s->qdsp.put_qpel_pixels_tab       [1][dy+dx/4]=\
> -    s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\
> -        s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4];
> -
> -    mcf( 0, 0)
> -    mcf( 4, 0)
> -    mcf( 8, 0)
> -    mcf(12, 0)
> -    mcf( 0, 4)
> -    mcf( 4, 4)
> -    mcf( 8, 4)
> -    mcf(12, 4)
> -    mcf( 0, 8)
> -    mcf( 4, 8)
> -    mcf( 8, 8)
> -    mcf(12, 8)
> -    mcf( 0,12)
> -    mcf( 4,12)
> -    mcf( 8,12)
> -    mcf(12,12)
> -
>  #define mcfh(dx,dy)\
>      s->hdsp.put_pixels_tab       [0][dy/4+dx/8]=\
>      s->hdsp.put_no_rnd_pixels_tab[0][dy/4+dx/8]=\
> diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c
> index ea0d4fc27f..929edc1340 100644
> --- a/libavcodec/snowenc.c
> +++ b/libavcodec/snowenc.c
> @@ -67,6 +67,32 @@ static av_cold int encode_init(AVCodecContext *avctx)
>      if ((ret = ff_snow_common_init(avctx)) < 0) {
>          return ret;
>      }
> +
> +#define mcf(dx,dy)\
> +    s->qdsp.put_qpel_pixels_tab       [0][dy+dx/4]=\
> +    s->qdsp.put_no_rnd_qpel_pixels_tab[0][dy+dx/4]=\
> +        s->h264qpel.put_h264_qpel_pixels_tab[0][dy+dx/4];\
> +    s->qdsp.put_qpel_pixels_tab       [1][dy+dx/4]=\
> +    s->qdsp.put_no_rnd_qpel_pixels_tab[1][dy+dx/4]=\
> +        s->h264qpel.put_h264_qpel_pixels_tab[1][dy+dx/4];
> +
> +    mcf( 0, 0)
> +    mcf( 4, 0)
> +    mcf( 8, 0)
> +    mcf(12, 0)
> +    mcf( 0, 4)
> +    mcf( 4, 4)
> +    mcf( 8, 4)
> +    mcf(12, 4)
> +    mcf( 0, 8)
> +    mcf( 4, 8)
> +    mcf( 8, 8)
> +    mcf(12, 8)
> +    mcf( 0,12)
> +    mcf( 4,12)
> +    mcf( 8,12)
> +    mcf(12,12)
> +
>      ff_me_cmp_init(&s->mecc, avctx);
>      ff_mpegvideoencdsp_init(&s->mpvencdsp, avctx);
>  

Will apply patches 10-13 tomorrow unless there are objections.

- Andreas