diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-01-12 16:55:44 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-01-30 12:08:30 -0800 |
| commit | 83a91e789ccd9fc0a9d05cb4357131ad18ba3b04 (patch) | |
| tree | a8ebf78049c5aad34f2a5bfd834f1202ed2da428 /vp8/encoder/picklpf.c | |
| parent | f103dcefaf2437b0eeba66e52426e4e9714cf949 (diff) | |
| download | libvpx-83a91e789ccd9fc0a9d05cb4357131ad18ba3b04.tar libvpx-83a91e789ccd9fc0a9d05cb4357131ad18ba3b04.tar.gz libvpx-83a91e789ccd9fc0a9d05cb4357131ad18ba3b04.tar.bz2 libvpx-83a91e789ccd9fc0a9d05cb4357131ad18ba3b04.zip | |
RTCD: add variance functions
This commit continues the process of converting to the new RTCD
system.
Change-Id: Ie5c1aa480637e98dc3918fb562ff45c37a66c538
Diffstat (limited to 'vp8/encoder/picklpf.c')
| -rw-r--r-- | vp8/encoder/picklpf.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/vp8/encoder/picklpf.c b/vp8/encoder/picklpf.c index 2449ae540..09e45bea6 100644 --- a/vp8/encoder/picklpf.c +++ b/vp8/encoder/picklpf.c @@ -21,7 +21,7 @@ #include "vpx_ports/arm.h" #endif -extern int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest, const vp8_variance_rtcd_vtable_t *rtcd); +extern int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest); #if CONFIG_RUNTIME_CPU_DETECT #define IF_RTCD(x) (x) @@ -64,8 +64,7 @@ void vp8_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, } static int calc_partial_ssl_err(YV12_BUFFER_CONFIG *source, - YV12_BUFFER_CONFIG *dest, - const vp8_variance_rtcd_vtable_t *rtcd) + YV12_BUFFER_CONFIG *dest) { int i, j; int Total = 0; @@ -93,7 +92,7 @@ static int calc_partial_ssl_err(YV12_BUFFER_CONFIG *source, for (j = 0; j < source->y_width; j += 16) { unsigned int sse; - Total += VARIANCE_INVOKE(rtcd, mse16x16)(src + j, source->y_stride, + Total += vp8_mse16x16(src + j, source->y_stride, dst + j, dest->y_stride, &sse); } @@ -183,8 +182,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) vp8_yv12_copy_partial_frame_ptr(saved_frame, cm->frame_to_show); vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val); - best_err = calc_partial_ssl_err(sd, cm->frame_to_show, - IF_RTCD(&cpi->rtcd.variance)); + best_err = calc_partial_ssl_err(sd, cm->frame_to_show); filt_val -= 1 + (filt_val > 10); @@ -196,8 +194,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val); // Get the err for filtered frame - filt_err = calc_partial_ssl_err(sd, cm->frame_to_show, - IF_RTCD(&cpi->rtcd.variance)); + filt_err = calc_partial_ssl_err(sd, cm->frame_to_show); // Update the best case record or exit loop. if (filt_err < best_err) @@ -228,8 +225,7 @@ void vp8cx_pick_filter_level_fast(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) vp8_loop_filter_partial_frame(cm, &cpi->mb.e_mbd, filt_val); // Get the err for filtered frame - filt_err = calc_partial_ssl_err(sd, cm->frame_to_show, - IF_RTCD(&cpi->rtcd.variance)); + filt_err = calc_partial_ssl_err(sd, cm->frame_to_show); // Update the best case record or exit loop. if (filt_err < best_err) @@ -322,8 +318,7 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) vp8cx_set_alt_lf_level(cpi, filt_mid); vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_mid); - best_err = vp8_calc_ss_err(sd, cm->frame_to_show, - IF_RTCD(&cpi->rtcd.variance)); + best_err = vp8_calc_ss_err(sd, cm->frame_to_show); ss_err[filt_mid] = best_err; @@ -349,8 +344,7 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) vp8cx_set_alt_lf_level(cpi, filt_low); vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_low); - filt_err = vp8_calc_ss_err(sd, cm->frame_to_show, - IF_RTCD(&cpi->rtcd.variance)); + filt_err = vp8_calc_ss_err(sd, cm->frame_to_show); ss_err[filt_low] = filt_err; } else @@ -376,8 +370,7 @@ void vp8cx_pick_filter_level(YV12_BUFFER_CONFIG *sd, VP8_COMP *cpi) vp8cx_set_alt_lf_level(cpi, filt_high); vp8_loop_filter_frame_yonly(cm, &cpi->mb.e_mbd, filt_high); - filt_err = vp8_calc_ss_err(sd, cm->frame_to_show, - IF_RTCD(&cpi->rtcd.variance)); + filt_err = vp8_calc_ss_err(sd, cm->frame_to_show); ss_err[filt_high] = filt_err; } else |