avcodec/me_cmp, mpegvideo: Move frame_skip_cmp to MpegEncContext

MECmpContext has several arrays of function pointers that are not set by ff_me_cmp_init(), but that are set by users to one of the other arrays via ff_set_cmp(). One of these other users is mpegvideo_enc; it is the only user of MECmpContext.frame_skip_cmp and it only uses one of these function pointers at all. This commit therefore moves this function pointer to MpegEncContext; and removes the array from MECmpContext.

Andreas Rheinhardt committed 2 years ago

Commit cd2e46a1 parent 182e6474 files · +7 −6Browse files

Unified · Split

4 files

libavcodec/me_cmp.h +0 −1
libavcodec/mpegvideo.h +1 −0
libavcodec/mpegvideo_enc.c +6 −4
tests/checkasm/motion.c +0 −1

libavcodec/me_cmp.h+0−1

@@ -71,7 +71,6 @@ typedef struct MECmpContext { · 70 unmodified lines
71	me_cmp_func dct264_sad[6];	71	me_cmp_func dct264_sad[6];
72		72
73	me_cmp_func ildct_cmp[6]; // only width 16 used	73	me_cmp_func ildct_cmp[6]; // only width 16 used
74	me_cmp_func frame_skip_cmp[6]; // only width 8 used
75		74
76	me_cmp_func pix_abs[2][4];	75	me_cmp_func pix_abs[2][4];
77	me_cmp_func median_sad[6];	76	me_cmp_func median_sad[6];

libavcodec/mpegvideo.h+1−0

@@ -542,6 +542,7 @@ typedef struct MpegEncContext { · 541 unmodified lines
542	int frame_skip_factor;	542	int frame_skip_factor;
543	int frame_skip_exp;	543	int frame_skip_exp;
544	int frame_skip_cmp;	544	int frame_skip_cmp;
		545	me_cmp_func frame_skip_cmp_fn;
545		546
546	int scenechange_threshold;	547	int scenechange_threshold;
547	int noise_reduction;	548	int noise_reduction;

libavcodec/mpegvideo_enc.c+6−4

 static av_cold int me_cmp_init(MpegEncContext *s, AVCodecContext *avctx)
 {
+    me_cmp_func me_cmp[6];
     int ret;
     ff_me_cmp_init(&s->mecc, avctx);
     ret = ff_me_init(&s->me, avctx, &s->mecc);
     if (ret < 0)
         return ret;
+    ret = ff_set_cmp(&s->mecc, me_cmp, s->frame_skip_cmp);
+    if (ret < 0)
+        return ret;
+    s->frame_skip_cmp_fn = me_cmp[1];
     return 0;
 }
         if (!s->mecc.ildct_cmp[0] || !s->mecc.ildct_cmp[4])
             return AVERROR(EINVAL);
     }
-    ret = ff_set_cmp(&s->mecc, s->mecc.frame_skip_cmp, s->frame_skip_cmp);
-    if (ret < 0)
-        return AVERROR(EINVAL);
     if (CONFIG_H263_ENCODER && s->out_format == FMT_H263) {
         ff_h263_encode_init(s);
                 int off = p->shared ? 0 : 16;
                 const uint8_t *dptr = p->f->data[plane] + 8 * (x + y * stride) + off;
                 const uint8_t *rptr = ref->f->data[plane] + 8 * (x + y * stride);
-                int v = s->mecc.frame_skip_cmp[1](s, dptr, rptr, stride, 8);
+                int v = s->frame_skip_cmp_fn(s, dptr, rptr, stride, 8);
                 switch (FFABS(s->frame_skip_exp)) {
                 case 0: score    =  FFMAX(score, v);          break;

tests/checkasm/motion.c+0−1

@@ -95,7 +95,6 @@ static void test_motion(const char *name, me_cmp_func test_func) · 94 unmodified lines
95	XX(vsse) \	95	XX(vsse) \
96	XX(nsse) \	96	XX(nsse) \
97	XX(ildct_cmp) \	97	XX(ildct_cmp) \
98	XX(frame_skip_cmp) \
99	XX(median_sad)	98	XX(median_sad)
100		99
101	// tests for functions not yet implemented	100	// tests for functions not yet implemented

avcodec/me_cmp, mpegvideo: Move frame_skip_cmp to MpegEncContext

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code