summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2013-07-20 22:50:32 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-07-20 22:50:32 -0700
commitee1fe2f750c94c2b87a6c95722d919eda933bca1 (patch)
tree4a46cece828d12befcce760518eacb5536ee112a /vp9/encoder
parent8962d975b201c8550a0f42252b23d4305515a78e (diff)
parent7e703de7299a60ef925db988c407ed0f460f51c0 (diff)
downloadlibvpx-ee1fe2f750c94c2b87a6c95722d919eda933bca1.tar
libvpx-ee1fe2f750c94c2b87a6c95722d919eda933bca1.tar.gz
libvpx-ee1fe2f750c94c2b87a6c95722d919eda933bca1.tar.bz2
libvpx-ee1fe2f750c94c2b87a6c95722d919eda933bca1.zip
Merge "Removing pre probabilities from FRAME_CONTEXT."
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_bitstream.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c
index 92d516877..07cb2b83e 100644
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1471,7 +1471,6 @@ static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) {
}
void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, unsigned long *size) {
- FRAME_CONTEXT *const fc = &cpi->common.fc;
uint8_t *data = dest;
size_t first_part_size;
struct vp9_write_bit_buffer wb = {data, 0};
@@ -1494,20 +1493,6 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, unsigned long *size) {
vp9_clear_system_state(); // __asm emms;
- vp9_copy(fc->pre_coef_probs, fc->coef_probs);
- vp9_copy(fc->pre_y_mode_prob, fc->y_mode_prob);
- vp9_copy(fc->pre_uv_mode_prob, fc->uv_mode_prob);
- vp9_copy(fc->pre_partition_prob, fc->partition_prob[INTER_FRAME]);
- fc->pre_nmvc = fc->nmvc;
- vp9_copy(fc->pre_switchable_interp_prob, fc->switchable_interp_prob);
- vp9_copy(fc->pre_inter_mode_probs, fc->inter_mode_probs);
- vp9_copy(fc->pre_intra_inter_prob, fc->intra_inter_prob);
- vp9_copy(fc->pre_comp_inter_prob, fc->comp_inter_prob);
- vp9_copy(fc->pre_comp_ref_prob, fc->comp_ref_prob);
- vp9_copy(fc->pre_single_ref_prob, fc->single_ref_prob);
- fc->pre_tx_probs = fc->tx_probs;
- vp9_copy(fc->pre_mbskip_probs, fc->mbskip_probs);
-
first_part_size = write_compressed_header(cpi, data);
data += first_part_size;
vp9_wb_write_literal(&saved_wb, first_part_size, 16);