generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace some vpxbool calls with entropy coder agnostic calls.

Browse Source 
Change-Id: Ifbcd0714fcf994c43b69255185456c7a255df66c
This commit is contained in:
Alex Converse
2016-05-31 15:42:19 -07:00
parent e89ca180c2
commit aee0091161
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vp10/decoder/decodemv.c
View File

@@ -780,7 +780,7 @@ static void read_ref_frames(VP10_COMMON *const cm, MACROBLOCKD *const xd,
ref_frame[!idx] = cm->comp_fwd_ref[bit]; ref_frame[!idx] = cm->comp_fwd_ref[bit];
{ {
const int ctx1 = vp10_get_pred_context_comp_bwdref_p(cm, xd); const int ctx1 = vp10_get_pred_context_comp_bwdref_p(cm, xd);
const int bit1 = vpx_read(r, fc->comp_bwdref_prob[ctx1][0]); const int bit1 = vp10_read(r, fc->comp_bwdref_prob[ctx1][0]);
if (counts) if (counts)
++counts->comp_bwdref[ctx1][0][bit1]; ++counts->comp_bwdref[ctx1][0][bit1];
ref_frame[idx] = cm->comp_bwd_ref[bit1]; ref_frame[idx] = cm->comp_bwd_ref[bit1];
@@ -860,7 +860,7 @@ static void read_ref_frames(VP10_COMMON *const cm, MACROBLOCKD *const xd,
#if CONFIG_BIDIR_PRED #if CONFIG_BIDIR_PRED
if (bit1) { if (bit1) {
const int ctx2 = vp10_get_pred_context_single_ref_p3(xd); const int ctx2 = vp10_get_pred_context_single_ref_p3(xd);
const int bit2 = vpx_read(r, fc->single_ref_prob[ctx2][2]); const int bit2 = vp10_read(r, fc->single_ref_prob[ctx2][2]);
if (counts) if (counts)
++counts->single_ref[ctx2][2][bit2]; ++counts->single_ref[ctx2][2][bit2];
ref_frame[0] = bit2 ? ALTREF_FRAME : BWDREF_FRAME; ref_frame[0] = bit2 ? ALTREF_FRAME : BWDREF_FRAME;

2
vp10/encoder/bitstream.c
View File

@@ -857,7 +857,7 @@ static void write_ref_frames(const VP10_COMMON *cm, const MACROBLOCKD *xd,
} }
#else // CONFIG_EXT_REFS #else // CONFIG_EXT_REFS
#if CONFIG_BIDIR_PRED #if CONFIG_BIDIR_PRED
vpx_write(w, bit_bwd, vp10_get_pred_prob_comp_bwdref_p(cm, xd)); vp10_write(w, bit_bwd, vp10_get_pred_prob_comp_bwdref_p(cm, xd));
#endif // CONFIG_BIDIR_PRED #endif // CONFIG_BIDIR_PRED
#endif // CONFIG_EXT_REFS #endif // CONFIG_EXT_REFS
} else { } else {