diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2013-10-04 17:17:02 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-10-04 17:17:02 -0700 |
| commit | a36045fb3b232b709af9c51fa04d1fc526babea7 (patch) | |
| tree | 0c91d7dc02ee73980f04a7341de6a3ae1160152b | |
| parent | eead4bb89e58008ce17e05418fad86a0e9d7c4b6 (diff) | |
| parent | d07545b7b898ae3396ca66ecd9d1a9d254bcbb86 (diff) | |
| download | libvpx-a36045fb3b232b709af9c51fa04d1fc526babea7.tar libvpx-a36045fb3b232b709af9c51fa04d1fc526babea7.tar.gz libvpx-a36045fb3b232b709af9c51fa04d1fc526babea7.tar.bz2 libvpx-a36045fb3b232b709af9c51fa04d1fc526babea7.zip | |
Merge "cpplint issues with vp9_temporal_filter.c"
| -rw-r--r-- | vp9/encoder/vp9_temporal_filter.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c index 1768b5bed..6ff0de4bf 100644 --- a/vp9/encoder/vp9_temporal_filter.c +++ b/vp9/encoder/vp9_temporal_filter.c @@ -29,7 +29,7 @@ #include "vpx_ports/vpx_timer.h" #define ALT_REF_MC_ENABLED 1 // dis/enable MC in AltRef filtering -#define ALT_REF_SUBPEL_ENABLED 1 // dis/enable subpel in MC AltRef filtering +#define ALT_REF_SUBPEL_ENABLED 1 // dis/enable subpel in MC AltRef filtering static void temporal_filter_predictors_mb_c(MACROBLOCKD *xd, uint8_t *y_mb_ptr, @@ -83,7 +83,6 @@ void vp9_temporal_filter_apply_c(uint8_t *frame1, for (i = 0, k = 0; i < block_size; i++) { for (j = 0; j < block_size; j++, k++) { - int src_byte = frame1[byte]; int pixel_value = *frame2++; @@ -151,7 +150,6 @@ static int temporal_filter_find_matching_mb_c(VP9_COMP *cpi, step_param = MIN(step_param, (cpi->sf.max_step_search_steps - 2)); /*cpi->sf.search_method == HEX*/ - // TODO Check that the 16x16 vf & sdf are selected here // Ignore mv costing by sending NULL pointer instead of cost arrays ref_mv = &x->e_mbd.mi_8x8[0]->bmi[0].as_mv[0]; bestsme = vp9_hex_search(x, &best_ref_mv1_full.as_mv, @@ -424,16 +422,12 @@ void vp9_temporal_filter_prepare(VP9_COMP *cpi, int distance) { #ifdef DEBUGFWG // DEBUG FWG - printf("max:%d FBCK:%d FFWD:%d ftb:%d ftbbck:%d ftbfwd:%d sei:%d lasei:%d start:%d" -, max_frames -, num_frames_backward -, num_frames_forward -, frames_to_blur -, frames_to_blur_backward -, frames_to_blur_forward -, cpi->source_encode_index -, cpi->last_alt_ref_sei -, start_frame); + printf( + "max:%d FBCK:%d FFWD:%d ftb:%d ftbbck:%d ftbfwd:%d sei:%d lasei:%d " + "start:%d", + max_frames, num_frames_backward, num_frames_forward, frames_to_blur, + frames_to_blur_backward, frames_to_blur_forward, cpi->source_encode_index, + cpi->last_alt_ref_sei, start_frame); #endif // Setup scaling factors. Scaling on each of the arnr frames is not supported @@ -443,7 +437,7 @@ void vp9_temporal_filter_prepare(VP9_COMP *cpi, int distance) { cm->width, cm->height); // Setup frame pointers, NULL indicates frame not included in filter - vpx_memset(cpi->frames, 0, max_frames * sizeof(YV12_BUFFER_CONFIG *)); + vp9_zero(cpi->frames); for (frame = 0; frame < frames_to_blur; frame++) { int which_buffer = start_frame - frame; struct lookahead_entry *buf = vp9_lookahead_peek(cpi->lookahead, |