ref: 877fac122b283455cf699e41e2fd4d455ef122dc
parent: c005792951199bd40724a028120e80888ac38b57
parent: f779dba405654db9558797af58b2269e4868e5ec
author: Scott LaVarnway <[email protected]>
date: Thu Jun 4 09:46:41 EDT 2015
Merge "Remove counts param"
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -141,7 +141,7 @@
typedef struct macroblockd {struct macroblockd_plane plane[MAX_MB_PLANE];
-
+ FRAME_COUNTS *counts;
int mi_stride;
MODE_INFO **mi;
--- a/vp9/decoder/vp9_decodeframe.c
+++ b/vp9/decoder/vp9_decodeframe.c
@@ -292,7 +292,6 @@
struct intra_args {VP9_COMMON *cm;
MACROBLOCKD *xd;
- FRAME_COUNTS *counts;
vp9_reader *r;
int seg_id;
};
@@ -318,7 +317,7 @@
x, y, plane);
if (!mi->mbmi.skip) {- const int eob = vp9_decode_block_tokens(cm, xd, args->counts, plane, block,
+ const int eob = vp9_decode_block_tokens(cm, xd, plane, block,
plane_bsize, x, y, tx_size,
args->r, args->seg_id);
inverse_transform_block(xd, plane, block, tx_size, dst, pd->dst.stride,
@@ -330,7 +329,6 @@
VP9_COMMON *cm;
MACROBLOCKD *xd;
vp9_reader *r;
- FRAME_COUNTS *counts;
int *eobtotal;
int seg_id;
};
@@ -344,7 +342,7 @@
struct macroblockd_plane *const pd = &xd->plane[plane];
int x, y, eob;
txfrm_block_to_raster_xy(plane_bsize, tx_size, block, &x, &y);
- eob = vp9_decode_block_tokens(cm, xd, args->counts, plane, block, plane_bsize,
+ eob = vp9_decode_block_tokens(cm, xd, plane, block, plane_bsize,
x, y, tx_size, args->r, args->seg_id);
inverse_transform_block(xd, plane, block, tx_size,
&pd->dst.buf[4 * y * pd->dst.stride + 4 * x],
@@ -381,7 +379,6 @@
}
static void decode_block(VP9Decoder *const pbi, MACROBLOCKD *const xd,
- FRAME_COUNTS *counts,
const TileInfo *const tile,
int mi_row, int mi_col,
vp9_reader *r, BLOCK_SIZE bsize) {@@ -388,7 +385,7 @@
VP9_COMMON *const cm = &pbi->common;
const int less8x8 = bsize < BLOCK_8X8;
MB_MODE_INFO *mbmi = set_offsets(cm, xd, tile, bsize, mi_row, mi_col);
- vp9_read_mode_info(pbi, xd, counts, tile, mi_row, mi_col, r);
+ vp9_read_mode_info(pbi, xd, tile, mi_row, mi_col, r);
if (less8x8)
bsize = BLOCK_8X8;
@@ -398,7 +395,7 @@
}
if (!is_inter_block(mbmi)) {- struct intra_args arg = {cm, xd, counts, r, mbmi->segment_id};+ struct intra_args arg = {cm, xd, r, mbmi->segment_id};vp9_foreach_transformed_block(xd, bsize,
predict_and_reconstruct_intra_block, &arg);
} else {@@ -408,7 +405,7 @@
// Reconstruction
if (!mbmi->skip) {int eobtotal = 0;
- struct inter_args arg = {cm, xd, r, counts, &eobtotal, mbmi->segment_id};+ struct inter_args arg = {cm, xd, r, &eobtotal, mbmi->segment_id};vp9_foreach_transformed_block(xd, bsize, reconstruct_inter_block, &arg);
if (!less8x8 && eobtotal == 0)
mbmi->skip = 1; // skip loopfilter
@@ -419,7 +416,7 @@
}
static PARTITION_TYPE read_partition(VP9_COMMON *cm, MACROBLOCKD *xd,
- FRAME_COUNTS *counts, int hbs,
+ int hbs,
int mi_row, int mi_col, BLOCK_SIZE bsize,
vp9_reader *r) {const int ctx = partition_plane_context(xd, mi_row, mi_col, bsize);
@@ -426,6 +423,7 @@
const vp9_prob *const probs = get_partition_probs(cm, ctx);
const int has_rows = (mi_row + hbs) < cm->mi_rows;
const int has_cols = (mi_col + hbs) < cm->mi_cols;
+ FRAME_COUNTS *counts = xd->counts;
PARTITION_TYPE p;
if (has_rows && has_cols)
@@ -437,7 +435,7 @@
else
p = PARTITION_SPLIT;
- if (!cm->frame_parallel_decoding_mode)
+ if (counts)
++counts->partition[ctx][p];
return p;
@@ -444,7 +442,6 @@
}
static void decode_partition(VP9Decoder *const pbi, MACROBLOCKD *const xd,
- FRAME_COUNTS *counts,
const TileInfo *const tile,
int mi_row, int mi_col,
vp9_reader* r, BLOCK_SIZE bsize) {@@ -456,7 +453,7 @@
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
return;
- partition = read_partition(cm, xd, counts, hbs, mi_row, mi_col, bsize, r);
+ partition = read_partition(cm, xd, hbs, mi_row, mi_col, bsize, r);
subsize = get_subsize(bsize, partition);
uv_subsize = ss_size_lookup[subsize][cm->subsampling_x][cm->subsampling_y];
if (subsize >= BLOCK_8X8 && uv_subsize == BLOCK_INVALID)
@@ -463,30 +460,27 @@
vpx_internal_error(xd->error_info,
VPX_CODEC_CORRUPT_FRAME, "Invalid block size.");
if (subsize < BLOCK_8X8) {- decode_block(pbi, xd, counts, tile, mi_row, mi_col, r, subsize);
+ decode_block(pbi, xd, tile, mi_row, mi_col, r, subsize);
} else { switch (partition) {case PARTITION_NONE:
- decode_block(pbi, xd, counts, tile, mi_row, mi_col, r, subsize);
+ decode_block(pbi, xd, tile, mi_row, mi_col, r, subsize);
break;
case PARTITION_HORZ:
- decode_block(pbi, xd, counts, tile, mi_row, mi_col, r, subsize);
+ decode_block(pbi, xd, tile, mi_row, mi_col, r, subsize);
if (mi_row + hbs < cm->mi_rows)
- decode_block(pbi, xd, counts, tile, mi_row + hbs, mi_col, r, subsize);
+ decode_block(pbi, xd, tile, mi_row + hbs, mi_col, r, subsize);
break;
case PARTITION_VERT:
- decode_block(pbi, xd, counts, tile, mi_row, mi_col, r, subsize);
+ decode_block(pbi, xd, tile, mi_row, mi_col, r, subsize);
if (mi_col + hbs < cm->mi_cols)
- decode_block(pbi, xd, counts, tile, mi_row, mi_col + hbs, r, subsize);
+ decode_block(pbi, xd, tile, mi_row, mi_col + hbs, r, subsize);
break;
case PARTITION_SPLIT:
- decode_partition(pbi, xd, counts, tile, mi_row, mi_col, r, subsize);
- decode_partition(pbi, xd, counts, tile, mi_row, mi_col + hbs, r,
- subsize);
- decode_partition(pbi, xd, counts, tile, mi_row + hbs, mi_col, r,
- subsize);
- decode_partition(pbi, xd, counts, tile, mi_row + hbs, mi_col + hbs, r,
- subsize);
+ decode_partition(pbi, xd, tile, mi_row, mi_col, r, subsize);
+ decode_partition(pbi, xd, tile, mi_row, mi_col + hbs, r, subsize);
+ decode_partition(pbi, xd, tile, mi_row + hbs, mi_col, r, subsize);
+ decode_partition(pbi, xd, tile, mi_row + hbs, mi_col + hbs, r, subsize);
break;
default:
assert(0 && "Invalid partition type");
@@ -981,6 +975,8 @@
tile_data->cm = cm;
tile_data->xd = pbi->mb;
tile_data->xd.corrupted = 0;
+ tile_data->xd.counts = cm->frame_parallel_decoding_mode ?
+ NULL : &cm->counts;
vp9_tile_init(&tile, tile_data->cm, tile_row, tile_col);
setup_token_decoder(buf->data, data_end, buf->size, &cm->error,
&tile_data->bit_reader, pbi->decrypt_cb,
@@ -1003,7 +999,7 @@
vp9_zero(tile_data->xd.left_seg_context);
for (mi_col = tile.mi_col_start; mi_col < tile.mi_col_end;
mi_col += MI_BLOCK_SIZE) {- decode_partition(pbi, &tile_data->xd, &cm->counts, &tile, mi_row,
+ decode_partition(pbi, &tile_data->xd, &tile, mi_row,
mi_col, &tile_data->bit_reader, BLOCK_64X64);
}
pbi->mb.corrupted |= tile_data->xd.corrupted;
@@ -1076,7 +1072,7 @@
vp9_zero(tile_data->xd.left_seg_context);
for (mi_col = tile->mi_col_start; mi_col < tile->mi_col_end;
mi_col += MI_BLOCK_SIZE) {- decode_partition(tile_data->pbi, &tile_data->xd, &tile_data->counts,
+ decode_partition(tile_data->pbi, &tile_data->xd,
tile, mi_row, mi_col, &tile_data->bit_reader,
BLOCK_64X64);
}
@@ -1200,6 +1196,8 @@
tile_data->pbi = pbi;
tile_data->xd = pbi->mb;
tile_data->xd.corrupted = 0;
+ tile_data->xd.counts = cm->frame_parallel_decoding_mode ?
+ 0 : &tile_data->counts;
vp9_tile_init(tile, cm, 0, buf->col);
setup_token_decoder(buf->data, data_end, buf->size, &cm->error,
&tile_data->bit_reader, pbi->decrypt_cb,
--- a/vp9/decoder/vp9_decodemv.c
+++ b/vp9/decoder/vp9_decodemv.c
@@ -27,30 +27,33 @@
return (PREDICTION_MODE)vp9_read_tree(r, vp9_intra_mode_tree, p);
}
-static PREDICTION_MODE read_intra_mode_y(VP9_COMMON *cm, FRAME_COUNTS *counts,
+static PREDICTION_MODE read_intra_mode_y(VP9_COMMON *cm, MACROBLOCKD *xd,
vp9_reader *r, int size_group) {const PREDICTION_MODE y_mode =
read_intra_mode(r, cm->fc->y_mode_prob[size_group]);
- if (!cm->frame_parallel_decoding_mode)
+ FRAME_COUNTS *counts = xd->counts;
+ if (counts)
++counts->y_mode[size_group][y_mode];
return y_mode;
}
-static PREDICTION_MODE read_intra_mode_uv(VP9_COMMON *cm, FRAME_COUNTS *counts,
+static PREDICTION_MODE read_intra_mode_uv(VP9_COMMON *cm, MACROBLOCKD *xd,
vp9_reader *r,
PREDICTION_MODE y_mode) {const PREDICTION_MODE uv_mode = read_intra_mode(r,
cm->fc->uv_mode_prob[y_mode]);
- if (!cm->frame_parallel_decoding_mode)
+ FRAME_COUNTS *counts = xd->counts;
+ if (counts)
++counts->uv_mode[y_mode][uv_mode];
return uv_mode;
}
-static PREDICTION_MODE read_inter_mode(VP9_COMMON *cm, FRAME_COUNTS *counts,
+static PREDICTION_MODE read_inter_mode(VP9_COMMON *cm, MACROBLOCKD *xd,
vp9_reader *r, int ctx) {const int mode = vp9_read_tree(r, vp9_inter_mode_tree,
cm->fc->inter_mode_probs[ctx]);
- if (!cm->frame_parallel_decoding_mode)
+ FRAME_COUNTS *counts = xd->counts;
+ if (counts)
++counts->inter_mode[ctx][mode];
return NEARESTMV + mode;
@@ -61,8 +64,8 @@
}
static TX_SIZE read_selected_tx_size(VP9_COMMON *cm, MACROBLOCKD *xd,
- FRAME_COUNTS *counts,
TX_SIZE max_tx_size, vp9_reader *r) {+ FRAME_COUNTS *counts = xd->counts;
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);
int tx_size = vp9_read(r, tx_probs[0]);
@@ -72,19 +75,18 @@
tx_size += vp9_read(r, tx_probs[2]);
}
- if (!cm->frame_parallel_decoding_mode)
+ if (counts)
++get_tx_counts(max_tx_size, ctx, &counts->tx)[tx_size];
return (TX_SIZE)tx_size;
}
static TX_SIZE read_tx_size(VP9_COMMON *cm, MACROBLOCKD *xd,
- FRAME_COUNTS *counts,
int allow_select, vp9_reader *r) {TX_MODE tx_mode = cm->tx_mode;
BLOCK_SIZE bsize = xd->mi[0]->mbmi.sb_type;
const TX_SIZE max_tx_size = max_txsize_lookup[bsize];
if (allow_select && tx_mode == TX_MODE_SELECT && bsize >= BLOCK_8X8)
- return read_selected_tx_size(cm, xd, counts, max_tx_size, r);
+ return read_selected_tx_size(cm, xd, max_tx_size, r);
else
return MIN(max_tx_size, tx_mode_to_biggest_tx_size[tx_mode]);
}
@@ -174,7 +176,6 @@
}
static int read_skip(VP9_COMMON *cm, const MACROBLOCKD *xd,
- FRAME_COUNTS *counts,
int segment_id, vp9_reader *r) { if (vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_SKIP)) {return 1;
@@ -181,7 +182,8 @@
} else {const int ctx = vp9_get_skip_context(xd);
const int skip = vp9_read(r, cm->fc->skip_probs[ctx]);
- if (!cm->frame_parallel_decoding_mode)
+ FRAME_COUNTS *counts = xd->counts;
+ if (counts)
++counts->skip[ctx][skip];
return skip;
}
@@ -189,7 +191,6 @@
static void read_intra_frame_mode_info(VP9_COMMON *const cm,
MACROBLOCKD *const xd,
- FRAME_COUNTS *counts,
int mi_row, int mi_col, vp9_reader *r) {MODE_INFO *const mi = xd->mi[0];
MB_MODE_INFO *const mbmi = &mi->mbmi;
@@ -199,8 +200,8 @@
int i;
mbmi->segment_id = read_intra_segment_id(cm, bsize, mi_row, mi_col, r);
- mbmi->skip = read_skip(cm, xd, counts, mbmi->segment_id, r);
- mbmi->tx_size = read_tx_size(cm, xd, counts, 1, r);
+ mbmi->skip = read_skip(cm, xd, mbmi->segment_id, r);
+ mbmi->tx_size = read_tx_size(cm, xd, 1, r);
mbmi->ref_frame[0] = INTRA_FRAME;
mbmi->ref_frame[1] = NONE;
@@ -285,13 +286,13 @@
static REFERENCE_MODE read_block_reference_mode(VP9_COMMON *cm,
const MACROBLOCKD *xd,
- FRAME_COUNTS *counts,
vp9_reader *r) { if (cm->reference_mode == REFERENCE_MODE_SELECT) {const int ctx = vp9_get_reference_mode_context(cm, xd);
const REFERENCE_MODE mode =
(REFERENCE_MODE)vp9_read(r, cm->fc->comp_inter_prob[ctx]);
- if (!cm->frame_parallel_decoding_mode)
+ FRAME_COUNTS *counts = xd->counts;
+ if (counts)
++counts->comp_inter[ctx][mode];
return mode; // SINGLE_REFERENCE or COMPOUND_REFERENCE
} else {@@ -301,9 +302,10 @@
// Read the referncence frame
static void read_ref_frames(VP9_COMMON *const cm, MACROBLOCKD *const xd,
- FRAME_COUNTS *counts, vp9_reader *r,
+ vp9_reader *r,
int segment_id, MV_REFERENCE_FRAME ref_frame[2]) {FRAME_CONTEXT *const fc = cm->fc;
+ FRAME_COUNTS *counts = xd->counts;
if (vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {ref_frame[0] = (MV_REFERENCE_FRAME)vp9_get_segdata(&cm->seg, segment_id,
@@ -310,13 +312,13 @@
SEG_LVL_REF_FRAME);
ref_frame[1] = NONE;
} else {- const REFERENCE_MODE mode = read_block_reference_mode(cm, xd, counts, r);
+ const REFERENCE_MODE mode = read_block_reference_mode(cm, xd, r);
// FIXME(rbultje) I'm pretty sure this breaks segmentation ref frame coding
if (mode == COMPOUND_REFERENCE) {const int idx = cm->ref_frame_sign_bias[cm->comp_fixed_ref];
const int ctx = vp9_get_pred_context_comp_ref_p(cm, xd);
const int bit = vp9_read(r, fc->comp_ref_prob[ctx]);
- if (!cm->frame_parallel_decoding_mode)
+ if (counts)
++counts->comp_ref[ctx][bit];
ref_frame[idx] = cm->comp_fixed_ref;
ref_frame[!idx] = cm->comp_var_ref[bit];
@@ -323,12 +325,12 @@
} else if (mode == SINGLE_REFERENCE) {const int ctx0 = vp9_get_pred_context_single_ref_p1(xd);
const int bit0 = vp9_read(r, fc->single_ref_prob[ctx0][0]);
- if (!cm->frame_parallel_decoding_mode)
+ if (counts)
++counts->single_ref[ctx0][0][bit0];
if (bit0) {const int ctx1 = vp9_get_pred_context_single_ref_p2(xd);
const int bit1 = vp9_read(r, fc->single_ref_prob[ctx1][1]);
- if (!cm->frame_parallel_decoding_mode)
+ if (counts)
++counts->single_ref[ctx1][1][bit1];
ref_frame[0] = bit1 ? ALTREF_FRAME : GOLDEN_FRAME;
} else {@@ -345,18 +347,19 @@
static INLINE INTERP_FILTER read_switchable_interp_filter(
VP9_COMMON *const cm, MACROBLOCKD *const xd,
- FRAME_COUNTS *counts, vp9_reader *r) {+ vp9_reader *r) {const int ctx = vp9_get_pred_context_switchable_interp(xd);
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)
+ FRAME_COUNTS *counts = xd->counts;
+ if (counts)
++counts->switchable_interp[ctx][type];
return type;
}
static void read_intra_block_mode_info(VP9_COMMON *const cm,
- FRAME_COUNTS *counts, MODE_INFO *mi,
+ MACROBLOCKD *const xd, MODE_INFO *mi,
vp9_reader *r) {MB_MODE_INFO *const mbmi = &mi->mbmi;
const BLOCK_SIZE bsize = mi->mbmi.sb_type;
@@ -368,26 +371,26 @@
switch (bsize) {case BLOCK_4X4:
for (i = 0; i < 4; ++i)
- mi->bmi[i].as_mode = read_intra_mode_y(cm, counts, r, 0);
+ mi->bmi[i].as_mode = read_intra_mode_y(cm, xd, 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, counts,
+ mi->bmi[0].as_mode = mi->bmi[2].as_mode = read_intra_mode_y(cm, xd,
r, 0);
mi->bmi[1].as_mode = mi->bmi[3].as_mode = mbmi->mode =
- read_intra_mode_y(cm, counts, r, 0);
+ read_intra_mode_y(cm, xd, r, 0);
break;
case BLOCK_8X4:
- mi->bmi[0].as_mode = mi->bmi[1].as_mode = read_intra_mode_y(cm, counts,
+ mi->bmi[0].as_mode = mi->bmi[1].as_mode = read_intra_mode_y(cm, xd,
r, 0);
mi->bmi[2].as_mode = mi->bmi[3].as_mode = mbmi->mode =
- read_intra_mode_y(cm, counts, r, 0);
+ read_intra_mode_y(cm, xd, r, 0);
break;
default:
- mbmi->mode = read_intra_mode_y(cm, counts, r, size_group_lookup[bsize]);
+ mbmi->mode = read_intra_mode_y(cm, xd, r, size_group_lookup[bsize]);
}
- mbmi->uv_mode = read_intra_mode_uv(cm, counts, r, mbmi->mode);
+ mbmi->uv_mode = read_intra_mode_uv(cm, xd, r, mbmi->mode);
}
static INLINE int is_mv_valid(const MV *mv) {@@ -395,7 +398,7 @@
mv->col > MV_LOW && mv->col < MV_UPP;
}
-static INLINE int assign_mv(VP9_COMMON *cm, FRAME_COUNTS *counts,
+static INLINE int assign_mv(VP9_COMMON *cm, MACROBLOCKD *xd,
PREDICTION_MODE mode,
int_mv mv[2], int_mv ref_mv[2],
int_mv nearest_mv[2], int_mv near_mv[2],
@@ -405,8 +408,8 @@
switch (mode) { case NEWMV: {- nmv_context_counts *const mv_counts = cm->frame_parallel_decoding_mode ?
- NULL : &counts->mv;
+ FRAME_COUNTS *counts = xd->counts;
+ nmv_context_counts *const mv_counts = counts ? &counts->mv : NULL;
for (i = 0; i < 1 + is_compound; ++i) {read_mv(r, &mv[i].as_mv, &ref_mv[i].as_mv, &cm->fc->nmvc, mv_counts,
allow_hp);
@@ -440,7 +443,6 @@
}
static int read_is_inter_block(VP9_COMMON *const cm, MACROBLOCKD *const xd,
- FRAME_COUNTS *counts,
int segment_id, vp9_reader *r) { if (vp9_segfeature_active(&cm->seg, segment_id, SEG_LVL_REF_FRAME)) {return vp9_get_segdata(&cm->seg, segment_id, SEG_LVL_REF_FRAME) !=
@@ -448,7 +450,8 @@
} else {const int ctx = vp9_get_intra_inter_context(xd);
const int is_inter = vp9_read(r, cm->fc->intra_inter_prob[ctx]);
- if (!cm->frame_parallel_decoding_mode)
+ FRAME_COUNTS *counts = xd->counts;
+ if (counts)
++counts->intra_inter[ctx][is_inter];
return is_inter;
}
@@ -462,7 +465,6 @@
static void read_inter_block_mode_info(VP9Decoder *const pbi,
MACROBLOCKD *const xd,
- FRAME_COUNTS *counts,
const TileInfo *const tile,
MODE_INFO *const mi,
int mi_row, int mi_col, vp9_reader *r) {@@ -473,7 +475,7 @@
int_mv nearestmv[2], nearmv[2];
int inter_mode_ctx, ref, is_compound;
- read_ref_frames(cm, xd, counts, r, mbmi->segment_id, mbmi->ref_frame);
+ read_ref_frames(cm, xd, r, mbmi->segment_id, mbmi->ref_frame);
is_compound = has_second_ref(mbmi);
for (ref = 0; ref < 1 + is_compound; ++ref) {@@ -500,7 +502,7 @@
}
} else {if (bsize >= BLOCK_8X8)
- mbmi->mode = read_inter_mode(cm, counts, r, inter_mode_ctx);
+ mbmi->mode = read_inter_mode(cm, xd, r, inter_mode_ctx);
}
if (bsize < BLOCK_8X8 || mbmi->mode != ZEROMV) {@@ -511,7 +513,7 @@
}
mbmi->interp_filter = (cm->interp_filter == SWITCHABLE)
- ? read_switchable_interp_filter(cm, xd, counts, r)
+ ? read_switchable_interp_filter(cm, xd, r)
: cm->interp_filter;
if (bsize < BLOCK_8X8) {@@ -524,7 +526,7 @@
for (idx = 0; idx < 2; idx += num_4x4_w) {int_mv block[2];
const int j = idy * 2 + idx;
- b_mode = read_inter_mode(cm, counts, r, inter_mode_ctx);
+ b_mode = read_inter_mode(cm, xd, r, inter_mode_ctx);
if (b_mode == NEARESTMV || b_mode == NEARMV)
for (ref = 0; ref < 1 + is_compound; ++ref)
@@ -532,7 +534,7 @@
&nearest_sub8x8[ref],
&near_sub8x8[ref]);
- if (!assign_mv(cm, counts, b_mode, block, nearestmv,
+ if (!assign_mv(cm, xd, b_mode, block, nearestmv,
nearest_sub8x8, near_sub8x8,
is_compound, allow_hp, r)) {xd->corrupted |= 1;
@@ -555,7 +557,7 @@
mbmi->mv[0].as_int = mi->bmi[3].as_mv[0].as_int;
mbmi->mv[1].as_int = mi->bmi[3].as_mv[1].as_int;
} else {- xd->corrupted |= !assign_mv(cm, counts, mbmi->mode, mbmi->mv, nearestmv,
+ xd->corrupted |= !assign_mv(cm, xd, mbmi->mode, mbmi->mv, nearestmv,
nearestmv, nearmv, is_compound, allow_hp, r);
}
}
@@ -562,7 +564,6 @@
static void read_inter_frame_mode_info(VP9Decoder *const pbi,
MACROBLOCKD *const xd,
- FRAME_COUNTS *counts,
const TileInfo *const tile,
int mi_row, int mi_col, vp9_reader *r) {VP9_COMMON *const cm = &pbi->common;
@@ -573,18 +574,17 @@
mbmi->mv[0].as_int = 0;
mbmi->mv[1].as_int = 0;
mbmi->segment_id = read_inter_segment_id(cm, xd, mi_row, mi_col, r);
- mbmi->skip = read_skip(cm, xd, counts, mbmi->segment_id, r);
- inter_block = read_is_inter_block(cm, xd, counts, mbmi->segment_id, r);
- mbmi->tx_size = read_tx_size(cm, xd, counts, !mbmi->skip || !inter_block, r);
+ mbmi->skip = read_skip(cm, xd, mbmi->segment_id, r);
+ inter_block = read_is_inter_block(cm, xd, mbmi->segment_id, r);
+ mbmi->tx_size = read_tx_size(cm, xd, !mbmi->skip || !inter_block, r);
if (inter_block)
- read_inter_block_mode_info(pbi, xd, counts, tile, mi, mi_row, mi_col, r);
+ read_inter_block_mode_info(pbi, xd, tile, mi, mi_row, mi_col, r);
else
- read_intra_block_mode_info(cm, counts, mi, r);
+ read_intra_block_mode_info(cm, xd, mi, r);
}
void vp9_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd,
- FRAME_COUNTS *counts,
const TileInfo *const tile,
int mi_row, int mi_col, vp9_reader *r) {VP9_COMMON *const cm = &pbi->common;
@@ -597,9 +597,9 @@
int w, h;
if (frame_is_intra_only(cm))
- read_intra_frame_mode_info(cm, xd, counts, mi_row, mi_col, r);
+ read_intra_frame_mode_info(cm, xd, mi_row, mi_col, r);
else
- read_inter_frame_mode_info(pbi, xd, counts, tile, mi_row, mi_col, r);
+ read_inter_frame_mode_info(pbi, xd, tile, mi_row, mi_col, r);
for (h = 0; h < y_mis; ++h) {MV_REF *const frame_mv = frame_mvs + h * cm->mi_cols;
--- a/vp9/decoder/vp9_decodemv.h
+++ b/vp9/decoder/vp9_decodemv.h
@@ -21,7 +21,6 @@
struct TileInfo;
void vp9_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd,
- FRAME_COUNTS *counts,
const struct TileInfo *const tile,
int mi_row, int mi_col, vp9_reader *r);
--- a/vp9/decoder/vp9_detokenize.c
+++ b/vp9/decoder/vp9_detokenize.c
@@ -35,7 +35,7 @@
#define INCREMENT_COUNT(token) \
do { \- if (!cm->frame_parallel_decoding_mode) \
+ if (counts) \
++coef_counts[band][ctx][token]; \
} while (0)
@@ -47,10 +47,11 @@
}
static int decode_coefs(VP9_COMMON *cm, const MACROBLOCKD *xd,
- FRAME_COUNTS *counts, PLANE_TYPE type,
+ PLANE_TYPE type,
tran_low_t *dqcoeff, TX_SIZE tx_size, const int16_t *dq,
int ctx, const int16_t *scan, const int16_t *nb,
vp9_reader *r) {+ FRAME_COUNTS *counts = xd->counts;
const int max_eob = 16 << (tx_size << 1);
const FRAME_CONTEXT *const fc = cm->fc;
const int ref = is_inter_block(&xd->mi[0]->mbmi);
@@ -112,7 +113,7 @@
int val = -1;
band = *band_translate++;
prob = coef_probs[band][ctx];
- if (!cm->frame_parallel_decoding_mode)
+ if (counts)
++eob_branch_count[band][ctx];
if (!vp9_read(r, prob[EOB_CONTEXT_NODE])) {INCREMENT_COUNT(EOB_MODEL_TOKEN);
@@ -203,7 +204,7 @@
}
int vp9_decode_block_tokens(VP9_COMMON *cm, MACROBLOCKD *xd,
- FRAME_COUNTS *counts, int plane, int block,
+ int plane, int block,
BLOCK_SIZE plane_bsize, int x, int y,
TX_SIZE tx_size, vp9_reader *r,
int seg_id) {@@ -213,7 +214,7 @@
const int ctx = get_entropy_context(tx_size, pd->above_context + x,
pd->left_context + y);
const scan_order *so = get_scan(xd, tx_size, pd->plane_type, block);
- const int eob = decode_coefs(cm, xd, counts, pd->plane_type,
+ const int eob = decode_coefs(cm, xd, pd->plane_type,
BLOCK_OFFSET(pd->dqcoeff, block), tx_size,
dequant, ctx, so->scan, so->neighbors, r);
vp9_set_contexts(xd, pd, plane_bsize, tx_size, eob > 0, x, y);
--- a/vp9/decoder/vp9_detokenize.h
+++ b/vp9/decoder/vp9_detokenize.h
@@ -20,7 +20,7 @@
#endif
int vp9_decode_block_tokens(VP9_COMMON *cm, MACROBLOCKD *xd,
- FRAME_COUNTS *counts, int plane, int block,
+ int plane, int block,
BLOCK_SIZE plane_bsize, int x, int y,
TX_SIZE tx_size, vp9_reader *r,
int seg_id);