dixie: cosmetics (line length, braces, etc)
Pass code through AStyle transform, wrap long lines.
Change-Id: Icffa4fc3e9835ec152285ae0e98a1ff3f46e42e6
diff --git a/vp8/dixie/bool_decoder.h b/vp8/dixie/bool_decoder.h
index 53a2dc1..12173b4 100644
--- a/vp8/dixie/bool_decoder.h
+++ b/vp8/dixie/bool_decoder.h
@@ -1,10 +1,10 @@
/*
* Copyright (c) 2010 The VP8 project authors. All Rights Reserved.
*
- * Use of this source code is governed by a BSD-style license and patent
- * grant that can be found in the LICENSE file in the root of the source
- * tree. All contributing project authors may be found in the AUTHORS
- * file in the root of the source tree.
+ * Use of this source code is governed by a BSD-style license and
+ * patent grant that can be found in the LICENSE file in the root of
+ * the source tree. All contributing project authors may be found in
+ * the AUTHORS file in the root of the source tree.
*/
@@ -14,11 +14,13 @@
struct bool_decoder
{
- const unsigned char *input; /* pointer to next compressed data byte */
- size_t input_len; /* length of the input buffer */
- unsigned int range; /* always identical to encoder's range */
- unsigned int value; /* contains at least 8 significant bits */
- int bit_count; /* # of bits shifted out of value, max 7 */
+ const unsigned char *input; /* next compressed data byte */
+ size_t input_len; /* length of the input buffer */
+ unsigned int range; /* identical to encoder's range */
+ unsigned int value; /* contains at least 8 significant
+ * bits */
+ int bit_count; /* # of bits shifted out of value,
+ * max 7 */
};
@@ -27,11 +29,11 @@
const unsigned char *start_partition,
size_t sz)
{
- if(sz >= 2)
+ if (sz >= 2)
{
d->value = (start_partition[0] << 8) /* first 2 input bytes */
| start_partition[1];
- d->input = start_partition + 2; /* ptr to next byte to be read */
+ d->input = start_partition + 2; /* ptr to next byte */
d->input_len = sz - 2;
}
else
@@ -40,42 +42,51 @@
d->input = NULL;
d->input_len = 0;
}
- d->range = 255; /* initial range is full */
- d->bit_count = 0; /* have not yet shifted out any bits */
+
+ d->range = 255; /* initial range is full */
+ d->bit_count = 0; /* have not yet shifted out any bits */
}
static int bool_get(struct bool_decoder *d, int probability)
{
- /* range and split are identical to the corresponding values
- used by the encoder when this bool was written */
+ /* range and split are identical to the corresponding values
+ used by the encoder when this bool was written */
- unsigned int split = 1 + ( ((d->range - 1) * probability) >> 8);
- unsigned int SPLIT = split << 8;
- int retval; /* will be 0 or 1 */
+ unsigned int split = 1 + (((d->range - 1) * probability) >> 8);
+ unsigned int SPLIT = split << 8;
+ int retval; /* will be 0 or 1 */
- if( d->value >= SPLIT) { /* encoded a one */
- retval = 1;
- d->range -= split; /* reduce range */
- d->value -= SPLIT; /* subtract off left endpoint of interval */
- } else { /* encoded a zero */
- retval = 0;
- d->range = split; /* reduce range, no change in left endpoint */
- }
-
- while( d->range < 128) { /* shift out irrelevant value bits */
- d->value <<= 1;
- d->range <<= 1;
- if( ++d->bit_count == 8) { /* shift in new bits 8 at a time */
- d->bit_count = 0;
- if(d->input_len)
- {
- d->value |= *d->input++;
- d->input_len--;
- }
+ if (d->value >= SPLIT) /* encoded a one */
+ {
+ retval = 1;
+ d->range -= split; /* reduce range */
+ d->value -= SPLIT; /* subtract off left endpoint of interval */
}
- }
- return retval;
+ else /* encoded a zero */
+ {
+ retval = 0;
+ d->range = split; /* reduce range, no change in left endpoint */
+ }
+
+ while (d->range < 128) /* shift out irrelevant value bits */
+ {
+ d->value <<= 1;
+ d->range <<= 1;
+
+ if (++d->bit_count == 8) /* shift in new bits 8 at a time */
+ {
+ d->bit_count = 0;
+
+ if (d->input_len)
+ {
+ d->value |= *d->input++;
+ d->input_len--;
+ }
+ }
+ }
+
+ return retval;
}
diff --git a/vp8/dixie/dixie.c b/vp8/dixie/dixie.c
index e895f31..ae58882 100644
--- a/vp8/dixie/dixie.c
+++ b/vp8/dixie/dixie.c
@@ -26,7 +26,8 @@
};
-#define ARRAY_COPY(a,b) {assert(sizeof(a)==sizeof(b));memcpy(a,b,sizeof(a));}
+#define ARRAY_COPY(a,b) {\
+ assert(sizeof(a)==sizeof(b));memcpy(a,b,sizeof(a));}
static void
decode_entropy_header(struct vp8_decoder_ctx *ctx,
struct bool_decoder *bool,
@@ -40,8 +41,10 @@
for (k = 0; k < PREV_COEF_CONTEXTS; k++)
for (l = 0; l < ENTROPY_NODES; l++)
if (bool_get(bool,
- k_coeff_entropy_update_probs[i][j][k][l]))
- hdr->coeff_probs[i][j][k][l] = bool_get_uint(bool, 8);
+ k_coeff_entropy_update_probs
+ [i][j][k][l]))
+ hdr->coeff_probs[i][j][k][l] =
+ bool_get_uint(bool, 8);
/* Read coefficient skip mode probability */
hdr->coeff_skip_enabled = bool_get_bit(bool);
@@ -127,7 +130,8 @@
if (sz < 3 *(hdr->partitions - 1))
vpx_internal_error(&ctx->error, VPX_CODEC_CORRUPT_FRAME,
- "Truncated packet found parsing partition lengths.");
+ "Truncated packet found parsing partition"
+ " lengths.");
sz -= 3 * (hdr->partitions - 1);
@@ -135,7 +139,8 @@
{
if (i < hdr->partitions - 1)
{
- hdr->partition_sz[i] = (data[2] << 16) | (data[1] << 8) | data[0];
+ hdr->partition_sz[i] = (data[2] << 16)
+ | (data[1] << 8) | data[0];
data += 3;
}
else
@@ -152,7 +157,7 @@
for (i = 0; i < ctx->token_hdr.partitions; i++)
{
init_bool_decoder(&ctx->tokens[i].bool, data,
- ctx->token_hdr.partition_sz[i]);
+ ctx->token_hdr.partition_sz[i]);
data += ctx->token_hdr.partition_sz[i];
}
}
@@ -279,14 +284,18 @@
if (dqf->quant_idx != q || quant_hdr->delta_update)
{
- dqf->factor[TOKEN_BLOCK_Y1][0] = dc_q(q + quant_hdr->y1_dc_delta_q);
- dqf->factor[TOKEN_BLOCK_Y1][1] = ac_q(q);
- dqf->factor[TOKEN_BLOCK_UV][0] = dc_q(q + quant_hdr->uv_dc_delta_q);
- dqf->factor[TOKEN_BLOCK_UV][1] = ac_q(q + quant_hdr->uv_ac_delta_q);
- dqf->factor[TOKEN_BLOCK_Y2][0] = dc_q(q + quant_hdr->y2_dc_delta_q)
- * 2;
- dqf->factor[TOKEN_BLOCK_Y2][1] = ac_q(q + quant_hdr->y2_ac_delta_q)
- * 155 / 100;
+ dqf->factor[TOKEN_BLOCK_Y1][0] =
+ dc_q(q + quant_hdr->y1_dc_delta_q);
+ dqf->factor[TOKEN_BLOCK_Y1][1] =
+ ac_q(q);
+ dqf->factor[TOKEN_BLOCK_UV][0] =
+ dc_q(q + quant_hdr->uv_dc_delta_q);
+ dqf->factor[TOKEN_BLOCK_UV][1] =
+ ac_q(q + quant_hdr->uv_ac_delta_q);
+ dqf->factor[TOKEN_BLOCK_Y2][0] =
+ dc_q(q + quant_hdr->y2_dc_delta_q) * 2;
+ dqf->factor[TOKEN_BLOCK_Y2][1] =
+ ac_q(q + quant_hdr->y2_ac_delta_q) * 155 / 100;
if (dqf->factor[TOKEN_BLOCK_Y2][1] < 8)
dqf->factor[TOKEN_BLOCK_Y2][1] = 8;
@@ -314,7 +323,8 @@
ctx->saved_entropy_valid = 0;
if ((res = vp8_parse_frame_header(data, sz, &ctx->frame_hdr)))
- vpx_internal_error(&ctx->error, res, "Failed to parse frame header");
+ vpx_internal_error(&ctx->error, res,
+ "Failed to parse frame header");
if (ctx->frame_hdr.is_experimental)
vpx_internal_error(&ctx->error, VPX_CODEC_UNSUP_BITSTREAM,
@@ -355,10 +365,14 @@
*/
if (ctx->frame_hdr.is_keyframe)
{
- ARRAY_COPY(ctx->entropy_hdr.coeff_probs, k_default_coeff_probs);
- ARRAY_COPY(ctx->entropy_hdr.mv_probs, k_default_mv_probs);
- ARRAY_COPY(ctx->entropy_hdr.y_mode_probs, k_default_y_mode_probs);
- ARRAY_COPY(ctx->entropy_hdr.uv_mode_probs, k_default_uv_mode_probs);
+ ARRAY_COPY(ctx->entropy_hdr.coeff_probs,
+ k_default_coeff_probs);
+ ARRAY_COPY(ctx->entropy_hdr.mv_probs,
+ k_default_mv_probs);
+ ARRAY_COPY(ctx->entropy_hdr.y_mode_probs,
+ k_default_y_mode_probs);
+ ARRAY_COPY(ctx->entropy_hdr.uv_mode_probs,
+ k_default_uv_mode_probs);
}
if (!ctx->reference_hdr.refresh_entropy)
@@ -372,16 +386,19 @@
vp8_dixie_modemv_init(ctx);
vp8_dixie_tokens_init(ctx);
vp8_dixie_predict_init(ctx);
- dequant_init(ctx->dequant_factors, &ctx->segment_hdr, &ctx->quant_hdr);
+ dequant_init(ctx->dequant_factors, &ctx->segment_hdr,
+ &ctx->quant_hdr);
for (row = 0, partition = 0; row < ctx->mb_rows; row++)
{
vp8_dixie_modemv_process_row(ctx, &bool, row, 0, ctx->mb_cols);
- vp8_dixie_tokens_process_row(ctx, partition, row, 0, ctx->mb_cols);
+ vp8_dixie_tokens_process_row(ctx, partition, row, 0,
+ ctx->mb_cols);
vp8_dixie_predict_process_row(ctx, row, 0, ctx->mb_cols);
if (ctx->loopfilter_hdr.level && row)
- vp8_dixie_loopfilter_process_row(ctx, row - 1, 0, ctx->mb_cols);
+ vp8_dixie_loopfilter_process_row(ctx, row - 1, 0,
+ ctx->mb_cols);
if (++partition == ctx->token_hdr.partitions)
partition = 0;
@@ -471,7 +488,9 @@
if (sz < 10)
return VPX_CODEC_CORRUPT_FRAME;
- /* The frame header is defined as a three byte little endian value */
+ /* The frame header is defined as a three byte little endian
+ * value
+ */
raw = data[0] | (data[1] << 8) | (data[2] << 16);
hdr->is_keyframe = !BITS_GET(raw, 0, 1);
hdr->version = BITS_GET(raw, 1, 2);
@@ -488,17 +507,22 @@
{
unsigned int update = 0;
- /* Keyframe header consists of a three byte sync code followed by the
- * width and height and associated scaling factors.
+ /* Keyframe header consists of a three byte sync code followed
+ * by the width and height and associated scaling factors.
*/
if (data[3] != 0x9d || data[4] != 0x01 || data[5] != 0x2a)
return VPX_CODEC_UNSUP_BITSTREAM;
- raw = data[6] | (data[7] << 8) | (data[8] << 16) | (data[9] << 24);
- CHECK_FOR_UPDATE(hdr->kf.w, BITS_GET(raw, 0, 14), update);
- CHECK_FOR_UPDATE(hdr->kf.scale_w, BITS_GET(raw, 14, 2), update);
- CHECK_FOR_UPDATE(hdr->kf.h, BITS_GET(raw, 16, 14), update);
- CHECK_FOR_UPDATE(hdr->kf.scale_h, BITS_GET(raw, 30, 2), update);
+ raw = data[6] | (data[7] << 8)
+ | (data[8] << 16) | (data[9] << 24);
+ CHECK_FOR_UPDATE(hdr->kf.w, BITS_GET(raw, 0, 14),
+ update);
+ CHECK_FOR_UPDATE(hdr->kf.scale_w, BITS_GET(raw, 14, 2),
+ update);
+ CHECK_FOR_UPDATE(hdr->kf.h, BITS_GET(raw, 16, 14),
+ update);
+ CHECK_FOR_UPDATE(hdr->kf.scale_h, BITS_GET(raw, 30, 2),
+ update);
hdr->frame_size_updated = update;
diff --git a/vp8/dixie/dixie.h b/vp8/dixie/dixie.h
index 19be108..38e487b 100644
--- a/vp8/dixie/dixie.h
+++ b/vp8/dixie/dixie.h
@@ -28,7 +28,9 @@
unsigned int scale_h; /* Scaling factor, Height */
} kf;
- unsigned int frame_size_updated; /* Flag to indicate a resolution update */
+ unsigned int frame_size_updated; /* Flag to indicate a resolution
+ * update.
+ */
};
@@ -158,8 +160,8 @@
MB_MODE_COUNT,
/* 4x4 intra modes */
- B_DC_PRED = 0, B_TM_PRED, B_VE_PRED, B_HE_PRED, B_LD_PRED, B_RD_PRED,
- B_VR_PRED, B_VL_PRED, B_HD_PRED, B_HU_PRED,
+ B_DC_PRED = 0, B_TM_PRED, B_VE_PRED, B_HE_PRED, B_LD_PRED,
+ B_RD_PRED, B_VR_PRED, B_VL_PRED, B_HD_PRED, B_HU_PRED,
/* 4x4 inter modes */
LEFT4X4, ABOVE4X4, ZERO4X4, NEW4X4,
diff --git a/vp8/dixie/dixie_loopfilter.c b/vp8/dixie/dixie_loopfilter.c
index 3573641..7d189bd 100644
--- a/vp8/dixie/dixie_loopfilter.c
+++ b/vp8/dixie/dixie_loopfilter.c
@@ -75,10 +75,10 @@
int E = edge_limit;
int I = interior_limit;
- /* Note: Deviates from spec */
return simple_threshold(pixels, stride, 2 * E + I)
- && ABS(p3 - p2) <= I && ABS(p2 - p1) <= I && ABS(p1 - p0) <= I
- && ABS(q3 - q2) <= I && ABS(q2 - q1) <= I && ABS(q1 - q0) <= I;
+ && ABS(p3 - p2) <= I && ABS(p2 - p1) <= I
+ && ABS(p1 - p0) <= I && ABS(q3 - q2) <= I
+ && ABS(q2 - q1) <= I && ABS(q1 - q0) <= I;
}
@@ -89,11 +89,6 @@
{
int a, f1, f2;
- /* This logic cribbed from ffvp8, which incorporates a number of
- * deviations from the bitstream guide to match what the libvpx
- * reference code does.
- */
-
a = 3 * (q0 - p0);
if (use_outer_taps)
@@ -109,8 +104,8 @@
if (!use_outer_taps)
{
- /* This handles the case of subblock_filter() (from the bitstream
- * guide.
+ /* This handles the case of subblock_filter()
+ * (from the bitstream guide.
*/
a = (f1 + 1) >> 1;
p1 = saturate_uint8(p1 + a);
@@ -180,7 +175,8 @@
for (i = 0; i < 8 * size; i++)
{
if (normal_threshold(src, 1, edge_limit, interior_limit))
- filter_common(src, 1, high_edge_variance(src, 1, hev_threshold));
+ filter_common(src, 1,
+ high_edge_variance(src, 1, hev_threshold));
src += stride;
}
@@ -226,7 +222,8 @@
{
if (normal_threshold(src, stride, edge_limit, interior_limit))
filter_common(src, stride,
- high_edge_variance(src, stride, hev_threshold));
+ high_edge_variance(src, stride,
+ hev_threshold));
src += 1;
}
@@ -244,6 +241,7 @@
{
if (simple_threshold(src, 1, filter_limit))
filter_common(src, 1, 1);
+
src += stride;
}
}
@@ -260,6 +258,7 @@
{
if (simple_threshold(src, stride, filter_limit))
filter_common(src, stride, 1);
+
src += 1;
}
}
@@ -274,21 +273,26 @@
{
int filter_level, interior_limit, hev_threshold;
- /* Reference code/spec seems to conflate filter_level and edge_limit */
+ /* Reference code/spec seems to conflate filter_level and
+ * edge_limit
+ */
filter_level = ctx->loopfilter_hdr.level;
if (ctx->segment_hdr.enabled)
{
if (!ctx->segment_hdr.abs)
- filter_level += ctx->segment_hdr.lf_level[mbi->base.segment_id];
+ filter_level +=
+ ctx->segment_hdr.lf_level[mbi->base.segment_id];
else
- filter_level = ctx->segment_hdr.lf_level[mbi->base.segment_id];
+ filter_level =
+ ctx->segment_hdr.lf_level[mbi->base.segment_id];
}
if (ctx->loopfilter_hdr.delta_enabled)
{
- filter_level += ctx->loopfilter_hdr.ref_delta[mbi->base.ref_frame];
+ filter_level +=
+ ctx->loopfilter_hdr.ref_delta[mbi->base.ref_frame];
if (mbi->base.ref_frame == CURRENT_FRAME)
{
@@ -364,64 +368,76 @@
/* TODO: only need to recalculate every MB if segmentation is
* enabled.
*/
- calculate_filter_parameters(ctx, mbi, &edge_limit, &interior_limit,
- &hev_threshold);
+ calculate_filter_parameters(ctx, mbi, &edge_limit,
+ &interior_limit, &hev_threshold);
if (edge_limit)
{
if (col)
{
- filter_mb_v_edge(y, stride, edge_limit + 2, interior_limit,
- hev_threshold, 2);
- filter_mb_v_edge(u, uv_stride, edge_limit + 2, interior_limit,
- hev_threshold, 1);
- filter_mb_v_edge(v, uv_stride, edge_limit + 2, interior_limit,
- hev_threshold, 1);
+ filter_mb_v_edge(y, stride, edge_limit + 2,
+ interior_limit, hev_threshold, 2);
+ filter_mb_v_edge(u, uv_stride, edge_limit + 2,
+ interior_limit, hev_threshold, 1);
+ filter_mb_v_edge(v, uv_stride, edge_limit + 2,
+ interior_limit, hev_threshold, 1);
}
- /* NOTE: This conditional is actually dependent on the number
- * of coefficients decoded, not the skip flag as coded in the
- * bitstream. The tokens task is expected to set 31 if there
- * is *any* non-zero data.
+ /* NOTE: This conditional is actually dependent on the
+ * number of coefficients decoded, not the skip flag as
+ * coded in the bitstream. The tokens task is expected to
+ * set 31 if there is *any* non-zero data.
*/
if (mbi->base.eob_mask
- || mbi->base.y_mode == SPLITMV || mbi->base.y_mode == B_PRED)
+ || mbi->base.y_mode == SPLITMV
+ || mbi->base.y_mode == B_PRED)
{
filter_subblock_v_edge(y + 4, stride, edge_limit,
- interior_limit, hev_threshold, 2);
+ interior_limit, hev_threshold,
+ 2);
filter_subblock_v_edge(y + 8, stride, edge_limit,
- interior_limit, hev_threshold, 2);
+ interior_limit, hev_threshold,
+ 2);
filter_subblock_v_edge(y + 12, stride, edge_limit,
- interior_limit, hev_threshold, 2);
+ interior_limit, hev_threshold,
+ 2);
filter_subblock_v_edge(u + 4, uv_stride, edge_limit,
- interior_limit, hev_threshold, 1);
+ interior_limit, hev_threshold,
+ 1);
filter_subblock_v_edge(v + 4, uv_stride, edge_limit,
- interior_limit, hev_threshold, 1);
+ interior_limit, hev_threshold,
+ 1);
}
if (row)
{
- filter_mb_h_edge(y, stride, edge_limit + 2, interior_limit,
- hev_threshold, 2);
- filter_mb_h_edge(u, uv_stride, edge_limit + 2, interior_limit,
- hev_threshold, 1);
- filter_mb_h_edge(v, uv_stride, edge_limit + 2, interior_limit,
- hev_threshold, 1);
+ filter_mb_h_edge(y, stride, edge_limit + 2,
+ interior_limit, hev_threshold, 2);
+ filter_mb_h_edge(u, uv_stride, edge_limit + 2,
+ interior_limit, hev_threshold, 1);
+ filter_mb_h_edge(v, uv_stride, edge_limit + 2,
+ interior_limit, hev_threshold, 1);
}
if (mbi->base.eob_mask
- || mbi->base.y_mode == SPLITMV || mbi->base.y_mode == B_PRED)
+ || mbi->base.y_mode == SPLITMV
+ || mbi->base.y_mode == B_PRED)
{
- filter_subblock_h_edge(y + 4 * stride, stride, edge_limit,
- interior_limit, hev_threshold, 2);
- filter_subblock_h_edge(y + 8 * stride, stride, edge_limit,
- interior_limit, hev_threshold, 2);
- filter_subblock_h_edge(y + 12 * stride, stride, edge_limit,
- interior_limit, hev_threshold, 2);
- filter_subblock_h_edge(u + 4 * uv_stride, uv_stride, edge_limit,
- interior_limit, hev_threshold, 1);
- filter_subblock_h_edge(v + 4 * uv_stride, uv_stride, edge_limit,
- interior_limit, hev_threshold, 1);
+ filter_subblock_h_edge(y + 4 * stride, stride,
+ edge_limit, interior_limit,
+ hev_threshold, 2);
+ filter_subblock_h_edge(y + 8 * stride, stride,
+ edge_limit, interior_limit,
+ hev_threshold, 2);
+ filter_subblock_h_edge(y + 12 * stride, stride,
+ edge_limit, interior_limit,
+ hev_threshold, 2);
+ filter_subblock_h_edge(u + 4 * uv_stride, uv_stride,
+ edge_limit, interior_limit,
+ hev_threshold, 1);
+ filter_subblock_h_edge(v + 4 * uv_stride, uv_stride,
+ edge_limit, interior_limit,
+ hev_threshold, 1);
}
}
@@ -457,19 +473,20 @@
/* TODO: only need to recalculate every MB if segmentation is
* enabled.
*/
- calculate_filter_parameters(ctx, mbi, &edge_limit, &interior_limit,
- &hev_threshold);
+ calculate_filter_parameters(ctx, mbi, &edge_limit,
+ &interior_limit, &hev_threshold);
if (edge_limit)
{
- /* NOTE: This conditional is actually dependent on the number
- * of coefficients decoded, not the skip flag as coded in the
- * bitstream. The tokens task is expected to set 31 if there
- * is *any* non-zero data.
+ /* NOTE: This conditional is actually dependent on the
+ * number of coefficients decoded, not the skip flag as
+ * coded in the bitstream. The tokens task is expected to
+ * set 31 if there is *any* non-zero data.
*/
int filter_subblocks = (mbi->base.eob_mask
- || mbi->base.y_mode == SPLITMV || mbi->base.y_mode == B_PRED);
+ || mbi->base.y_mode == SPLITMV
+ || mbi->base.y_mode == B_PRED);
int mb_limit = (edge_limit + 2) * 2 + interior_limit;
int b_limit = edge_limit * 2 + interior_limit;
@@ -506,7 +523,7 @@
unsigned int start_col,
unsigned int num_cols)
{
- if(ctx->loopfilter_hdr.use_simple)
+ if (ctx->loopfilter_hdr.use_simple)
filter_row_simple(ctx, row, start_col, num_cols);
else
filter_row_normal(ctx, row, start_col, num_cols);
diff --git a/vp8/dixie/idct_add.c b/vp8/dixie/idct_add.c
index 8121d48..ed350bc 100644
--- a/vp8/dixie/idct_add.c
+++ b/vp8/dixie/idct_add.c
@@ -81,10 +81,12 @@
b1 = ip[0] - ip[8];
temp1 = (ip[4] * sinpi8sqrt2 + rounding) >> 16;
- temp2 = ip[12] + ((ip[12] * cospi8sqrt2minus1 + rounding) >> 16);
+ temp2 = ip[12] +
+ ((ip[12] * cospi8sqrt2minus1 + rounding) >> 16);
c1 = temp1 - temp2;
- temp1 = ip[4] + ((ip[4] * cospi8sqrt2minus1 + rounding) >> 16);
+ temp1 = ip[4] +
+ ((ip[4] * cospi8sqrt2minus1 + rounding) >> 16);
temp2 = (ip[12] * sinpi8sqrt2 + rounding) >> 16;
d1 = temp1 + temp2;
@@ -119,10 +121,12 @@
b1 = coeffs[0] - coeffs[2];
temp1 = (coeffs[1] * sinpi8sqrt2 + rounding) >> 16;
- temp2 = coeffs[3] + ((coeffs[3] * cospi8sqrt2minus1 + rounding) >> 16);
+ temp2 = coeffs[3] +
+ ((coeffs[3] * cospi8sqrt2minus1 + rounding) >> 16);
c1 = temp1 - temp2;
- temp1 = coeffs[1] + ((coeffs[1] * cospi8sqrt2minus1 + rounding) >> 16);
+ temp1 = coeffs[1] +
+ ((coeffs[1] * cospi8sqrt2minus1 + rounding) >> 16);
temp2 = (coeffs[3] * sinpi8sqrt2 + rounding) >> 16;
d1 = temp1 + temp2;
diff --git a/vp8/dixie/modemv.c b/vp8/dixie/modemv.c
index 06fca39..d85c4d8 100644
--- a/vp8/dixie/modemv.c
+++ b/vp8/dixie/modemv.c
@@ -24,10 +24,14 @@
{
union mv newmv;
- newmv.d.x = (raw.d.x < bounds->to_left) ? bounds->to_left : raw.d.x;
- newmv.d.x = (raw.d.x > bounds->to_right) ? bounds->to_right : newmv.d.x;
- newmv.d.y = (raw.d.y < bounds->to_top) ? bounds->to_top : raw.d.y;
- newmv.d.y = (raw.d.y > bounds->to_bottom) ? bounds->to_bottom : newmv.d.y;
+ newmv.d.x = (raw.d.x < bounds->to_left)
+ ? bounds->to_left : raw.d.x;
+ newmv.d.x = (raw.d.x > bounds->to_right)
+ ? bounds->to_right : newmv.d.x;
+ newmv.d.y = (raw.d.y < bounds->to_top)
+ ? bounds->to_top : raw.d.y;
+ newmv.d.y = (raw.d.y > bounds->to_bottom)
+ ? bounds->to_bottom : newmv.d.y;
return newmv;
}
@@ -117,7 +121,8 @@
enum prediction_mode l = left_block_mode(this, left, i);
enum prediction_mode b;
- b = bool_read_tree(bool, b_mode_tree, kf_b_mode_probs[a][l]);
+ b = bool_read_tree(bool, b_mode_tree,
+ kf_b_mode_probs[a][l]);
this->split.modes[i] = b;
}
}
@@ -353,7 +358,8 @@
union mv this_mv;
this_mv.raw = aboveleft->base.mv.raw;
- mv_bias(aboveleft, sign_bias, this->base.ref_frame, &this_mv);
+ mv_bias(aboveleft, sign_bias, this->base.ref_frame,
+ &this_mv);
if (this_mv.raw != mv->raw)
{
@@ -391,8 +397,8 @@
near_mvs[CNT_NEAR].raw = tmp;
}
- /* Use near_mvs[CNT_BEST] to store the "best" MV. Note that this storage
- * shares the same address as near_mvs[CNT_ZEROZERO].
+ /* Use near_mvs[CNT_BEST] to store the "best" MV. Note that this
+ * storage shares the same address as near_mvs[CNT_ZEROZERO].
*/
if (cnt[CNT_NEAREST] >= cnt[CNT_BEST])
near_mvs[CNT_BEST] = near_mvs[CNT_NEAREST];
@@ -537,8 +543,10 @@
for (b = 0; b < 16; b++)
{
- chroma_mv[(b>>1&1) + (b>>2&2)].d.x += this->split.mvs[b].d.x;
- chroma_mv[(b>>1&1) + (b>>2&2)].d.y += this->split.mvs[b].d.y;
+ chroma_mv[(b>>1&1) + (b>>2&2)].d.x +=
+ this->split.mvs[b].d.x;
+ chroma_mv[(b>>1&1) + (b>>2&2)].d.y +=
+ this->split.mvs[b].d.y;
if (need_mc_border(this->split.mvs[b],
x + (b & 3) * 4, y + (b & ~3), 4, w, h))
@@ -577,10 +585,10 @@
void
vp8_dixie_modemv_process_row(struct vp8_decoder_ctx *ctx,
- struct bool_decoder *bool,
- int row,
- int start_col,
- int num_cols)
+struct bool_decoder *bool,
+int row,
+int start_col,
+int num_cols)
{
struct mb_info *above, *this;
unsigned int col;
@@ -599,11 +607,11 @@
{
if (ctx->segment_hdr.update_map)
this->base.segment_id = read_segment_id(bool,
- &ctx->segment_hdr);
+ &ctx->segment_hdr);
if (ctx->entropy_hdr.coeff_skip_enabled)
this->base.skip_coeff = bool_get(bool,
- ctx->entropy_hdr.coeff_skip_prob);
+ ctx->entropy_hdr.coeff_skip_prob);
if (ctx->frame_hdr.is_keyframe)
{
@@ -642,18 +650,18 @@
if (ctx->frame_hdr.frame_size_updated)
{
free(ctx->mb_info_storage);
- ctx->mb_info_storage = NULL;
- free(ctx->mb_info_rows_storage);
- ctx->mb_info_rows_storage = NULL;
+ ctx->mb_info_storage = NULL;
+ free(ctx->mb_info_rows_storage);
+ ctx->mb_info_rows_storage = NULL;
}
-
+
if (!ctx->mb_info_storage)
ctx->mb_info_storage = calloc(mbi_w * mbi_h,
- sizeof(*ctx->mb_info_storage));
+ sizeof(*ctx->mb_info_storage));
if (!ctx->mb_info_rows_storage)
ctx->mb_info_rows_storage = calloc(mbi_h,
- sizeof(*ctx->mb_info_rows_storage));
+ sizeof(*ctx->mb_info_rows_storage));
/* Set up row pointers */
mbi = ctx->mb_info_storage + 1;
diff --git a/vp8/dixie/modemv_data.h b/vp8/dixie/modemv_data.h
index 4912ad7..d413005 100644
--- a/vp8/dixie/modemv_data.h
+++ b/vp8/dixie/modemv_data.h
@@ -2,215 +2,215 @@
static const unsigned char kf_uv_mode_probs[] = { 142, 114, 183};
static const unsigned char kf_b_mode_probs[10][10][9] =
{
- { /* above mode 0 */
- { /* left mode 0 */ 231, 120, 48, 89, 115, 113, 120, 152, 112},
- { /* left mode 1 */ 152, 179, 64, 126, 170, 118, 46, 70, 95},
- { /* left mode 2 */ 175, 69, 143, 80, 85, 82, 72, 155, 103},
- { /* left mode 3 */ 56, 58, 10, 171, 218, 189, 17, 13, 152},
- { /* left mode 4 */ 144, 71, 10, 38, 171, 213, 144, 34, 26},
- { /* left mode 5 */ 114, 26, 17, 163, 44, 195, 21, 10, 173},
- { /* left mode 6 */ 121, 24, 80, 195, 26, 62, 44, 64, 85},
- { /* left mode 7 */ 170, 46, 55, 19, 136, 160, 33, 206, 71},
- { /* left mode 8 */ 63, 20, 8, 114, 114, 208, 12, 9, 226},
- { /* left mode 9 */ 81, 40, 11, 96, 182, 84, 29, 16, 36}
- },
- { /* above mode 1 */
- { /* left mode 0 */ 134, 183, 89, 137, 98, 101, 106, 165, 148},
- { /* left mode 1 */ 72, 187, 100, 130, 157, 111, 32, 75, 80},
- { /* left mode 2 */ 66, 102, 167, 99, 74, 62, 40, 234, 128},
- { /* left mode 3 */ 41, 53, 9, 178, 241, 141, 26, 8, 107},
- { /* left mode 4 */ 104, 79, 12, 27, 217, 255, 87, 17, 7},
- { /* left mode 5 */ 74, 43, 26, 146, 73, 166, 49, 23, 157},
- { /* left mode 6 */ 65, 38, 105, 160, 51, 52, 31, 115, 128},
- { /* left mode 7 */ 87, 68, 71, 44, 114, 51, 15, 186, 23},
- { /* left mode 8 */ 47, 41, 14, 110, 182, 183, 21, 17, 194},
- { /* left mode 9 */ 66, 45, 25, 102, 197, 189, 23, 18, 22}
- },
- { /* above mode 2 */
- { /* left mode 0 */ 88, 88, 147, 150, 42, 46, 45, 196, 205},
- { /* left mode 1 */ 43, 97, 183, 117, 85, 38, 35, 179, 61},
- { /* left mode 2 */ 39, 53, 200, 87, 26, 21, 43, 232, 171},
- { /* left mode 3 */ 56, 34, 51, 104, 114, 102, 29, 93, 77},
- { /* left mode 4 */ 107, 54, 32, 26, 51, 1, 81, 43, 31},
- { /* left mode 5 */ 39, 28, 85, 171, 58, 165, 90, 98, 64},
- { /* left mode 6 */ 34, 22, 116, 206, 23, 34, 43, 166, 73},
- { /* left mode 7 */ 68, 25, 106, 22, 64, 171, 36, 225, 114},
- { /* left mode 8 */ 34, 19, 21, 102, 132, 188, 16, 76, 124},
- { /* left mode 9 */ 62, 18, 78, 95, 85, 57, 50, 48, 51}
- },
- { /* above mode 3 */
- { /* left mode 0 */ 193, 101, 35, 159, 215, 111, 89, 46, 111},
- { /* left mode 1 */ 60, 148, 31, 172, 219, 228, 21, 18, 111},
- { /* left mode 2 */ 112, 113, 77, 85, 179, 255, 38, 120, 114},
- { /* left mode 3 */ 40, 42, 1, 196, 245, 209, 10, 25, 109},
- { /* left mode 4 */ 100, 80, 8, 43, 154, 1, 51, 26, 71},
- { /* left mode 5 */ 88, 43, 29, 140, 166, 213, 37, 43, 154},
- { /* left mode 6 */ 61, 63, 30, 155, 67, 45, 68, 1, 209},
- { /* left mode 7 */ 142, 78, 78, 16, 255, 128, 34, 197, 171},
- { /* left mode 8 */ 41, 40, 5, 102, 211, 183, 4, 1, 221},
- { /* left mode 9 */ 51, 50, 17, 168, 209, 192, 23, 25, 82}
- },
- { /* above mode 4 */
- { /* left mode 0 */ 125, 98, 42, 88, 104, 85, 117, 175, 82},
- { /* left mode 1 */ 95, 84, 53, 89, 128, 100, 113, 101, 45},
- { /* left mode 2 */ 75, 79, 123, 47, 51, 128, 81, 171, 1},
- { /* left mode 3 */ 57, 17, 5, 71, 102, 57, 53, 41, 49},
- { /* left mode 4 */ 115, 21, 2, 10, 102, 255, 166, 23, 6},
- { /* left mode 5 */ 38, 33, 13, 121, 57, 73, 26, 1, 85},
- { /* left mode 6 */ 41, 10, 67, 138, 77, 110, 90, 47, 114},
- { /* left mode 7 */ 101, 29, 16, 10, 85, 128, 101, 196, 26},
- { /* left mode 8 */ 57, 18, 10, 102, 102, 213, 34, 20, 43},
- { /* left mode 9 */ 117, 20, 15, 36, 163, 128, 68, 1, 26}
- },
- { /* above mode 5 */
- { /* left mode 0 */ 138, 31, 36, 171, 27, 166, 38, 44, 229},
- { /* left mode 1 */ 67, 87, 58, 169, 82, 115, 26, 59, 179},
- { /* left mode 2 */ 63, 59, 90, 180, 59, 166, 93, 73, 154},
- { /* left mode 3 */ 40, 40, 21, 116, 143, 209, 34, 39, 175},
- { /* left mode 4 */ 57, 46, 22, 24, 128, 1, 54, 17, 37},
- { /* left mode 5 */ 47, 15, 16, 183, 34, 223, 49, 45, 183},
- { /* left mode 6 */ 46, 17, 33, 183, 6, 98, 15, 32, 183},
- { /* left mode 7 */ 65, 32, 73, 115, 28, 128, 23, 128, 205},
- { /* left mode 8 */ 40, 3, 9, 115, 51, 192, 18, 6, 223},
- { /* left mode 9 */ 87, 37, 9, 115, 59, 77, 64, 21, 47}
- },
- { /* above mode 6 */
- { /* left mode 0 */ 104, 55, 44, 218, 9, 54, 53, 130, 226},
- { /* left mode 1 */ 64, 90, 70, 205, 40, 41, 23, 26, 57},
- { /* left mode 2 */ 54, 57, 112, 184, 5, 41, 38, 166, 213},
- { /* left mode 3 */ 30, 34, 26, 133, 152, 116, 10, 32, 134},
- { /* left mode 4 */ 75, 32, 12, 51, 192, 255, 160, 43, 51},
- { /* left mode 5 */ 39, 19, 53, 221, 26, 114, 32, 73, 255},
- { /* left mode 6 */ 31, 9, 65, 234, 2, 15, 1, 118, 73},
- { /* left mode 7 */ 88, 31, 35, 67, 102, 85, 55, 186, 85},
- { /* left mode 8 */ 56, 21, 23, 111, 59, 205, 45, 37, 192},
- { /* left mode 9 */ 55, 38, 70, 124, 73, 102, 1, 34, 98}
- },
- { /* above mode 7 */
- { /* left mode 0 */ 102, 61, 71, 37, 34, 53, 31, 243, 192},
- { /* left mode 1 */ 69, 60, 71, 38, 73, 119, 28, 222, 37},
- { /* left mode 2 */ 68, 45, 128, 34, 1, 47, 11, 245, 171},
- { /* left mode 3 */ 62, 17, 19, 70, 146, 85, 55, 62, 70},
- { /* left mode 4 */ 75, 15, 9, 9, 64, 255, 184, 119, 16},
- { /* left mode 5 */ 37, 43, 37, 154, 100, 163, 85, 160, 1},
- { /* left mode 6 */ 63, 9, 92, 136, 28, 64, 32, 201, 85},
- { /* left mode 7 */ 86, 6, 28, 5, 64, 255, 25, 248, 1},
- { /* left mode 8 */ 56, 8, 17, 132, 137, 255, 55, 116, 128},
- { /* left mode 9 */ 58, 15, 20, 82, 135, 57, 26, 121, 40}
- },
- { /* above mode 8 */
- { /* left mode 0 */ 164, 50, 31, 137, 154, 133, 25, 35, 218},
- { /* left mode 1 */ 51, 103, 44, 131, 131, 123, 31, 6, 158},
- { /* left mode 2 */ 86, 40, 64, 135, 148, 224, 45, 183, 128},
- { /* left mode 3 */ 22, 26, 17, 131, 240, 154, 14, 1, 209},
- { /* left mode 4 */ 83, 12, 13, 54, 192, 255, 68, 47, 28},
- { /* left mode 5 */ 45, 16, 21, 91, 64, 222, 7, 1, 197},
- { /* left mode 6 */ 56, 21, 39, 155, 60, 138, 23, 102, 213},
- { /* left mode 7 */ 85, 26, 85, 85, 128, 128, 32, 146, 171},
- { /* left mode 8 */ 18, 11, 7, 63, 144, 171, 4, 4, 246},
- { /* left mode 9 */ 35, 27, 10, 146, 174, 171, 12, 26, 128}
- },
- { /* above mode 9 */
- { /* left mode 0 */ 190, 80, 35, 99, 180, 80, 126, 54, 45},
- { /* left mode 1 */ 85, 126, 47, 87, 176, 51, 41, 20, 32},
- { /* left mode 2 */ 101, 75, 128, 139, 118, 146, 116, 128, 85},
- { /* left mode 3 */ 56, 41, 15, 176, 236, 85, 37, 9, 62},
- { /* left mode 4 */ 146, 36, 19, 30, 171, 255, 97, 27, 20},
- { /* left mode 5 */ 71, 30, 17, 119, 118, 255, 17, 18, 138},
- { /* left mode 6 */ 101, 38, 60, 138, 55, 70, 43, 26, 142},
- { /* left mode 7 */ 138, 45, 61, 62, 219, 1, 81, 188, 64},
- { /* left mode 8 */ 32, 41, 20, 117, 151, 142, 20, 21, 163},
- { /* left mode 9 */ 112, 19, 12, 61, 195, 128, 48, 4, 24}
- }
+ { /* above mode 0 */
+ { /* left mode 0 */ 231, 120, 48, 89, 115, 113, 120, 152, 112},
+ { /* left mode 1 */ 152, 179, 64, 126, 170, 118, 46, 70, 95},
+ { /* left mode 2 */ 175, 69, 143, 80, 85, 82, 72, 155, 103},
+ { /* left mode 3 */ 56, 58, 10, 171, 218, 189, 17, 13, 152},
+ { /* left mode 4 */ 144, 71, 10, 38, 171, 213, 144, 34, 26},
+ { /* left mode 5 */ 114, 26, 17, 163, 44, 195, 21, 10, 173},
+ { /* left mode 6 */ 121, 24, 80, 195, 26, 62, 44, 64, 85},
+ { /* left mode 7 */ 170, 46, 55, 19, 136, 160, 33, 206, 71},
+ { /* left mode 8 */ 63, 20, 8, 114, 114, 208, 12, 9, 226},
+ { /* left mode 9 */ 81, 40, 11, 96, 182, 84, 29, 16, 36}
+ },
+ { /* above mode 1 */
+ { /* left mode 0 */ 134, 183, 89, 137, 98, 101, 106, 165, 148},
+ { /* left mode 1 */ 72, 187, 100, 130, 157, 111, 32, 75, 80},
+ { /* left mode 2 */ 66, 102, 167, 99, 74, 62, 40, 234, 128},
+ { /* left mode 3 */ 41, 53, 9, 178, 241, 141, 26, 8, 107},
+ { /* left mode 4 */ 104, 79, 12, 27, 217, 255, 87, 17, 7},
+ { /* left mode 5 */ 74, 43, 26, 146, 73, 166, 49, 23, 157},
+ { /* left mode 6 */ 65, 38, 105, 160, 51, 52, 31, 115, 128},
+ { /* left mode 7 */ 87, 68, 71, 44, 114, 51, 15, 186, 23},
+ { /* left mode 8 */ 47, 41, 14, 110, 182, 183, 21, 17, 194},
+ { /* left mode 9 */ 66, 45, 25, 102, 197, 189, 23, 18, 22}
+ },
+ { /* above mode 2 */
+ { /* left mode 0 */ 88, 88, 147, 150, 42, 46, 45, 196, 205},
+ { /* left mode 1 */ 43, 97, 183, 117, 85, 38, 35, 179, 61},
+ { /* left mode 2 */ 39, 53, 200, 87, 26, 21, 43, 232, 171},
+ { /* left mode 3 */ 56, 34, 51, 104, 114, 102, 29, 93, 77},
+ { /* left mode 4 */ 107, 54, 32, 26, 51, 1, 81, 43, 31},
+ { /* left mode 5 */ 39, 28, 85, 171, 58, 165, 90, 98, 64},
+ { /* left mode 6 */ 34, 22, 116, 206, 23, 34, 43, 166, 73},
+ { /* left mode 7 */ 68, 25, 106, 22, 64, 171, 36, 225, 114},
+ { /* left mode 8 */ 34, 19, 21, 102, 132, 188, 16, 76, 124},
+ { /* left mode 9 */ 62, 18, 78, 95, 85, 57, 50, 48, 51}
+ },
+ { /* above mode 3 */
+ { /* left mode 0 */ 193, 101, 35, 159, 215, 111, 89, 46, 111},
+ { /* left mode 1 */ 60, 148, 31, 172, 219, 228, 21, 18, 111},
+ { /* left mode 2 */ 112, 113, 77, 85, 179, 255, 38, 120, 114},
+ { /* left mode 3 */ 40, 42, 1, 196, 245, 209, 10, 25, 109},
+ { /* left mode 4 */ 100, 80, 8, 43, 154, 1, 51, 26, 71},
+ { /* left mode 5 */ 88, 43, 29, 140, 166, 213, 37, 43, 154},
+ { /* left mode 6 */ 61, 63, 30, 155, 67, 45, 68, 1, 209},
+ { /* left mode 7 */ 142, 78, 78, 16, 255, 128, 34, 197, 171},
+ { /* left mode 8 */ 41, 40, 5, 102, 211, 183, 4, 1, 221},
+ { /* left mode 9 */ 51, 50, 17, 168, 209, 192, 23, 25, 82}
+ },
+ { /* above mode 4 */
+ { /* left mode 0 */ 125, 98, 42, 88, 104, 85, 117, 175, 82},
+ { /* left mode 1 */ 95, 84, 53, 89, 128, 100, 113, 101, 45},
+ { /* left mode 2 */ 75, 79, 123, 47, 51, 128, 81, 171, 1},
+ { /* left mode 3 */ 57, 17, 5, 71, 102, 57, 53, 41, 49},
+ { /* left mode 4 */ 115, 21, 2, 10, 102, 255, 166, 23, 6},
+ { /* left mode 5 */ 38, 33, 13, 121, 57, 73, 26, 1, 85},
+ { /* left mode 6 */ 41, 10, 67, 138, 77, 110, 90, 47, 114},
+ { /* left mode 7 */ 101, 29, 16, 10, 85, 128, 101, 196, 26},
+ { /* left mode 8 */ 57, 18, 10, 102, 102, 213, 34, 20, 43},
+ { /* left mode 9 */ 117, 20, 15, 36, 163, 128, 68, 1, 26}
+ },
+ { /* above mode 5 */
+ { /* left mode 0 */ 138, 31, 36, 171, 27, 166, 38, 44, 229},
+ { /* left mode 1 */ 67, 87, 58, 169, 82, 115, 26, 59, 179},
+ { /* left mode 2 */ 63, 59, 90, 180, 59, 166, 93, 73, 154},
+ { /* left mode 3 */ 40, 40, 21, 116, 143, 209, 34, 39, 175},
+ { /* left mode 4 */ 57, 46, 22, 24, 128, 1, 54, 17, 37},
+ { /* left mode 5 */ 47, 15, 16, 183, 34, 223, 49, 45, 183},
+ { /* left mode 6 */ 46, 17, 33, 183, 6, 98, 15, 32, 183},
+ { /* left mode 7 */ 65, 32, 73, 115, 28, 128, 23, 128, 205},
+ { /* left mode 8 */ 40, 3, 9, 115, 51, 192, 18, 6, 223},
+ { /* left mode 9 */ 87, 37, 9, 115, 59, 77, 64, 21, 47}
+ },
+ { /* above mode 6 */
+ { /* left mode 0 */ 104, 55, 44, 218, 9, 54, 53, 130, 226},
+ { /* left mode 1 */ 64, 90, 70, 205, 40, 41, 23, 26, 57},
+ { /* left mode 2 */ 54, 57, 112, 184, 5, 41, 38, 166, 213},
+ { /* left mode 3 */ 30, 34, 26, 133, 152, 116, 10, 32, 134},
+ { /* left mode 4 */ 75, 32, 12, 51, 192, 255, 160, 43, 51},
+ { /* left mode 5 */ 39, 19, 53, 221, 26, 114, 32, 73, 255},
+ { /* left mode 6 */ 31, 9, 65, 234, 2, 15, 1, 118, 73},
+ { /* left mode 7 */ 88, 31, 35, 67, 102, 85, 55, 186, 85},
+ { /* left mode 8 */ 56, 21, 23, 111, 59, 205, 45, 37, 192},
+ { /* left mode 9 */ 55, 38, 70, 124, 73, 102, 1, 34, 98}
+ },
+ { /* above mode 7 */
+ { /* left mode 0 */ 102, 61, 71, 37, 34, 53, 31, 243, 192},
+ { /* left mode 1 */ 69, 60, 71, 38, 73, 119, 28, 222, 37},
+ { /* left mode 2 */ 68, 45, 128, 34, 1, 47, 11, 245, 171},
+ { /* left mode 3 */ 62, 17, 19, 70, 146, 85, 55, 62, 70},
+ { /* left mode 4 */ 75, 15, 9, 9, 64, 255, 184, 119, 16},
+ { /* left mode 5 */ 37, 43, 37, 154, 100, 163, 85, 160, 1},
+ { /* left mode 6 */ 63, 9, 92, 136, 28, 64, 32, 201, 85},
+ { /* left mode 7 */ 86, 6, 28, 5, 64, 255, 25, 248, 1},
+ { /* left mode 8 */ 56, 8, 17, 132, 137, 255, 55, 116, 128},
+ { /* left mode 9 */ 58, 15, 20, 82, 135, 57, 26, 121, 40}
+ },
+ { /* above mode 8 */
+ { /* left mode 0 */ 164, 50, 31, 137, 154, 133, 25, 35, 218},
+ { /* left mode 1 */ 51, 103, 44, 131, 131, 123, 31, 6, 158},
+ { /* left mode 2 */ 86, 40, 64, 135, 148, 224, 45, 183, 128},
+ { /* left mode 3 */ 22, 26, 17, 131, 240, 154, 14, 1, 209},
+ { /* left mode 4 */ 83, 12, 13, 54, 192, 255, 68, 47, 28},
+ { /* left mode 5 */ 45, 16, 21, 91, 64, 222, 7, 1, 197},
+ { /* left mode 6 */ 56, 21, 39, 155, 60, 138, 23, 102, 213},
+ { /* left mode 7 */ 85, 26, 85, 85, 128, 128, 32, 146, 171},
+ { /* left mode 8 */ 18, 11, 7, 63, 144, 171, 4, 4, 246},
+ { /* left mode 9 */ 35, 27, 10, 146, 174, 171, 12, 26, 128}
+ },
+ { /* above mode 9 */
+ { /* left mode 0 */ 190, 80, 35, 99, 180, 80, 126, 54, 45},
+ { /* left mode 1 */ 85, 126, 47, 87, 176, 51, 41, 20, 32},
+ { /* left mode 2 */ 101, 75, 128, 139, 118, 146, 116, 128, 85},
+ { /* left mode 3 */ 56, 41, 15, 176, 236, 85, 37, 9, 62},
+ { /* left mode 4 */ 146, 36, 19, 30, 171, 255, 97, 27, 20},
+ { /* left mode 5 */ 71, 30, 17, 119, 118, 255, 17, 18, 138},
+ { /* left mode 6 */ 101, 38, 60, 138, 55, 70, 43, 26, 142},
+ { /* left mode 7 */ 138, 45, 61, 62, 219, 1, 81, 188, 64},
+ { /* left mode 8 */ 32, 41, 20, 117, 151, 142, 20, 21, 163},
+ { /* left mode 9 */ 112, 19, 12, 61, 195, 128, 48, 4, 24}
+ }
};
static const int kf_y_mode_tree[] =
{
- -B_PRED, 2,
- 4, 6,
- -DC_PRED, -V_PRED,
- -H_PRED, -TM_PRED
+ -B_PRED, 2,
+ 4, 6,
+ -DC_PRED, -V_PRED,
+ -H_PRED, -TM_PRED
};
static const int y_mode_tree[] =
{
- -DC_PRED, 2,
- 4, 6,
- -V_PRED, -H_PRED,
- -TM_PRED, -B_PRED
+ -DC_PRED, 2,
+ 4, 6,
+ -V_PRED, -H_PRED,
+ -TM_PRED, -B_PRED
};
static const int uv_mode_tree[6] =
{
- -DC_PRED, 2,
- -V_PRED, 4,
- -H_PRED, -TM_PRED
+ -DC_PRED, 2,
+ -V_PRED, 4,
+ -H_PRED, -TM_PRED
};
static const int b_mode_tree[18] =
{
- -B_DC_PRED, 2, /* 0 = DC_NODE */
- -B_TM_PRED, 4, /* 1 = TM_NODE */
- -B_VE_PRED, 6, /* 2 = VE_NODE */
- 8, 12, /* 3 = COM_NODE */
- -B_HE_PRED, 10, /* 4 = HE_NODE */
- -B_RD_PRED, -B_VR_PRED, /* 5 = RD_NODE */
- -B_LD_PRED, 14, /* 6 = LD_NODE */
- -B_VL_PRED, 16, /* 7 = VL_NODE */
- -B_HD_PRED, -B_HU_PRED /* 8 = HD_NODE */
+ -B_DC_PRED, 2, /* 0 = DC_NODE */
+ -B_TM_PRED, 4, /* 1 = TM_NODE */
+ -B_VE_PRED, 6, /* 2 = VE_NODE */
+ 8, 12, /* 3 = COM_NODE */
+ -B_HE_PRED, 10, /* 4 = HE_NODE */
+ -B_RD_PRED, -B_VR_PRED, /* 5 = RD_NODE */
+ -B_LD_PRED, 14, /* 6 = LD_NODE */
+ -B_VL_PRED, 16, /* 7 = VL_NODE */
+ -B_HD_PRED, -B_HU_PRED /* 8 = HD_NODE */
};
static const int small_mv_tree[14] =
{
- 2, 8,
- 4, 6,
- -0, -1,
- -2, -3,
- 10, 12,
- -4, -5,
- -6, -7
+ 2, 8,
+ 4, 6,
+ -0, -1,
+ -2, -3,
+ 10, 12,
+ -4, -5,
+ -6, -7
};
static const int mv_ref_tree[8] =
{
- -ZEROMV, 2,
- -NEARESTMV, 4,
- -NEARMV, 6,
- -NEWMV, -SPLITMV
+ -ZEROMV, 2,
+ -NEARESTMV, 4,
+ -NEARMV, 6,
+ -NEWMV, -SPLITMV
};
static const int submv_ref_tree[6] =
{
- -LEFT4X4, 2,
- -ABOVE4X4, 4,
- -ZERO4X4, -NEW4X4
+ -LEFT4X4, 2,
+ -ABOVE4X4, 4,
+ -ZERO4X4, -NEW4X4
};
static const int split_mv_tree[6] =
{
- -3, 2,
- -2, 4,
- -0, -1
+ -3, 2,
+ -2, 4,
+ -0, -1
};
static const unsigned char default_b_mode_probs[] =
{ 120, 90, 79, 133, 87, 85, 80, 111, 151};
static const unsigned char mv_counts_to_probs[6][4] =
{
- { 7, 1, 1, 143 },
- { 14, 18, 14, 107 },
- { 135, 64, 57, 68 },
- { 60, 56, 128, 65 },
- { 159, 134, 128, 34 },
- { 234, 188, 128, 28 }
+ { 7, 1, 1, 143 },
+ { 14, 18, 14, 107 },
+ { 135, 64, 57, 68 },
+ { 60, 56, 128, 65 },
+ { 159, 134, 128, 34 },
+ { 234, 188, 128, 28 }
};
static const unsigned char split_mv_probs[3] =
{ 110, 111, 150};
static const unsigned char submv_ref_probs2[5][3] =
{
- { 147, 136, 18 },
- { 106, 145, 1 },
- { 179, 121, 1 },
- { 223, 1, 34 },
- { 208, 1, 1 }
+ { 147, 136, 18 },
+ { 106, 145, 1 },
+ { 179, 121, 1 },
+ { 223, 1, 34 },
+ { 208, 1, 1 }
};
const static int mv_partitions[4][16] =
{
- {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 },
- {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1 },
- {0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3 },
- {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }
+ {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1 },
+ {0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1 },
+ {0, 0, 1, 1, 0, 0, 1, 1, 2, 2, 3, 3, 2, 2, 3, 3 },
+ {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }
};
diff --git a/vp8/dixie/predict.c b/vp8/dixie/predict.c
index 9e6fb62..74fe020 100644
--- a/vp8/dixie/predict.c
+++ b/vp8/dixie/predict.c
@@ -23,13 +23,13 @@
static const filter_t sixtap_filters[8] =
{
- { 0, 0, 128, 0, 0, 0 }, // note that 1/8 pel positions are just as per alpha -0.5 bicubic
+ { 0, 0, 128, 0, 0, 0 },
{ 0, -6, 123, 12, -1, 0 },
- { 2, -11, 108, 36, -8, 1 }, // New 1/4 pel 6 tap filter
+ { 2, -11, 108, 36, -8, 1 },
{ 0, -9, 93, 50, -6, 0 },
- { 3, -16, 77, 77, -16, 3 }, // New 1/2 pel 6 tap filter
+ { 3, -16, 77, 77, -16, 3 },
{ 0, -6, 50, 93, -9, 0 },
- { 1, -8, 36, 108, -11, 2 }, // New 1/4 pel 6 tap filter
+ { 1, -8, 36, 108, -11, 2 },
{ 0, -1, 12, 123, -6, 0 },
};
@@ -58,7 +58,7 @@
for (i = 0; i < n; i++)
for (j = 0; j < n; j++)
- predict[i * stride + j] = left[i * stride];
+ predict[i *stride + j] = left[i * stride];
}
@@ -72,7 +72,7 @@
for (i = 0; i < n; i++)
for (j = 0; j < n; j++)
- predict[i * stride + j] = above[j];
+ predict[i *stride + j] = above[j];
}
@@ -114,15 +114,22 @@
left += stride;
}
- switch(n)
+ switch (n)
{
- case 16: dc = (dc + 16) >> 5; break;
- case 8: dc = (dc + 8) >> 4; break;
- case 4: dc = (dc + 4) >> 3; break;
+ case 16:
+ dc = (dc + 16) >> 5;
+ break;
+ case 8:
+ dc = (dc + 8) >> 4;
+ break;
+ case 4:
+ dc = (dc + 4) >> 3;
+ break;
}
+
for (i = 0; i < n; i++)
for (j = 0; j < n; j++)
- predict[i * stride + j] = dc;
+ predict[i *stride + j] = dc;
}
@@ -138,9 +145,9 @@
predict[2] = (above[ 1] + 2 * above[2] + above[3] + 2) >> 2;
predict[3] = (above[ 2] + 2 * above[3] + above[4] + 2) >> 2;
- for(i = 1; i < 4; i++)
- for(j = 0; j < 4; j++)
- predict[i * stride + j] = predict[j];
+ for (i = 1; i < 4; i++)
+ for (j = 0; j < 4; j++)
+ predict[i *stride + j] = predict[j];
}
@@ -218,25 +225,32 @@
unsigned char *above = predict - stride;
int pred0, pred1, pred2, pred3, pred4, pred5, pred6;
- predict[0] = pred0 = (left[ 0] + 2 * above[-1] + above[0] + 2) >> 2;
- predict[1] = pred1 = (above[-1] + 2 * above[ 0] + above[1] + 2) >> 2;
- predict[2] = pred2 = (above[ 0] + 2 * above[ 1] + above[2] + 2) >> 2;
- predict[3] = pred3 = (above[ 1] + 2 * above[ 2] + above[3] + 2) >> 2;
+ predict[0] = pred0 =
+ (left[ 0] + 2 * above[-1] + above[0] + 2) >> 2;
+ predict[1] = pred1 =
+ (above[-1] + 2 * above[ 0] + above[1] + 2) >> 2;
+ predict[2] = pred2 =
+ (above[ 0] + 2 * above[ 1] + above[2] + 2) >> 2;
+ predict[3] = pred3 =
+ (above[ 1] + 2 * above[ 2] + above[3] + 2) >> 2;
predict += stride;
- predict[0] = pred4 = (left[stride] + 2 * left[0] + above[-1] + 2) >> 2;
+ predict[0] = pred4 =
+ (left[stride] + 2 * left[0] + above[-1] + 2) >> 2;
predict[1] = pred0;
predict[2] = pred1;
predict[3] = pred2;
predict += stride;
- predict[0] = pred5 = (left[stride*2] + 2 * left[stride] + left[0] + 2) >> 2;
+ predict[0] = pred5 =
+ (left[stride*2] + 2 * left[stride] + left[0] + 2) >> 2;
predict[1] = pred4;
predict[2] = pred0;
predict[3] = pred1;
predict += stride;
- predict[0] = pred6 = (left[stride*3] + 2 * left[stride*2] + left[stride] + 2) >> 2;
+ predict[0] = pred6 =
+ (left[stride*3] + 2 * left[stride*2] + left[stride] + 2) >> 2;
predict[1] = pred5;
predict[2] = pred4;
predict[3] = pred0;
@@ -249,8 +263,8 @@
{
unsigned char *left = predict - 1;
unsigned char *above = predict - stride;
- int pred0, pred1, pred2, pred3, pred4, pred5, pred6, pred7,
- pred8, pred9;
+ int pred0, pred1, pred2, pred3, pred4, pred5, pred6,
+ pred7, pred8, pred9;
predict[0] = pred0 = (above[-1] + above[0] + 1) >> 1;
predict[1] = pred1 = (above[ 0] + above[1] + 1) >> 1;
@@ -258,19 +272,25 @@
predict[3] = pred3 = (above[ 2] + above[3] + 1) >> 1;
predict += stride;
- predict[0] = pred4 = (left[ 0] + 2 * above[-1] + above[0] + 2) >> 2;
- predict[1] = pred5 = (above[-1] + 2 * above[ 0] + above[1] + 2) >> 2;
- predict[2] = pred6 = (above[ 0] + 2 * above[ 1] + above[2] + 2) >> 2;
- predict[3] = pred7 = (above[ 1] + 2 * above[ 2] + above[3] + 2) >> 2;
+ predict[0] = pred4 =
+ (left[ 0] + 2 * above[-1] + above[0] + 2) >> 2;
+ predict[1] = pred5 =
+ (above[-1] + 2 * above[ 0] + above[1] + 2) >> 2;
+ predict[2] = pred6 =
+ (above[ 0] + 2 * above[ 1] + above[2] + 2) >> 2;
+ predict[3] = pred7 =
+ (above[ 1] + 2 * above[ 2] + above[3] + 2) >> 2;
predict += stride;
- predict[0] = pred8 = (left[stride] + 2 * left[0] + above[-1] + 2) >> 2;
+ predict[0] = pred8 =
+ (left[stride] + 2 * left[0] + above[-1] + 2) >> 2;
predict[1] = pred0;
predict[2] = pred1;
predict[3] = pred2;
predict += stride;
- predict[0] = pred9 = (left[stride*2] + 2 * left[stride] + left[0] + 2) >> 2;
+ predict[0] = pred9 =
+ (left[stride*2] + 2 * left[stride] + left[0] + 2) >> 2;
predict[1] = pred4;
predict[2] = pred5;
predict[3] = pred6;
@@ -282,8 +302,8 @@
int stride)
{
unsigned char *above = predict - stride;
- int pred0, pred1, pred2, pred3, pred4, pred5, pred6, pred7,
- pred8, pred9;
+ int pred0, pred1, pred2, pred3, pred4, pred5, pred6,
+ pred7, pred8, pred9;
predict[0] = pred0 = (above[0] + above[1] + 1) >> 1;
predict[1] = pred1 = (above[1] + above[2] + 1) >> 1;
@@ -291,10 +311,14 @@
predict[3] = pred3 = (above[3] + above[4] + 1) >> 1;
predict += stride;
- predict[0] = pred4 = (above[0] + 2 * above[1] + above[2] + 2) >> 2;
- predict[1] = pred5 = (above[1] + 2 * above[2] + above[3] + 2) >> 2;
- predict[2] = pred6 = (above[2] + 2 * above[3] + above[4] + 2) >> 2;
- predict[3] = pred7 = (above[3] + 2 * above[4] + above[5] + 2) >> 2;
+ predict[0] = pred4 =
+ (above[0] + 2 * above[1] + above[2] + 2) >> 2;
+ predict[1] = pred5 =
+ (above[1] + 2 * above[2] + above[3] + 2) >> 2;
+ predict[2] = pred6 =
+ (above[2] + 2 * above[3] + above[4] + 2) >> 2;
+ predict[3] = pred7 =
+ (above[3] + 2 * above[4] + above[5] + 2) >> 2;
predict += stride;
predict[0] = pred1;
@@ -316,29 +340,39 @@
{
unsigned char *left = predict - 1;
unsigned char *above = predict - stride;
- int pred0, pred1, pred2, pred3, pred4, pred5, pred6, pred7,
- pred8, pred9;
+ int pred0, pred1, pred2, pred3, pred4, pred5, pred6,
+ pred7, pred8, pred9;
- predict[0] = pred0 = (left[ 0] + above[-1] + 1) >> 1;
- predict[1] = pred1 = (left[ 0] + 2 * above[-1] + above[0] + 2) >> 2;
- predict[2] = pred2 = (above[-1] + 2 * above[ 0] + above[1] + 2) >> 2;
- predict[3] = pred3 = (above[ 0] + 2 * above[ 1] + above[2] + 2) >> 2;
+ predict[0] = pred0 =
+ (left[ 0] + above[-1] + 1) >> 1;
+ predict[1] = pred1 =
+ (left[ 0] + 2 * above[-1] + above[0] + 2) >> 2;
+ predict[2] = pred2 =
+ (above[-1] + 2 * above[ 0] + above[1] + 2) >> 2;
+ predict[3] = pred3 =
+ (above[ 0] + 2 * above[ 1] + above[2] + 2) >> 2;
predict += stride;
- predict[0] = pred4 = (left[stride] + left[0] + 1) >> 1;
- predict[1] = pred5 = (left[stride] + 2 * left[0] + above[-1] + 2) >> 2;
+ predict[0] = pred4 =
+ (left[stride] + left[0] + 1) >> 1;
+ predict[1] = pred5 =
+ (left[stride] + 2 * left[0] + above[-1] + 2) >> 2;
predict[2] = pred0;
predict[3] = pred1;
predict += stride;
- predict[0] = pred6 = (left[stride*2] + left[stride] + 1) >> 1;
- predict[1] = pred7 = (left[stride*2] + 2 * left[stride] + left[0] + 2) >> 2;
+ predict[0] = pred6 =
+ (left[stride*2] + left[stride] + 1) >> 1;
+ predict[1] = pred7 =
+ (left[stride*2] + 2 * left[stride] + left[0] + 2) >> 2;
predict[2] = pred4;
predict[3] = pred5;
predict += stride;
- predict[0] = pred8 = (left[stride*3] + left[stride*2] + 1) >> 1;
- predict[1] = pred9 = (left[stride*3] + 2 * left[stride*2] + left[stride] + 2) >> 2;
+ predict[0] = pred8 =
+ (left[stride*3] + left[stride*2] + 1) >> 1;
+ predict[1] = pred9 =
+ (left[stride*3] + 2 * left[stride*2] + left[stride] + 2) >> 2;
predict[2] = pred6;
predict[3] = pred7;
}
@@ -351,16 +385,22 @@
unsigned char *left = predict - 1;
int pred0, pred1, pred2, pred3, pred4, pred5, pred6;
- predict[0] = pred0 = (left[stride*0] + left[stride*1] + 1) >> 1;
- predict[1] = pred1 = (left[stride*0] + 2 * left[stride*1] + left[stride*2] + 2) >> 2;
- predict[2] = pred2 = (left[stride*1] + left[stride*2] + 1) >> 1;
- predict[3] = pred3 = (left[stride*1] + 2 * left[stride*2] + left[stride*3] + 2) >> 2;
+ predict[0] = pred0 =
+ (left[stride*0] + left[stride*1] + 1) >> 1;
+ predict[1] = pred1 =
+ (left[stride*0] + 2 * left[stride*1] + left[stride*2] + 2) >> 2;
+ predict[2] = pred2 =
+ (left[stride*1] + left[stride*2] + 1) >> 1;
+ predict[3] = pred3 =
+ (left[stride*1] + 2 * left[stride*2] + left[stride*3] + 2) >> 2;
predict += stride;
predict[0] = pred2;
predict[1] = pred3;
- predict[2] = pred4 = (left[stride*2] + left[stride*3] + 1) >> 1;
- predict[3] = pred5 = (left[stride*2] + 2 * left[stride*3] + left[stride*3] + 2) >> 2;
+ predict[2] = pred4 =
+ (left[stride*2] + left[stride*3] + 1) >> 1;
+ predict[3] = pred5 =
+ (left[stride*2] + 2 * left[stride*3] + left[stride*3] + 2) >> 2;
predict += stride;
predict[0] = pred4;
@@ -700,7 +740,7 @@
int mx,
int my,
const filter_t filters[8]
- )
+ )
{
DECLARE_ALIGNED(16, unsigned char, temp[16*(16+5)]);
@@ -729,7 +769,9 @@
{
int mx, my;
- /* Handle 0,0 as a special case. TODO: does this make it any faster? */
+ /* Handle 0,0 as a special case. TODO: does this make it any
+ * faster?
+ */
if (!mv->raw)
return reference;
@@ -739,7 +781,8 @@
if (mx | my)
{
- sixtap_2d(output, stride, reference, stride, 4, 4, mx, my, filters);
+ sixtap_2d(output, stride, reference, stride, 4, 4, mx, my,
+ filters);
reference = output;
}
@@ -807,9 +850,9 @@
}
-/* Note: We rely on the reconstructed border having the same stride as the
- * reference buffer because the filter_block can't adjust the stride with
- * its return value, only the reference pointer.
+/* Note: We rely on the reconstructed border having the same stride as
+ * the reference buffer because the filter_block can't adjust the
+ * stride with its return value, only the reference pointer.
*/
static void
build_mc_border(unsigned char *dst,
@@ -946,12 +989,13 @@
uvmv = mbi->base.mv;
uvmv.d.x = (uvmv.d.x + 1 + (uvmv.d.x >> 31) * 2) / 2;
uvmv.d.y = (uvmv.d.y + 1 + (uvmv.d.y >> 31) * 2) / 2;
+
if (full_pixel)
{
uvmv.d.x &= ~7;
uvmv.d.y &= ~7;
}
-
+
chroma_mv[0] = uvmv;
chroma_mv[1] = uvmv;
chroma_mv[2] = uvmv;
@@ -971,7 +1015,7 @@
{
union mv *ymv;
- if(mbi->base.y_mode != SPLITMV)
+ if (mbi->base.y_mode != SPLITMV)
ymv = &mbi->base.mv;
else
ymv = mbi->split.mvs + b;
@@ -1056,9 +1100,9 @@
}
chroma_mv[0] =
- chroma_mv[1] =
- chroma_mv[2] =
- chroma_mv[3] = uvmv;
+ chroma_mv[1] =
+ chroma_mv[2] =
+ chroma_mv[3] = uvmv;
}
else
{
@@ -1070,11 +1114,11 @@
reference_offset = ctx->ref_frame_offsets[mbi->base.ref_frame];
- for (b=0; b < 16; b++)
+ for (b = 0; b < 16; b++)
{
union mv *ymv;
- if(mbi->base.y_mode != SPLITMV)
+ if (mbi->base.y_mode != SPLITMV)
ymv = &mbi->base.mv;
else
ymv = mbi->split.mvs + b;
@@ -1083,6 +1127,7 @@
recon_1_block(y, y + reference_offset, img->stride,
ymv, ctx->subpixel_filters, coeffs, mbi, b);
y += 4;
+
if ((b & 3) == 3)
y += 4 * img->stride - 16;
}
@@ -1240,7 +1285,8 @@
if (!vpx_img_alloc(&ctx->frame_strg[i].img,
IMG_FMT_I420, w, h, 16))
vpx_internal_error(&ctx->error, VPX_CODEC_MEM_ERROR,
- "Failed to allocate %dx%d framebuffer",
+ "Failed to allocate %dx%d"
+ " framebuffer",
w, h);
vpx_img_set_rect(&ctx->frame_strg[i].img,
@@ -1249,9 +1295,9 @@
}
- if(ctx->frame_hdr.version)
+ if (ctx->frame_hdr.version)
ctx->subpixel_filters = bilinear_filters;
- else
+ else
ctx->subpixel_filters = sixtap_filters;
}
@@ -1268,8 +1314,8 @@
{
struct ref_cnt_img *ref = ctx->ref_frames[i];
- ctx->ref_frame_offsets[i] = ref ? ref->img.img_data - this_frame_base
- : 0;
+ ctx->ref_frame_offsets[i] =
+ ref ? ref->img.img_data - this_frame_base : 0;
}
/* TODO: No need to do this on every frame... */
@@ -1330,14 +1376,17 @@
if (row == 0)
{
fixup_above(img.y, 16, img.stride, col, mbi->base.y_mode);
- fixup_above(img.u, 8, img.uv_stride, col, mbi->base.uv_mode);
- fixup_above(img.v, 8, img.uv_stride, col, mbi->base.uv_mode);
+ fixup_above(img.u, 8, img.uv_stride, col,
+ mbi->base.uv_mode);
+ fixup_above(img.v, 8, img.uv_stride, col,
+ mbi->base.uv_mode);
}
if (mbi->base.y_mode <= B_PRED)
{
predict_intra_luma(img.y, img.stride, mbi, coeffs);
- predict_intra_chroma(img.u, img.v, img.uv_stride, mbi, coeffs);
+ predict_intra_chroma(img.u, img.v, img.uv_stride, mbi,
+ coeffs);
}
else
{
@@ -1345,7 +1394,8 @@
fixup_dc_coeffs(mbi, coeffs);
if (mbi->base.need_mc_border)
- predict_inter_emulated_edge(ctx, &img, coeffs, mbi, col, row);
+ predict_inter_emulated_edge(ctx, &img, coeffs, mbi, col,
+ row);
else
predict_inter(ctx, &img, coeffs, mbi);
}
@@ -1360,8 +1410,8 @@
if (col == ctx->mb_cols)
{
- /* Extend the last row by four pixels for intra prediction. This will
- * be propagated later by copy_down.
+ /* Extend the last row by four pixels for intra prediction.
+ * This will be propagated later by copy_down.
*/
uint32_t *extend = (uint32_t *)(img.y + 15 * img.stride);
uint32_t val = 0x01010101 * img.y[-1 + 15 * img.stride];
diff --git a/vp8/dixie/tokens.c b/vp8/dixie/tokens.c
index 89f1a3e..2b095d6 100644
--- a/vp8/dixie/tokens.c
+++ b/vp8/dixie/tokens.c
@@ -53,11 +53,13 @@
};
static const unsigned int left_context_index[25] =
{
- 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8
+ 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3,
+ 4, 4, 5, 5, 6, 6, 7, 7, 8
};
static const unsigned int above_context_index[25] =
{
- 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8
+ 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3,
+ 4, 5, 4, 5, 6, 7, 6, 7, 8
};
#define X(n) ((n) * PREV_COEF_CONTEXTS * ENTROPY_NODES)
static const unsigned int bands_x[16] =
@@ -68,18 +70,30 @@
#undef X
static const struct extrabits extrabits[MAX_ENTROPY_TOKENS] =
{
- { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, //ZERO_TOKEN
- { 1, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, //ONE_TOKEN
- { 2, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, //TWO_TOKEN
- { 3, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, //THREE_TOKEN
- { 4, 0, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, //FOUR_TOKEN
- { 5, 0, { 159, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY1
- { 7, 1, { 145, 165, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY2
- { 11, 2, { 140, 148, 173, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY3
- { 19, 3, { 135, 140, 155, 176, 0, 0, 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY4
- { 35, 4, { 130, 134, 141, 157, 180, 0, 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY5
- { 67, 10, { 129, 130, 133, 140, 153, 177, 196, 230, 243, 254, 254, 0 } }, //DCT_VAL_CATEGORY6
- { 0, -1, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, // EOB TOKEN
+ { 0, -1, { 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //ZERO_TOKEN
+ { 1, 0, { 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //ONE_TOKEN
+ { 2, 0, { 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //TWO_TOKEN
+ { 3, 0, { 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //THREE_TOKEN
+ { 4, 0, { 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //FOUR_TOKEN
+ { 5, 0, { 159, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY1
+ { 7, 1, { 145, 165, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY2
+ { 11, 2, { 140, 148, 173, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY3
+ { 19, 3, { 135, 140, 155, 176, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY4
+ { 35, 4, { 130, 134, 141, 157, 180, 0,
+ 0, 0, 0, 0, 0, 0 } }, //DCT_VAL_CATEGORY5
+ { 67, 10, { 129, 130, 133, 140, 153, 177,
+ 196, 230, 243, 254, 254, 0 } }, //DCT_VAL_CATEGORY6
+ { 0, -1, { 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0 } }, // EOB TOKEN
};
static const unsigned int zigzag[16] =
{
@@ -87,7 +101,8 @@
};
#define DECODE_AND_APPLYSIGN(value_to_sign) \
- v = (bool_get_bit(bool) ? -value_to_sign : value_to_sign) * dqf[!!c];
+ v = (bool_get_bit(bool) ? -value_to_sign \
+ : value_to_sign) * dqf[!!c];
#define DECODE_AND_BRANCH_IF_ZERO(probability,branch) \
if (!bool_get(bool, probability)) goto branch;
@@ -157,14 +172,15 @@
dqf = factor[TOKEN_BLOCK_Y1];
}
- /* Save a pointer to the coefficient probs for the current type. Need
- * to repeat this whenever type changes.
+ /* Save a pointer to the coefficient probs for the current type.
+ * Need to repeat this whenever type changes.
*/
type_probs = probs[type][0][0];
BLOCK_LOOP:
t = left[left_context_index[i]] + above[above_context_index[i]];
- c = !type; /* all blocks start at 0 except type 0, which starts at 1. */
+ c = !type; /* all blocks start at 0 except type 0, which starts
+ * at 1. */
prob = type_probs;
prob += t * ENTROPY_NODES;
@@ -175,11 +191,16 @@
CHECK_0_:
DECODE_AND_LOOP_IF_ZERO(prob[ZERO_CONTEXT_NODE], CHECK_0_);
- DECODE_AND_BRANCH_IF_ZERO(prob[ONE_CONTEXT_NODE], ONE_CONTEXT_NODE_0_);
- DECODE_AND_BRANCH_IF_ZERO(prob[LOW_VAL_CONTEXT_NODE], LOW_VAL_CONTEXT_NODE_0_);
- DECODE_AND_BRANCH_IF_ZERO(prob[HIGH_LOW_CONTEXT_NODE], HIGH_LOW_CONTEXT_NODE_0_);
- DECODE_AND_BRANCH_IF_ZERO(prob[CAT_THREEFOUR_CONTEXT_NODE], CAT_THREEFOUR_CONTEXT_NODE_0_);
- DECODE_AND_BRANCH_IF_ZERO(prob[CAT_FIVE_CONTEXT_NODE], CAT_FIVE_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[ONE_CONTEXT_NODE],
+ ONE_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[LOW_VAL_CONTEXT_NODE],
+ LOW_VAL_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[HIGH_LOW_CONTEXT_NODE],
+ HIGH_LOW_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[CAT_THREEFOUR_CONTEXT_NODE],
+ CAT_THREEFOUR_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[CAT_FIVE_CONTEXT_NODE],
+ CAT_FIVE_CONTEXT_NODE_0_);
val = extrabits[DCT_VAL_CATEGORY6].min_val;
bits_count = extrabits[DCT_VAL_CATEGORY6].length;
@@ -202,7 +223,8 @@
DECODE_SIGN_WRITE_COEFF_AND_CHECK_EXIT(val);
CAT_THREEFOUR_CONTEXT_NODE_0_:
- DECODE_AND_BRANCH_IF_ZERO(prob[CAT_THREE_CONTEXT_NODE], CAT_THREE_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[CAT_THREE_CONTEXT_NODE],
+ CAT_THREE_CONTEXT_NODE_0_);
val = extrabits[DCT_VAL_CATEGORY4].min_val;
DECODE_EXTRABIT_AND_ADJUST_VAL(DCT_VAL_CATEGORY4, 3);
DECODE_EXTRABIT_AND_ADJUST_VAL(DCT_VAL_CATEGORY4, 2);
@@ -218,7 +240,8 @@
DECODE_SIGN_WRITE_COEFF_AND_CHECK_EXIT(val);
HIGH_LOW_CONTEXT_NODE_0_:
- DECODE_AND_BRANCH_IF_ZERO(prob[CAT_ONE_CONTEXT_NODE], CAT_ONE_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[CAT_ONE_CONTEXT_NODE],
+ CAT_ONE_CONTEXT_NODE_0_);
val = extrabits[DCT_VAL_CATEGORY2].min_val;
DECODE_EXTRABIT_AND_ADJUST_VAL(DCT_VAL_CATEGORY2, 1);
@@ -231,8 +254,10 @@
DECODE_SIGN_WRITE_COEFF_AND_CHECK_EXIT(val);
LOW_VAL_CONTEXT_NODE_0_:
- DECODE_AND_BRANCH_IF_ZERO(prob[TWO_CONTEXT_NODE], TWO_CONTEXT_NODE_0_);
- DECODE_AND_BRANCH_IF_ZERO(prob[THREE_CONTEXT_NODE], THREE_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[TWO_CONTEXT_NODE],
+ TWO_CONTEXT_NODE_0_);
+ DECODE_AND_BRANCH_IF_ZERO(prob[THREE_CONTEXT_NODE],
+ THREE_CONTEXT_NODE_0_);
DECODE_SIGN_WRITE_COEFF_AND_CHECK_EXIT(4);
THREE_CONTEXT_NODE_0_:
@@ -309,9 +334,9 @@
token_entropy_ctx_t *above,
enum prediction_mode mode)
{
- /* Reset the macroblock context on the left and right. We have to preserve
- * the context of the second order block if this mode would not have
- * updated it.
+ /* Reset the macroblock context on the left and right. We have to
+ * preserve the context of the second order block if this mode
+ * would not have updated it.
*/
memset(left, 0, sizeof((*left)[0]) * 8);
memset(above, 0, sizeof((*above)[0]) * 8);
@@ -334,7 +359,8 @@
struct token_decoder *tokens = &ctx->tokens[partition];
short *coeffs = tokens->coeffs + 25 * 16 * start_col;
unsigned int col;
- token_entropy_ctx_t *above = ctx->above_token_entropy_ctx + start_col;
+ token_entropy_ctx_t *above = ctx->above_token_entropy_ctx
+ + start_col;
token_entropy_ctx_t *left = &tokens->left_token_entropy_ctx;
struct mb_info *mbi = ctx->mb_info_rows[row] + start_col;
@@ -358,12 +384,13 @@
struct dequant_factors *dqf;
dqf = ctx->dequant_factors + mbi->base.segment_id;
- mbi->base.eob_mask = decode_mb_tokens(&tokens->bool,
- *left, *above,
- coeffs,
- mbi->base.y_mode,
- ctx->entropy_hdr.coeff_probs,
- dqf->factor);
+ mbi->base.eob_mask =
+ decode_mb_tokens(&tokens->bool,
+ *left, *above,
+ coeffs,
+ mbi->base.y_mode,
+ ctx->entropy_hdr.coeff_probs,
+ dqf->factor);
}
above++;
@@ -381,7 +408,8 @@
if (ctx->frame_hdr.frame_size_updated)
{
unsigned int i;
- unsigned int coeff_row_sz = ctx->mb_cols * 25 * 16 * sizeof(short);
+ unsigned int coeff_row_sz =
+ ctx->mb_cols * 25 * 16 * sizeof(short);
for (i = 0; i < partitions; i++)
{
@@ -389,7 +417,8 @@
ctx->tokens[i].coeffs = memalign(16, coeff_row_sz);
if (!ctx->tokens[i].coeffs)
- vpx_internal_error(&ctx->error, VPX_CODEC_MEM_ERROR, NULL);
+ vpx_internal_error(&ctx->error, VPX_CODEC_MEM_ERROR,
+ NULL);
}
free(ctx->above_token_entropy_ctx);
diff --git a/vp8/dixie/vp8_prob_data.h b/vp8/dixie/vp8_prob_data.h
index 373fc9a..f7b5dc8 100644
--- a/vp8/dixie/vp8_prob_data.h
+++ b/vp8/dixie/vp8_prob_data.h
@@ -383,7 +383,7 @@
{ /* row */
162, /* is short */
128, /* sign */
- 225, 146, 172, 147, 214, 39, 156, /* short tree */
+ 225, 146, 172, 147, 214, 39, 156, /* short tree */
128, 129, 132, 75, 145, 178, 206, 239, 254, 254 /* long bits */
},
{
