Reset x->skip for each iteration in the RD loop.
This prevents ill-defined behaviour, such as setting x->skip for a mode that is excluded because of frame-level flags (e.g. filter selection, compound prediction selection), then not breaking out of the RD loop because the mode is not allowed, but keeping the flag on. Whatever mode is iterated through next in the RD loop will then carry this flag, and all sort of bad stuff happens, such as x->skip being set on intra pred modes. Change-Id: I5bec46b36e38292174acb1c564b3caf00a9b4b9a
This commit is contained in:
Родитель
76ac5b3937
Коммит
290b83ab62
|
@ -3765,8 +3765,6 @@ static void rd_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
|
|||
|
||||
*returnintra = LLONG_MAX;
|
||||
|
||||
x->skip = 0;
|
||||
|
||||
mbmi->ref_frame = INTRA_FRAME;
|
||||
|
||||
/* Initialize zbin mode boost for uv costing */
|
||||
|
@ -3809,6 +3807,8 @@ static void rd_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
|
|||
rate_y = 0;
|
||||
rate_uv = 0;
|
||||
|
||||
x->skip = 0;
|
||||
|
||||
this_mode = vp9_mode_order[mode_index].mode;
|
||||
mbmi->mode = this_mode;
|
||||
mbmi->uv_mode = DC_PRED;
|
||||
|
|
Загрузка…
Ссылка в новой задаче