Commit 91c985fc authored by Alex Converse's avatar Alex Converse Committed by Gerrit Code Review
Browse files

Merge "Convert some vpx boolcoder calls back to vp10 generic calls." into nextgenv2

parents 85a3f5b7 e7224b78
......@@ -64,10 +64,10 @@ static PREDICTION_MODE read_intra_mode_uv(VP10_COMMON *cm, MACROBLOCKD *xd,
#if CONFIG_EXT_INTER
static INTERINTRA_MODE read_interintra_mode(VP10_COMMON *cm, MACROBLOCKD *xd,
vpx_reader *r, int size_group) {
vp10_reader *r, int size_group) {
const INTERINTRA_MODE ii_mode =
(INTERINTRA_MODE)vpx_read_tree(r, vp10_interintra_mode_tree,
cm->fc->interintra_mode_prob[size_group]);
(INTERINTRA_MODE)vp10_read_tree(r, vp10_interintra_mode_tree,
cm->fc->interintra_mode_prob[size_group]);
FRAME_COUNTS *counts = xd->counts;
if (counts)
++counts->interintra_mode[size_group][ii_mode];
......@@ -1527,7 +1527,7 @@ static void read_inter_block_mode_info(VP10Decoder *const pbi,
#endif
is_interintra_allowed(mbmi)) {
const int bsize_group = size_group_lookup[bsize];
const int interintra = vpx_read(r, cm->fc->interintra_prob[bsize_group]);
const int interintra = vp10_read(r, cm->fc->interintra_prob[bsize_group]);
if (xd->counts)
xd->counts->interintra[bsize_group][interintra]++;
assert(mbmi->ref_frame[1] == NONE);
......
......@@ -145,7 +145,7 @@ static void write_intra_mode(vp10_writer *w, PREDICTION_MODE mode,
}
#if CONFIG_EXT_INTER
static void write_interintra_mode(vpx_writer *w, INTERINTRA_MODE mode,
static void write_interintra_mode(vp10_writer *w, INTERINTRA_MODE mode,
const vpx_prob *probs) {
vp10_write_token(w, vp10_interintra_mode_tree, probs,
&interintra_mode_encodings[mode]);
......@@ -1295,15 +1295,15 @@ static void pack_inter_mode_mvs(VP10_COMP *cpi, const MODE_INFO *mi,
is_interintra_allowed(mbmi)) {
const int interintra = mbmi->ref_frame[1] == INTRA_FRAME;
const int bsize_group = size_group_lookup[bsize];
vpx_write(w, interintra, cm->fc->interintra_prob[bsize_group]);
vp10_write(w, interintra, cm->fc->interintra_prob[bsize_group]);
if (interintra) {
write_interintra_mode(
w, mbmi->interintra_mode,
cm->fc->interintra_mode_prob[bsize_group]);
assert(mbmi->interintra_mode == mbmi->interintra_uv_mode);
if (is_interintra_wedge_used(bsize)) {
vpx_write(w, mbmi->use_wedge_interintra,
cm->fc->wedge_interintra_prob[bsize]);
vp10_write(w, mbmi->use_wedge_interintra,
cm->fc->wedge_interintra_prob[bsize]);
if (mbmi->use_wedge_interintra) {
vp10_write_literal(w, mbmi->interintra_wedge_index,
get_wedge_bits(bsize));
......@@ -1317,8 +1317,8 @@ static void pack_inter_mode_mvs(VP10_COMP *cpi, const MODE_INFO *mi,
!(is_obmc_allowed(mbmi) && mbmi->obmc) &&
#endif // CONFIG_OBMC
is_interinter_wedge_used(bsize)) {
vpx_write(w, mbmi->use_wedge_interinter,
cm->fc->wedge_interinter_prob[bsize]);
vp10_write(w, mbmi->use_wedge_interinter,
cm->fc->wedge_interinter_prob[bsize]);
if (mbmi->use_wedge_interinter)
vp10_write_literal(w, mbmi->interinter_wedge_index,
get_wedge_bits(bsize));
......
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