ref: 3cdd0a8e75111393bc1d03da6c0c2ca01c959b92
parent: 88a867c6dd319b7606711cc6120bed511a8f7c08
parent: b00ed02a165e7e605d519a92db2aca92629325f8
author: Paul Wilkins <paulwilkins@google.com>
date: Mon Feb 27 21:07:49 EST 2012
Merge "Corrected spelling" into experimental
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -264,7 +264,7 @@
unsigned char update_mb_segmentation_data;
/* 0 (do not update) 1 (update) the macroblock segmentation feature data. */
- unsigned char mb_segement_abs_delta;
+ unsigned char mb_segment_abs_delta;
/* Per frame flags that define which MB level features (such as quantizer or loop filter level) */
/* are enabled and when enabled the proabilities used to decode the per MB flags in MB_MODE_INFO */
--- a/vp8/common/loopfilter.c
+++ b/vp8/common/loopfilter.c
@@ -245,7 +245,7 @@
if ( segfeature_active( xd, seg, SEG_LVL_ALT_LF ) )
{/* Abs value */
- if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA)
+ if (xd->mb_segment_abs_delta == SEGMENT_ABSDATA)
{lvl_seg = get_segdata( xd, seg, SEG_LVL_ALT_LF );
}
@@ -754,7 +754,7 @@
{for (i = 0; i < MAX_MB_SEGMENTS; i++)
{ /* Abs value */- if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA)
+ if (xd->mb_segment_abs_delta == SEGMENT_ABSDATA)
{lvl_seg[i] = get_segdata( xd, i, SEG_LVL_ALT_LF );
}
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@ -78,7 +78,7 @@
if ( segfeature_active( xd, segment_id, SEG_LVL_ALT_Q ) )
{/* Abs Value */
- if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA)
+ if (xd->mb_segment_abs_delta == SEGMENT_ABSDATA)
QIndex = get_segdata( xd, segment_id, SEG_LVL_ALT_Q );
/* Delta Value */
@@ -843,7 +843,7 @@
// Features disabled, 0, with delta coding (Default state).
clearall_segfeatures( xd );
- xd->mb_segement_abs_delta = SEGMENT_DELTADATA;
+ xd->mb_segment_abs_delta = SEGMENT_DELTADATA;
/* reset the mode ref deltasa for loop filter */
vpx_memset(xd->ref_lf_deltas, 0, sizeof(xd->ref_lf_deltas));
@@ -1047,7 +1047,7 @@
{int data;
- xd->mb_segement_abs_delta = (unsigned char)vp8_read_bit(bc);
+ xd->mb_segment_abs_delta = (unsigned char)vp8_read_bit(bc);
clearall_segfeatures( xd );
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -2543,7 +2543,7 @@
{signed char Data;
- vp8_write_bit(bc, (xd->mb_segement_abs_delta) ? 1 : 0);
+ vp8_write_bit(bc, (xd->mb_segment_abs_delta) ? 1 : 0);
// For each segments id...
for (i = 0; i < MAX_MB_SEGMENTS; i++)
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -454,7 +454,7 @@
enable_segfeature(xd, 1, SEG_LVL_ALT_LF);
// Where relevant assume segment data is delta data
- xd->mb_segement_abs_delta = SEGMENT_DELTADATA;
+ xd->mb_segment_abs_delta = SEGMENT_DELTADATA;
}
}
@@ -484,7 +484,7 @@
{xd->update_mb_segmentation_map = 0;
xd->update_mb_segmentation_data = 1;
- xd->mb_segement_abs_delta = SEGMENT_DELTADATA;
+ xd->mb_segment_abs_delta = SEGMENT_DELTADATA;
qi_delta = compute_qdelta( cpi, cpi->avg_q,
(cpi->avg_q * 1.125) );
--- a/vp8/encoder/quantize.c
+++ b/vp8/encoder/quantize.c
@@ -1100,7 +1100,7 @@
if ( segfeature_active( xd, segment_id, SEG_LVL_ALT_Q ) )
{// Abs Value
- if (xd->mb_segement_abs_delta == SEGMENT_ABSDATA)
+ if (xd->mb_segment_abs_delta == SEGMENT_ABSDATA)
QIndex = get_segdata( xd, segment_id, SEG_LVL_ALT_Q );
// Delta Value
--- a/vp8/encoder/segmentation.c
+++ b/vp8/encoder/segmentation.c
@@ -106,7 +106,7 @@
{VP8_COMP *cpi = (VP8_COMP *)(ptr);
- cpi->mb.e_mbd.mb_segement_abs_delta = abs_delta;
+ cpi->mb.e_mbd.mb_segment_abs_delta = abs_delta;
vpx_memcpy(cpi->mb.e_mbd.segment_feature_data, feature_data,
sizeof(cpi->mb.e_mbd.segment_feature_data));