From b00ed02a165e7e605d519a92db2aca92629325f8 Mon Sep 17 00:00:00 2001 From: Paul Wilkins Date: Mon, 27 Feb 2012 21:42:36 +0000 Subject: [PATCH] Corrected spelling Apparently the correct spelling of segement is segment ! Change-Id: I88593ee0523f251b3a96794c6166ef8c7898a029 --- vp8/common/blockd.h | 2 +- vp8/common/loopfilter.c | 4 ++-- vp8/decoder/decodframe.c | 6 +++--- vp8/encoder/bitstream.c | 2 +- vp8/encoder/onyx_if.c | 4 ++-- vp8/encoder/quantize.c | 2 +- vp8/encoder/segmentation.c | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index c3360e7a1..4b3d40cd6 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -264,7 +264,7 @@ typedef struct MacroBlockD 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 */ diff --git a/vp8/common/loopfilter.c b/vp8/common/loopfilter.c index 65f50acc6..cb8b832d6 100644 --- a/vp8/common/loopfilter.c +++ b/vp8/common/loopfilter.c @@ -245,7 +245,7 @@ void vp8_loop_filter_frame_init(VP8_COMMON *cm, 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 @@ void vp8_loop_filter_partial_frame { 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 ); } diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 52ea3bc88..31a82a0fd 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -78,7 +78,7 @@ void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) 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 @@ static void init_frame(VP8D_COMP *pbi) // 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 vp8_decode_frame(VP8D_COMP *pbi) { 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 ); diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index ff83794c1..b8020af22 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -2543,7 +2543,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) { 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++) diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 834819125..394b75657 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -454,7 +454,7 @@ static void init_seg_features(VP8_COMP *cpi) 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 @@ static void init_seg_features(VP8_COMP *cpi) { 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) ); diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 3b22e57b2..7ea712f7f 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -1100,7 +1100,7 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x) 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 diff --git a/vp8/encoder/segmentation.c b/vp8/encoder/segmentation.c index c4a147558..c36246a02 100644 --- a/vp8/encoder/segmentation.c +++ b/vp8/encoder/segmentation.c @@ -106,7 +106,7 @@ void vp8_set_segment_data(VP8_PTR ptr, { 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)); -- 2.40.0