diff options
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/decoder/vp9_decodframe.c | 9 | ||||
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 6 | ||||
| -rw-r--r-- | vp9/vp9_common.mk | 8 | ||||
| -rw-r--r-- | vp9/vp9cx.mk | 5 | ||||
| -rw-r--r-- | vp9/vp9dx.mk | 4 |
5 files changed, 2 insertions, 30 deletions
diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index 2f713d3ad..2457f79e1 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -1246,8 +1246,6 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { 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 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { 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); diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 7152ac955..0d5de648e 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1930,9 +1930,6 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, unsigned long *size) { } } - // 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); @@ -2178,9 +2175,6 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, unsigned long *size) { 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) { vp9_write_prob(&header_bc, pc->mbskip_pred_probs[i]); diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index 1ddd4f057..cbe3aa367 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -113,14 +113,6 @@ endif VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_idct_intrin_sse2.c VP9_COMMON_SRCS-$(HAVE_SSE2) += common/x86/vp9_sadmxn_sse2.c -ifeq ($(HAVE_SSE2),yes) -vp9/common/x86/vp9_idct_intrin_sse2.c.o: CFLAGS += -msse2 -vp9/common/x86/vp9_loopfilter_intrin_sse2.c.o: CFLAGS += -msse2 -vp9/common/x86/vp9_sadmxn_sse2.c.o: CFLAGS += -msse2 -vp9/common/x86/vp9_idct_intrin_sse2.c.d: CFLAGS += -msse2 -vp9/common/x86/vp9_loopfilter_intrin_sse2.c.d: CFLAGS += -msse2 -vp9/common/x86/vp9_sadmxn_sse2.c.d: CFLAGS += -msse2 -endif $(eval $(call asm_offsets_template,\ vp9_asm_com_offsets.asm, $(VP9_PREFIX)common/vp9_asm_com_offsets.c)) diff --git a/vp9/vp9cx.mk b/vp9/vp9cx.mk index 39f836fd4..42ab02d31 100644 --- a/vp9/vp9cx.mk +++ b/vp9/vp9cx.mk @@ -95,10 +95,5 @@ VP9_CX_SRCS-$(ARCH_X86)$(ARCH_X86_64) += encoder/x86/vp9_encodeopt.asm VP9_CX_SRCS-$(ARCH_X86_64) += encoder/x86/vp9_ssim_opt.asm VP9_CX_SRCS-$(HAVE_SSE2) += encoder/x86/vp9_dct_sse2.c -ifeq ($(HAVE_SSE2),yes) -vp9/encoder/x86/vp9_dct_sse2.c.d: CFLAGS += -msse2 -vp9/encoder/x86/vp9_dct_sse2.c.o: CFLAGS += -msse2 -endif - VP9_CX_SRCS-yes := $(filter-out $(VP9_CX_SRCS_REMOVE-yes),$(VP9_CX_SRCS-yes)) diff --git a/vp9/vp9dx.mk b/vp9/vp9dx.mk index babdebb86..72cdfebf4 100644 --- a/vp9/vp9dx.mk +++ b/vp9/vp9dx.mk @@ -38,10 +38,6 @@ VP9_DX_SRCS-yes := $(filter-out $(VP9_DX_SRCS_REMOVE-yes),$(VP9_DX_SRCS-yes)) VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/vp9_idct_blk_sse2.c VP9_DX_SRCS-$(HAVE_SSE2) += decoder/x86/vp9_dequantize_sse2.c -ifeq ($(HAVE_SSE2),yes) -vp9/decoder/x86/vp9_dequantize_sse2.c.o: CFLAGS += -msse2 -vp9/decoder/x86/vp9_dequantize_sse2.c.d: CFLAGS += -msse2 -endif $(eval $(call asm_offsets_template,\ vp9_asm_dec_offsets.asm, $(VP9_PREFIX)decoder/vp9_asm_dec_offsets.c)) |