Merge "Removing clamp_type from the bitstream." into experimental

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));

vp9/common/vp9_onyxc_int.h

@@ -111,11 +111,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,
@@ -152,7 +147,6 @@ typedef struct VP9Common {
   int subsampling_y;
 
   YUV_TYPE clr_type;
-  CLAMP_TYPE  clamp_type;
 
   YV12_BUFFER_CONFIG *frame_to_show;
 

vp9/decoder/vp9_decodframe.c

@@ -995,7 +995,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);

vp9/encoder/vp9_bitstream.c

@@ -1543,7 +1543,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);