Commit 282c9639 authored by Marco Paniconi's avatar Marco Paniconi
Browse files

Fix for multi-res-encoding:

Use local variable for setting the improved prediction mode.
cpi->sf.improved_mv_pred is set/fixed at the frame level
and should not be changed inside pick_inter_mode.

Change-Id: Ie28d9171ac000e631af0e30204970e3d4fff3078
parent 8b4b28a5
...@@ -594,6 +594,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, ...@@ -594,6 +594,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX; unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX;
#endif #endif
int sf_improved_mv_pred = cpi->sf.improved_mv_pred;
int_mv mvp; int_mv mvp;
int near_sadidx[8] = {0, 1, 2, 3, 4, 5, 6, 7}; int near_sadidx[8] = {0, 1, 2, 3, 4, 5, 6, 7};
...@@ -882,7 +883,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, ...@@ -882,7 +883,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
last frame motion info is not stored, then we can not last frame motion info is not stored, then we can not
use improved_mv_pred. */ use improved_mv_pred. */
if (cpi->oxcf.mr_encoder_id && !parent_ref_valid) if (cpi->oxcf.mr_encoder_id && !parent_ref_valid)
cpi->sf.improved_mv_pred = 0; sf_improved_mv_pred = 0;
if (parent_ref_valid && parent_ref_frame) if (parent_ref_valid && parent_ref_frame)
{ {
...@@ -899,7 +900,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, ...@@ -899,7 +900,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
}else }else
#endif #endif
{ {
if(cpi->sf.improved_mv_pred) if(sf_improved_mv_pred)
{ {
if(!saddone) if(!saddone)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment