ref: 498b6460a1ed6b0cc0b96e507b90f07c625cc9f2
parent: 481a7c5986f17a7c212eb9ab12beac57bcecef66
author: Dmitry Kovalev <dkovalev@google.com>
date: Fri May 17 11:50:26 EDT 2013
Removing clamp_type from the bitstream. Change-Id: Ica75bdd4905c4a04b7f92795d0b8ce6836a99ef4
--- a/vp9/common/vp9_alloccommon.c
+++ b/vp9/common/vp9_alloccommon.c
@@ -205,7 +205,6 @@
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));
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -99,11 +99,6 @@
} FRAME_CONTEXT;
typedef enum {- RECON_CLAMP_REQUIRED = 0,
- RECON_CLAMP_NOTREQUIRED = 1
-} CLAMP_TYPE;
-
-typedef enum {SINGLE_PREDICTION_ONLY = 0,
COMP_PREDICTION_ONLY = 1,
HYBRID_PREDICTION = 2,
@@ -139,7 +134,6 @@
int subsampling_y;
YUV_TYPE clr_type;
- CLAMP_TYPE clamp_type;
YV12_BUFFER_CONFIG *frame_to_show;
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@ -986,7 +986,6 @@
"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);
--- a/vp9/encoder/vp9_bitstream.c
+++ b/vp9/encoder/vp9_bitstream.c
@@ -1529,7 +1529,6 @@
// 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);