ref: 280418041d6b4f49c345a46a3198ecff8212bc2b
parent: 2b1a0b68bf4068f6f014f94e34b49f91c3cb3a50
parent: f7c81ccff0d805e9a4fee989b6e63d1d4c742139
author: John Koleszar <jkoleszar@google.com>
date: Mon May 6 10:42:47 EDT 2013
Merge "Removing 3 unused bits from bitstream." into experimental
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -1246,8 +1246,6 @@
setup_loopfilter(pc, xd, &header_bc);
- vp9_read_literal(&header_bc, 2); // unused
-
setup_quantization(pbi, &header_bc);
// Determine if the golden frame or ARF buffer should be updated and how.
@@ -1343,11 +1341,8 @@
vp9_setup_block_dptrs(xd);
// clear out the coeff buffer
- vpx_memset(xd->plane[0].qcoeff, 0, sizeof(xd->plane[0].qcoeff));
- vpx_memset(xd->plane[1].qcoeff, 0, sizeof(xd->plane[1].qcoeff));
- vpx_memset(xd->plane[2].qcoeff, 0, sizeof(xd->plane[2].qcoeff));
-
- vp9_read_bit(&header_bc); // unused
+ for (i = 0; i < MAX_MB_PLANE; ++i)
+ vp9_zero(xd->plane[i].qcoeff);
vp9_decode_mode_mvs_init(pbi, &header_bc);
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1930,9 +1930,6 @@
}
}
- // TODO(jkoleszar): remove these unused bits
- vp9_write_literal(&header_bc, 0, 2);
-
// Frame Q baseline quantizer index
vp9_write_literal(&header_bc, pc->base_qindex, QINDEX_BITS);
@@ -2177,9 +2174,6 @@
#ifdef ENTROPY_STATS
active_section = 2;
#endif
-
- // TODO(jkoleszar): remove this unused bit
- vp9_write_bit(&header_bc, 1);
vp9_update_skip_probs(cpi);
for (i = 0; i < MBSKIP_CONTEXTS; ++i) {--
⑨