summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_bitstream.c
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2013-12-16 20:12:47 -0800
committerDmitry Kovalev <dkovalev@google.com>2013-12-16 20:12:47 -0800
commit1d23a6594bf7ce33a0e3c8f608c68d23dd746266 (patch)
tree573921a192dc5826a70de5d2228fe39794894c38 /vp9/encoder/vp9_bitstream.c
parent3755be94ed143a957941046c6724e18bdeeda063 (diff)
downloadlibvpx-1d23a6594bf7ce33a0e3c8f608c68d23dd746266.tar
libvpx-1d23a6594bf7ce33a0e3c8f608c68d23dd746266.tar.gz
libvpx-1d23a6594bf7ce33a0e3c8f608c68d23dd746266.tar.bz2
libvpx-1d23a6594bf7ce33a0e3c8f608c68d23dd746266.zip
Reusing FRAME_COUNTS in the encoder.
Change-Id: I6ab9fe2326ebbadf0dd10cca9f66cf8277e3f43b Replacing: comp_inter_count, single_ref_count, comp_ref_count.
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
-rw-r--r--vp9/encoder/vp9_bitstream.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 88e25ebf2..547ad52f6 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1256,23 +1256,23 @@ static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) {
if (use_hybrid_pred)
for (i = 0; i < COMP_INTER_CONTEXTS; i++)
vp9_cond_prob_diff_update(&header_bc, &fc->comp_inter_prob[i],
- cpi->comp_inter_count[i]);
+ cm->counts.comp_inter[i]);
}
}
if (cm->reference_mode != COMPOUND_REFERENCE) {
for (i = 0; i < REF_CONTEXTS; i++) {
vp9_cond_prob_diff_update(&header_bc, &fc->single_ref_prob[i][0],
- cpi->single_ref_count[i][0]);
+ cm->counts.single_ref[i][0]);
vp9_cond_prob_diff_update(&header_bc, &fc->single_ref_prob[i][1],
- cpi->single_ref_count[i][1]);
+ cm->counts.single_ref[i][1]);
}
}
if (cm->reference_mode != SINGLE_REFERENCE)
for (i = 0; i < REF_CONTEXTS; i++)
vp9_cond_prob_diff_update(&header_bc, &fc->comp_ref_prob[i],
- cpi->comp_ref_count[i]);
+ cm->counts.comp_ref[i]);
for (i = 0; i < BLOCK_SIZE_GROUPS; ++i)
prob_diff_update(vp9_intra_mode_tree, cm->fc.y_mode_prob[i],