diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c index ec81fbd7ae8361f6098c2213a79584a302bba644..d149f31b42a128b2b141c21f52ad5fce040c8bfa 100644 --- a/vp9/common/vp9_alloccommon.c +++ b/vp9/common/vp9_alloccommon.c @@ -205,7 +205,6 @@ void vp9_create_common(VP9_COMMON *oci) { oci->no_lpf = 0; oci->use_bilinear_mc_filter = 0; oci->clr_type = REG_YUV; - oci->clamp_type = RECON_CLAMP_REQUIRED; // Initialize reference frame sign bias structure to defaults vpx_memset(oci->ref_frame_sign_bias, 0, sizeof(oci->ref_frame_sign_bias)); diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 2d4cd30ccd446f0b70be24815522b5a36c5d2204..b6a0e6be920fcccdcb3142f96b1692290830e4ac 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -98,11 +98,6 @@ typedef struct frame_contexts { unsigned int mv_ref_ct[INTER_MODE_CONTEXTS][4][2]; } FRAME_CONTEXT; -typedef enum { - RECON_CLAMP_REQUIRED = 0, - RECON_CLAMP_NOTREQUIRED = 1 -} CLAMP_TYPE; - typedef enum { SINGLE_PREDICTION_ONLY = 0, COMP_PREDICTION_ONLY = 1, @@ -139,7 +134,6 @@ typedef struct VP9Common { int subsampling_y; YUV_TYPE clr_type; - CLAMP_TYPE clamp_type; YV12_BUFFER_CONFIG *frame_to_show; diff --git a/vp9/decoder/vp9_decodframe.c b/vp9/decoder/vp9_decodframe.c index b200e6ccceb43bfd1098dfed3bb9988b3f24a43b..732bf02d41f2a754cfeb673666e1d929840cb8fa 100644 --- a/vp9/decoder/vp9_decodframe.c +++ b/vp9/decoder/vp9_decodframe.c @@ -986,7 +986,6 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { "Failed to allocate bool decoder 0"); pc->clr_type = (YUV_TYPE)vp9_read_bit(&header_bc); - pc->clamp_type = (CLAMP_TYPE)vp9_read_bit(&header_bc); pc->error_resilient_mode = vp9_read_bit(&header_bc); setup_loopfilter(pc, xd, &header_bc); diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index bcec13c4bedcafe87ad40e0026169bfe362a9207..168c2a3efc1cef29b8296160a687a4111d4137ce 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1529,7 +1529,6 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, unsigned long *size) { // TODO(jkoleszar): remove these two unused bits? vp9_write_bit(&header_bc, pc->clr_type); - vp9_write_bit(&header_bc, pc->clamp_type); // error resilient mode vp9_write_bit(&header_bc, pc->error_resilient_mode);