diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index b94d512660..592ee76084 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -653,7 +653,7 @@ static int dct_sad8x8_c(MpegEncContext *s, const uint8_t *src1, s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); s->fdsp.fdct(temp); - return s->mecc.sum_abs_dctelem(temp); + return s->sum_abs_dctelem(temp); } #if CONFIG_GPL @@ -819,7 +819,7 @@ static int rd8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2, s->idsp.idct_add(lsrc2, 8, temp); - distortion = s->mecc.sse[1](NULL, lsrc2, lsrc1, 8, 8); + distortion = s->sse_cmp[1](NULL, lsrc2, lsrc1, 8, 8); return distortion + ((bits * s->qscale * s->qscale * 109 + 64) >> 7); } diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 583ea9de6f..84b603f312 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -673,7 +673,7 @@ void ff_mpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], } diff = diff * 256 / (xe * ye); } else { - diff = s->mecc.sad[0](NULL, p_pic, b_pic, s->linesize, 16); + diff = s->sad_cmp[0](NULL, p_pic, b_pic, s->linesize, 16); } if (diff > s->qscale * 70) { // FIXME check that 70 is optimal s->mb_skipped = 0; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 79c5561793..844da6881f 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -220,7 +220,6 @@ typedef struct MpegEncContext { H264ChromaContext h264chroma; HpelDSPContext hdsp; IDCTDSPContext idsp; - MECmpContext mecc; MpegvideoEncDSPContext mpvencdsp; PixblockDSPContext pdsp; QpelDSPContext qdsp; @@ -508,6 +507,9 @@ typedef struct MpegEncContext { me_cmp_func ildct_cmp[2]; ///< 0 = intra, 1 = non-intra me_cmp_func n_sse_cmp[2]; ///< either SSE or NSSE cmp func + me_cmp_func sad_cmp[2]; + me_cmp_func sse_cmp[2]; + int (*sum_abs_dctelem)(const int16_t *block); /** * ratecontrol qmin qmax limiting method diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 3d659fa290..73e1a69490 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -308,19 +308,20 @@ av_cold void ff_dct_encode_init(MpegEncContext *s) static av_cold int me_cmp_init(MpegEncContext *s, AVCodecContext *avctx) { + MECmpContext mecc; me_cmp_func me_cmp[6]; int ret; - ff_me_cmp_init(&s->mecc, avctx); - ret = ff_me_init(&s->me, avctx, &s->mecc, 1); + ff_me_cmp_init(&mecc, avctx); + ret = ff_me_init(&s->me, avctx, &mecc, 1); if (ret < 0) return ret; - ret = ff_set_cmp(&s->mecc, me_cmp, s->frame_skip_cmp, 1); + ret = ff_set_cmp(&mecc, me_cmp, s->frame_skip_cmp, 1); if (ret < 0) return ret; s->frame_skip_cmp_fn = me_cmp[1]; if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { - ret = ff_set_cmp(&s->mecc, me_cmp, avctx->ildct_cmp, 1); + ret = ff_set_cmp(&mecc, me_cmp, avctx->ildct_cmp, 1); if (ret < 0) return ret; if (!me_cmp[0] || !me_cmp[4]) @@ -329,12 +330,18 @@ static av_cold int me_cmp_init(MpegEncContext *s, AVCodecContext *avctx) s->ildct_cmp[1] = me_cmp[4]; } + s->sum_abs_dctelem = mecc.sum_abs_dctelem; + + s->sse_cmp[0] = mecc.sse[0]; + s->sse_cmp[1] = mecc.sse[1]; + s->sad_cmp[0] = mecc.sad[0]; + s->sad_cmp[1] = mecc.sad[1]; if (avctx->mb_cmp == FF_CMP_NSSE) { - s->n_sse_cmp[0] = s->mecc.nsse[0]; - s->n_sse_cmp[1] = s->mecc.nsse[1]; + s->n_sse_cmp[0] = mecc.nsse[0]; + s->n_sse_cmp[1] = mecc.nsse[1]; } else { - s->n_sse_cmp[0] = s->mecc.sse[0]; - s->n_sse_cmp[1] = s->mecc.sse[1]; + s->n_sse_cmp[0] = mecc.sse[0]; + s->n_sse_cmp[1] = mecc.sse[1]; } return 0; @@ -1123,8 +1130,8 @@ static int get_intra_count(MpegEncContext *s, const uint8_t *src, for (y = 0; y < h; y += 16) { for (x = 0; x < w; x += 16) { int offset = x + y * stride; - int sad = s->mecc.sad[0](NULL, src + offset, ref + offset, - stride, 16); + int sad = s->sad_cmp[0](NULL, src + offset, ref + offset, + stride, 16); int mean = (s->mpvencdsp.pix_sum(src + offset, stride) + 128) >> 8; int sae = get_sae(src + offset, mean, stride); @@ -2347,28 +2354,28 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, /* pre quantization */ if (s->mc_mb_var[s->mb_stride * mb_y + mb_x] < 2 * s->qscale * s->qscale) { // FIXME optimize - if (s->mecc.sad[1](NULL, ptr_y, dest_y, wrap_y, 8) < 20 * s->qscale) + if (s->sad_cmp[1](NULL, ptr_y, dest_y, wrap_y, 8) < 20 * s->qscale) skip_dct[0] = 1; - if (s->mecc.sad[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20 * s->qscale) + if (s->sad_cmp[1](NULL, ptr_y + 8, dest_y + 8, wrap_y, 8) < 20 * s->qscale) skip_dct[1] = 1; - if (s->mecc.sad[1](NULL, ptr_y + dct_offset, dest_y + dct_offset, - wrap_y, 8) < 20 * s->qscale) + if (s->sad_cmp[1](NULL, ptr_y + dct_offset, dest_y + dct_offset, + wrap_y, 8) < 20 * s->qscale) skip_dct[2] = 1; - if (s->mecc.sad[1](NULL, ptr_y + dct_offset + 8, dest_y + dct_offset + 8, - wrap_y, 8) < 20 * s->qscale) + if (s->sad_cmp[1](NULL, ptr_y + dct_offset + 8, dest_y + dct_offset + 8, + wrap_y, 8) < 20 * s->qscale) skip_dct[3] = 1; - if (s->mecc.sad[1](NULL, ptr_cb, dest_cb, wrap_c, 8) < 20 * s->qscale) + if (s->sad_cmp[1](NULL, ptr_cb, dest_cb, wrap_c, 8) < 20 * s->qscale) skip_dct[4] = 1; - if (s->mecc.sad[1](NULL, ptr_cr, dest_cr, wrap_c, 8) < 20 * s->qscale) + if (s->sad_cmp[1](NULL, ptr_cr, dest_cr, wrap_c, 8) < 20 * s->qscale) skip_dct[5] = 1; if (!chroma_y_shift) { /* 422 */ - if (s->mecc.sad[1](NULL, ptr_cb + uv_dct_offset, - dest_cb + uv_dct_offset, - wrap_c, 8) < 20 * s->qscale) + if (s->sad_cmp[1](NULL, ptr_cb + uv_dct_offset, + dest_cb + uv_dct_offset, + wrap_c, 8) < 20 * s->qscale) skip_dct[6] = 1; - if (s->mecc.sad[1](NULL, ptr_cr + uv_dct_offset, - dest_cr + uv_dct_offset, - wrap_c, 8) < 20 * s->qscale) + if (s->sad_cmp[1](NULL, ptr_cr + uv_dct_offset, + dest_cr + uv_dct_offset, + wrap_c, 8) < 20 * s->qscale) skip_dct[7] = 1; } } @@ -2647,9 +2654,9 @@ static int sse(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2, int int x,y; if(w==16 && h==16) - return s->mecc.sse[0](NULL, src1, src2, stride, 16); + return s->sse_cmp[0](NULL, src1, src2, stride, 16); else if(w==8 && h==8) - return s->mecc.sse[1](NULL, src1, src2, stride, 8); + return s->sse_cmp[1](NULL, src1, src2, stride, 8); for(y=0; ymecc.sse[0](c, pix1, pix2, stride, h); + score1 = c->sse_cmp[0](c, pix1, pix2, stride, h); else score1 = ff_sse16_mmx(c, pix1, pix2, stride, h); score2 = ff_hf_noise16_mmx(pix1, stride, h) + ff_hf_noise8_mmx(pix1+8, stride, h)