diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2014-02-13 08:32:01 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-13 08:32:01 -0800 |
| commit | 4f34df4bf263449928c03be0ca35e4b891678d6a (patch) | |
| tree | 7b474cac8005a058328f82b32e836c1d6824dc44 /vp9 | |
| parent | 6a6797f5c9a9c82cd8b32741e15c6fec3de4513e (diff) | |
| parent | 677b5375aa3ae07ca07fb73d3dbe6c7ec8dd660c (diff) | |
| download | libvpx-4f34df4bf263449928c03be0ca35e4b891678d6a.tar libvpx-4f34df4bf263449928c03be0ca35e4b891678d6a.tar.gz libvpx-4f34df4bf263449928c03be0ca35e4b891678d6a.tar.bz2 libvpx-4f34df4bf263449928c03be0ca35e4b891678d6a.zip | |
Merge "vp9_temporal_filter.c static analysis issue resolution"
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_temporal_filter.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_temporal_filter.c b/vp9/encoder/vp9_temporal_filter.c index ca11dda1e..004047773 100644 --- a/vp9/encoder/vp9_temporal_filter.c +++ b/vp9/encoder/vp9_temporal_filter.c @@ -29,7 +29,6 @@ #include "vpx_scale/vpx_scale.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 static void temporal_filter_predictors_mb_c(MACROBLOCKD *xd, uint8_t *y_mb_ptr, @@ -160,11 +159,9 @@ static int temporal_filter_find_matching_mb_c(VP9_COMP *cpi, /*cpi->sf.search_method == HEX*/ // Ignore mv costing by sending NULL pointer instead of cost arrays - bestsme = vp9_hex_search(x, &best_ref_mv1_full, step_param, sadpb, 1, - &cpi->fn_ptr[BLOCK_16X16], - 0, &best_ref_mv1, ref_mv); + vp9_hex_search(x, &best_ref_mv1_full, step_param, sadpb, 1, + &cpi->fn_ptr[BLOCK_16X16], 0, &best_ref_mv1, ref_mv); -#if ALT_REF_SUBPEL_ENABLED // Try sub-pixel MC? // if (bestsme > error_thresh && bestsme < INT_MAX) { @@ -180,7 +177,6 @@ static int temporal_filter_find_matching_mb_c(VP9_COMP *cpi, NULL, NULL, &distortion, &sse); } -#endif // Restore input state x->plane[0].src = src; |