Index: source/libvpx/vp9/decoder/vp9_decodemv.c |
=================================================================== |
--- source/libvpx/vp9/decoder/vp9_decodemv.c (revision 263011) |
+++ source/libvpx/vp9/decoder/vp9_decodemv.c (working copy) |
@@ -21,7 +21,6 @@ |
#include "vp9/decoder/vp9_decodemv.h" |
#include "vp9/decoder/vp9_decodeframe.h" |
-#include "vp9/decoder/vp9_onyxd_int.h" |
#include "vp9/decoder/vp9_reader.h" |
static MB_PREDICTION_MODE read_intra_mode(vp9_reader *r, const vp9_prob *p) { |
@@ -64,7 +63,7 @@ |
TX_SIZE max_tx_size, vp9_reader *r) { |
const int ctx = vp9_get_tx_size_context(xd); |
const vp9_prob *tx_probs = get_tx_probs(max_tx_size, ctx, &cm->fc.tx_probs); |
- TX_SIZE tx_size = vp9_read(r, tx_probs[0]); |
+ int tx_size = vp9_read(r, tx_probs[0]); |
if (tx_size != TX_4X4 && max_tx_size >= TX_16X16) { |
tx_size += vp9_read(r, tx_probs[1]); |
if (tx_size != TX_8X8 && max_tx_size >= TX_32X32) |
@@ -73,7 +72,7 @@ |
if (!cm->frame_parallel_decoding_mode) |
++get_tx_counts(max_tx_size, ctx, &cm->counts.tx)[tx_size]; |
- return tx_size; |
+ return (TX_SIZE)tx_size; |
} |
static TX_SIZE read_tx_size(VP9_COMMON *cm, MACROBLOCKD *xd, TX_MODE tx_mode, |
@@ -105,7 +104,7 @@ |
int mi_row, int mi_col, |
vp9_reader *r) { |
struct segmentation *const seg = &cm->seg; |
- const BLOCK_SIZE bsize = xd->mi_8x8[0]->mbmi.sb_type; |
+ const BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type; |
int segment_id; |
if (!seg->enabled) |
@@ -122,7 +121,7 @@ |
static int read_inter_segment_id(VP9_COMMON *const cm, MACROBLOCKD *const xd, |
int mi_row, int mi_col, vp9_reader *r) { |
struct segmentation *const seg = &cm->seg; |
- MB_MODE_INFO *const mbmi = &xd->mi_8x8[0]->mbmi; |
+ MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi; |
const BLOCK_SIZE bsize = mbmi->sb_type; |
int predicted_segment_id, segment_id; |
@@ -162,11 +161,12 @@ |
static void read_intra_frame_mode_info(VP9_COMMON *const cm, |
MACROBLOCKD *const xd, |
int mi_row, int mi_col, vp9_reader *r) { |
- MODE_INFO *const mi = xd->mi_8x8[0]; |
+ MODE_INFO *const mi = xd->mi[0]; |
MB_MODE_INFO *const mbmi = &mi->mbmi; |
- const MODE_INFO *above_mi = xd->mi_8x8[-cm->mode_info_stride]; |
- const MODE_INFO *left_mi = xd->left_available ? xd->mi_8x8[-1] : NULL; |
+ const MODE_INFO *above_mi = xd->mi[-cm->mi_stride]; |
+ const MODE_INFO *left_mi = xd->left_available ? xd->mi[-1] : NULL; |
const BLOCK_SIZE bsize = mbmi->sb_type; |
+ int i; |
mbmi->segment_id = read_intra_segment_id(cm, xd, mi_row, mi_col, r); |
mbmi->skip = read_skip(cm, xd, mbmi->segment_id, r); |
@@ -174,32 +174,28 @@ |
mbmi->ref_frame[0] = INTRA_FRAME; |
mbmi->ref_frame[1] = NONE; |
- if (bsize >= BLOCK_8X8) { |
- const MB_PREDICTION_MODE A = vp9_above_block_mode(mi, above_mi, 0); |
- const MB_PREDICTION_MODE L = vp9_left_block_mode(mi, left_mi, 0); |
- mbmi->mode = read_intra_mode(r, vp9_kf_y_mode_prob[A][L]); |
- } else { |
- // Only 4x4, 4x8, 8x4 blocks |
- const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize]; // 1 or 2 |
- const int num_4x4_h = num_4x4_blocks_high_lookup[bsize]; // 1 or 2 |
- int idx, idy; |
- |
- for (idy = 0; idy < 2; idy += num_4x4_h) { |
- for (idx = 0; idx < 2; idx += num_4x4_w) { |
- const int ib = idy * 2 + idx; |
- const MB_PREDICTION_MODE A = vp9_above_block_mode(mi, above_mi, ib); |
- const MB_PREDICTION_MODE L = vp9_left_block_mode(mi, left_mi, ib); |
- const MB_PREDICTION_MODE b_mode = read_intra_mode(r, |
- vp9_kf_y_mode_prob[A][L]); |
- mi->bmi[ib].as_mode = b_mode; |
- if (num_4x4_h == 2) |
- mi->bmi[ib + 2].as_mode = b_mode; |
- if (num_4x4_w == 2) |
- mi->bmi[ib + 1].as_mode = b_mode; |
- } |
- } |
- |
- mbmi->mode = mi->bmi[3].as_mode; |
+ switch (bsize) { |
+ case BLOCK_4X4: |
+ for (i = 0; i < 4; ++i) |
+ mi->bmi[i].as_mode = |
+ read_intra_mode(r, get_y_mode_probs(mi, above_mi, left_mi, i)); |
+ mbmi->mode = mi->bmi[3].as_mode; |
+ break; |
+ case BLOCK_4X8: |
+ mi->bmi[0].as_mode = mi->bmi[2].as_mode = |
+ read_intra_mode(r, get_y_mode_probs(mi, above_mi, left_mi, 0)); |
+ mi->bmi[1].as_mode = mi->bmi[3].as_mode = mbmi->mode = |
+ read_intra_mode(r, get_y_mode_probs(mi, above_mi, left_mi, 1)); |
+ break; |
+ case BLOCK_8X4: |
+ mi->bmi[0].as_mode = mi->bmi[1].as_mode = |
+ read_intra_mode(r, get_y_mode_probs(mi, above_mi, left_mi, 0)); |
+ mi->bmi[2].as_mode = mi->bmi[3].as_mode = mbmi->mode = |
+ read_intra_mode(r, get_y_mode_probs(mi, above_mi, left_mi, 2)); |
+ break; |
+ default: |
+ mbmi->mode = read_intra_mode(r, |
+ get_y_mode_probs(mi, above_mi, left_mi, 0)); |
} |
mbmi->uv_mode = read_intra_mode(r, vp9_kf_uv_mode_prob[mbmi->mode]); |
@@ -241,14 +237,15 @@ |
static INLINE void read_mv(vp9_reader *r, MV *mv, const MV *ref, |
const nmv_context *ctx, |
nmv_context_counts *counts, int allow_hp) { |
- const MV_JOINT_TYPE j = vp9_read_tree(r, vp9_mv_joint_tree, ctx->joints); |
+ const MV_JOINT_TYPE joint_type = |
+ (MV_JOINT_TYPE)vp9_read_tree(r, vp9_mv_joint_tree, ctx->joints); |
const int use_hp = allow_hp && vp9_use_mv_hp(ref); |
MV diff = {0, 0}; |
- if (mv_joint_vertical(j)) |
+ if (mv_joint_vertical(joint_type)) |
diff.row = read_mv_component(r, &ctx->comps[0], use_hp); |
- if (mv_joint_horizontal(j)) |
+ if (mv_joint_horizontal(joint_type)) |
diff.col = read_mv_component(r, &ctx->comps[1], use_hp); |
vp9_inc_mv(&diff, counts); |
@@ -262,7 +259,8 @@ |
vp9_reader *r) { |
if (cm->reference_mode == REFERENCE_MODE_SELECT) { |
const int ctx = vp9_get_reference_mode_context(cm, xd); |
- const int mode = vp9_read(r, cm->fc.comp_inter_prob[ctx]); |
+ const REFERENCE_MODE mode = |
+ (REFERENCE_MODE)vp9_read(r, cm->fc.comp_inter_prob[ctx]); |
if (!cm->frame_parallel_decoding_mode) |
++cm->counts.comp_inter[ctx][mode]; |
return mode; // SINGLE_REFERENCE or COMPOUND_REFERENCE |
@@ -279,7 +277,8 @@ |
FRAME_COUNTS *const counts = &cm->counts; |
if (vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) { |
- ref_frame[0] = vp9_get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME); |
+ ref_frame[0] = (MV_REFERENCE_FRAME)vp9_get_segdata(&cm->seg, segment_id, |
+ SEG_LVL_REF_FRAME); |
ref_frame[1] = NONE; |
} else { |
const REFERENCE_MODE mode = read_block_reference_mode(cm, xd, r); |
@@ -318,8 +317,9 @@ |
static INLINE INTERP_FILTER read_switchable_interp_filter( |
VP9_COMMON *const cm, MACROBLOCKD *const xd, vp9_reader *r) { |
const int ctx = vp9_get_pred_context_switchable_interp(xd); |
- const int type = vp9_read_tree(r, vp9_switchable_interp_tree, |
- cm->fc.switchable_interp_prob[ctx]); |
+ const INTERP_FILTER type = |
+ (INTERP_FILTER)vp9_read_tree(r, vp9_switchable_interp_tree, |
+ cm->fc.switchable_interp_prob[ctx]); |
if (!cm->frame_parallel_decoding_mode) |
++cm->counts.switchable_interp[ctx][type]; |
return type; |
@@ -329,30 +329,29 @@ |
vp9_reader *r) { |
MB_MODE_INFO *const mbmi = &mi->mbmi; |
const BLOCK_SIZE bsize = mi->mbmi.sb_type; |
+ int i; |
mbmi->ref_frame[0] = INTRA_FRAME; |
mbmi->ref_frame[1] = NONE; |
- if (bsize >= BLOCK_8X8) { |
- mbmi->mode = read_intra_mode_y(cm, r, size_group_lookup[bsize]); |
- } else { |
- // Only 4x4, 4x8, 8x4 blocks |
- const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize]; // 1 or 2 |
- const int num_4x4_h = num_4x4_blocks_high_lookup[bsize]; // 1 or 2 |
- int idx, idy; |
- |
- for (idy = 0; idy < 2; idy += num_4x4_h) { |
- for (idx = 0; idx < 2; idx += num_4x4_w) { |
- const int ib = idy * 2 + idx; |
- const int b_mode = read_intra_mode_y(cm, r, 0); |
- mi->bmi[ib].as_mode = b_mode; |
- if (num_4x4_h == 2) |
- mi->bmi[ib + 2].as_mode = b_mode; |
- if (num_4x4_w == 2) |
- mi->bmi[ib + 1].as_mode = b_mode; |
- } |
- } |
- mbmi->mode = mi->bmi[3].as_mode; |
+ switch (bsize) { |
+ case BLOCK_4X4: |
+ for (i = 0; i < 4; ++i) |
+ mi->bmi[i].as_mode = read_intra_mode_y(cm, r, 0); |
+ mbmi->mode = mi->bmi[3].as_mode; |
+ break; |
+ case BLOCK_4X8: |
+ mi->bmi[0].as_mode = mi->bmi[2].as_mode = read_intra_mode_y(cm, r, 0); |
+ mi->bmi[1].as_mode = mi->bmi[3].as_mode = mbmi->mode = |
+ read_intra_mode_y(cm, r, 0); |
+ break; |
+ case BLOCK_8X4: |
+ mi->bmi[0].as_mode = mi->bmi[1].as_mode = read_intra_mode_y(cm, r, 0); |
+ mi->bmi[2].as_mode = mi->bmi[3].as_mode = mbmi->mode = |
+ read_intra_mode_y(cm, r, 0); |
+ break; |
+ default: |
+ mbmi->mode = read_intra_mode_y(cm, r, size_group_lookup[bsize]); |
} |
mbmi->uv_mode = read_intra_mode_uv(cm, r, mbmi->mode); |
@@ -437,7 +436,7 @@ |
for (ref = 0; ref < 1 + is_compound; ++ref) { |
const MV_REFERENCE_FRAME frame = mbmi->ref_frame[ref]; |
- vp9_find_mv_refs(cm, xd, tile, mi, xd->last_mi, frame, mbmi->ref_mvs[frame], |
+ vp9_find_mv_refs(cm, xd, tile, mi, frame, mbmi->ref_mvs[frame], |
mi_row, mi_col); |
} |
@@ -470,7 +469,7 @@ |
const int num_4x4_w = num_4x4_blocks_wide_lookup[bsize]; // 1 or 2 |
const int num_4x4_h = num_4x4_blocks_high_lookup[bsize]; // 1 or 2 |
int idx, idy; |
- int b_mode; |
+ MB_PREDICTION_MODE b_mode; |
int_mv nearest_sub8x8[2], near_sub8x8[2]; |
for (idy = 0; idy < 2; idy += num_4x4_h) { |
for (idx = 0; idx < 2; idx += num_4x4_w) { |
@@ -516,7 +515,7 @@ |
MACROBLOCKD *const xd, |
const TileInfo *const tile, |
int mi_row, int mi_col, vp9_reader *r) { |
- MODE_INFO *const mi = xd->mi_8x8[0]; |
+ MODE_INFO *const mi = xd->mi[0]; |
MB_MODE_INFO *const mbmi = &mi->mbmi; |
int inter_block; |