diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-09 06:14:13 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2023-09-29 00:52:06 +0200 |
| commit | 10dad7ccc2c613be5d7f4fc339e0ce332e59725b (patch) | |
| tree | c77c4b48a5f4256c1dad8e5368798e268e94bfe0 | |
| parent | 7ce2e5f3ea3acf09b786bf3500989f0955deb71c (diff) | |
| download | ffmpeg-10dad7ccc2c613be5d7f4fc339e0ce332e59725b.tar.gz | |
avcodec/snow: Move initializing QpelDSPContext to snowenc.c
Only used by the encoder.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/snow.c | 25 | ||||
| -rw-r--r-- | libavcodec/snowenc.c | 26 |
2 files changed, 26 insertions, 25 deletions
diff --git a/libavcodec/snow.c b/libavcodec/snow.c index 90197976fb..3bf1e8bdf8 100644 --- a/libavcodec/snow.c +++ b/libavcodec/snow.c @@ -406,31 +406,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 f954a686c1..571258c8c9 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -91,6 +91,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); |