[FFmpeg-cvslog] avcodec/snow: Move initializing QpelDSPContext to snowenc.c
Andreas Rheinhardt
git at videolan.org
Fri Sep 29 03:03:32 EEST 2023
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sun Oct 9 06:14:13 2022 +0200| [10dad7ccc2c613be5d7f4fc339e0ce332e59725b] | committer: Andreas Rheinhardt
avcodec/snow: Move initializing QpelDSPContext to snowenc.c
Only used by the encoder.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10dad7ccc2c613be5d7f4fc339e0ce332e59725b
---
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 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);
More information about the ffmpeg-cvslog
mailing list