Commit 00b27a36 authored by Jim Bankoski's avatar Jim Bankoski
Browse files

more warning cleanup

Change-Id: Iaa67bcf1e866dfe255c4e458d4e51e9c708ffcf4
parent a802f5e7
...@@ -281,7 +281,6 @@ static void decode_8x8(VP9D_COMP *pbi, MACROBLOCKD *xd, ...@@ -281,7 +281,6 @@ static void decode_8x8(VP9D_COMP *pbi, MACROBLOCKD *xd,
assert(get_2nd_order_usage(xd) == 0); assert(get_2nd_order_usage(xd) == 0);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
int ib = vp9_i8x8_block[i]; int ib = vp9_i8x8_block[i];
const int iblock[4] = {0, 1, 4, 5};
int idx = (ib & 0x02) ? (ib + 2) : ib; int idx = (ib & 0x02) ? (ib + 2) : ib;
short *q = xd->block[idx].qcoeff; short *q = xd->block[idx].qcoeff;
short *dq = xd->block[0].dequant; short *dq = xd->block[0].dequant;
...@@ -310,8 +309,8 @@ static void decode_8x8(VP9D_COMP *pbi, MACROBLOCKD *xd, ...@@ -310,8 +309,8 @@ static void decode_8x8(VP9D_COMP *pbi, MACROBLOCKD *xd,
xd->dst.y_stride, xd->dst.y_stride,
xd->eobs, xd); xd->eobs, xd);
} else { } else {
assert(get_2nd_order_usage(xd) == 1);
BLOCKD *b = &xd->block[24]; BLOCKD *b = &xd->block[24];
assert(get_2nd_order_usage(xd) == 1);
vp9_dequantize_b_2x2(b); vp9_dequantize_b_2x2(b);
vp9_short_ihaar2x2(&b->dqcoeff[0], b->diff, 8); vp9_short_ihaar2x2(&b->dqcoeff[0], b->diff, 8);
((int *)b->qcoeff)[0] = 0; // 2nd order block are set to 0 after idct ((int *)b->qcoeff)[0] = 0; // 2nd order block are set to 0 after idct
...@@ -384,12 +383,6 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd, ...@@ -384,12 +383,6 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd,
int j; int j;
int i8x8mode; int i8x8mode;
BLOCKD *b; BLOCKD *b;
int idx = (ib & 0x02) ? (ib + 2) : ib;
short *q = xd->block[idx].qcoeff;
short *dq = xd->block[0].dequant;
unsigned char *pre = xd->block[ib].predictor;
unsigned char *dst = *(xd->block[ib].base_dst) + xd->block[ib].dst;
int stride = xd->dst.y_stride;
b = &xd->block[ib]; b = &xd->block[ib];
i8x8mode = b->bmi.as_mode.first; i8x8mode = b->bmi.as_mode.first;
vp9_intra8x8_predict(b, i8x8mode, b->predictor); vp9_intra8x8_predict(b, i8x8mode, b->predictor);
...@@ -514,8 +507,8 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd, ...@@ -514,8 +507,8 @@ static void decode_4x4(VP9D_COMP *pbi, MACROBLOCKD *xd,
} }
} }
} else { } else {
assert(get_2nd_order_usage(xd) == 1);
BLOCKD *b = &xd->block[24]; BLOCKD *b = &xd->block[24];
assert(get_2nd_order_usage(xd) == 1);
vp9_dequantize_b(b); vp9_dequantize_b(b);
if (xd->eobs[24] > 1) { if (xd->eobs[24] > 1) {
vp9_short_inv_walsh4x4(&b->dqcoeff[0], b->diff); vp9_short_inv_walsh4x4(&b->dqcoeff[0], b->diff);
...@@ -766,7 +759,6 @@ static void decode_macroblock(VP9D_COMP *pbi, MACROBLOCKD *xd, ...@@ -766,7 +759,6 @@ static void decode_macroblock(VP9D_COMP *pbi, MACROBLOCKD *xd,
MB_PREDICTION_MODE mode; MB_PREDICTION_MODE mode;
int i; int i;
int tx_size; int tx_size;
TX_TYPE tx_type;
#if CONFIG_SUPERBLOCKS #if CONFIG_SUPERBLOCKS
assert(!xd->mode_info_context->mbmi.encoded_as_sb); assert(!xd->mode_info_context->mbmi.encoded_as_sb);
......
...@@ -4153,8 +4153,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, ...@@ -4153,8 +4153,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
cpi->frames_till_gf_update_due))) { cpi->frames_till_gf_update_due))) {
cpi->alt_ref_source = cpi->source; cpi->alt_ref_source = cpi->source;
if (cpi->oxcf.arnr_max_frames > 0) { if (cpi->oxcf.arnr_max_frames > 0) {
vp9_temporal_filter_prepare_c(cpi, vp9_temporal_filter_prepare_c(cpi, cpi->frames_till_gf_update_due);
cpi->frames_till_gf_update_due);
force_src_buffer = &cpi->alt_ref_buffer; force_src_buffer = &cpi->alt_ref_buffer;
} }
cm->frames_till_alt_ref_frame = cpi->frames_till_gf_update_due; cm->frames_till_alt_ref_frame = cpi->frames_till_gf_update_due;
......
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