Commit b12a8dac authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Allow non-zeromv if ref_frame=intra with segmentation skip/ref enabled.

Change-Id: Ib5a95bb6ab643b276df3faa9bf99595e4a69ff18
parent eedd98ac
...@@ -2680,7 +2680,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -2680,7 +2680,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
// If the segment skip feature is enabled.... // If the segment skip feature is enabled....
// then do nothing if the current mode is not allowed.. // then do nothing if the current mode is not allowed..
} else if (vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP) && } else if (vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP) &&
(this_mode != ZEROMV)) { (this_mode != ZEROMV && ref_frame != INTRA_FRAME)) {
continue; continue;
// Disable this drop out case if the ref frame // Disable this drop out case if the ref frame
// segment level feature is enabled for this segment. This is to // segment level feature is enabled for this segment. This is to
......
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