Commit fb3e4ed9 authored by Paul Wilkins's avatar Paul Wilkins Committed by Gerrit Code Review
Browse files

Merge "Minor tweak to implicit segmentation experiment." into experimental

parents 9b935f99 da04312f
...@@ -99,7 +99,7 @@ void vp9_implicit_segment_map_update(VP9_COMMON * cm) { ...@@ -99,7 +99,7 @@ void vp9_implicit_segment_map_update(VP9_COMMON * cm) {
mi = mi_ptr; mi = mi_ptr;
// Experimental use of tx size to define implicit segmentation // Experimental use of tx size to define implicit segmentation
for (col = 0; col < cm->mb_cols; ++col, ++mi) { for (col = 0; col < cm->mb_cols; ++col, ++mi) {
map_ptr[col] = mi->mbmi.txfm_size; map_ptr[col] = 1 + mi->mbmi.txfm_size;
} }
mi_ptr += cm->mode_info_stride; mi_ptr += cm->mode_info_stride;
map_ptr += cm->mb_cols; map_ptr += cm->mb_cols;
......
...@@ -523,8 +523,8 @@ static void configure_implicit_segmentation(VP9_COMP *cpi) { ...@@ -523,8 +523,8 @@ static void configure_implicit_segmentation(VP9_COMP *cpi) {
xd->update_mb_segmentation_data = 1; xd->update_mb_segmentation_data = 1;
// Enable use of q deltas on segments // Enable use of q deltas on segments 1 and up
for (i = 0; i < MAX_MB_SEGMENTS; ++i) { for (i = 1; i < MAX_MB_SEGMENTS; ++i) {
qi_delta = compute_qdelta(cpi, cpi->active_worst_quality, q_target); qi_delta = compute_qdelta(cpi, cpi->active_worst_quality, q_target);
vp9_set_segdata(xd, i, SEG_LVL_ALT_Q, qi_delta); vp9_set_segdata(xd, i, SEG_LVL_ALT_Q, qi_delta);
q_target *= 0.95; q_target *= 0.95;
......
Supports Markdown
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