summaryrefslogtreecommitdiff
path: root/vp9/common
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2013-05-21 10:35:27 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-05-21 10:35:27 -0700
commit060d93d70465344f4c7b9158b836a7dd955101cd (patch)
tree496103526916154a2c246b47e58c768a44a7d1e9 /vp9/common
parenta7b3ed07df3d2e73b986cc3bb78a1c26fcf2d353 (diff)
parent498b6460a1ed6b0cc0b96e507b90f07c625cc9f2 (diff)
downloadlibvpx-060d93d70465344f4c7b9158b836a7dd955101cd.tar
libvpx-060d93d70465344f4c7b9158b836a7dd955101cd.tar.gz
libvpx-060d93d70465344f4c7b9158b836a7dd955101cd.tar.bz2
libvpx-060d93d70465344f4c7b9158b836a7dd955101cd.zip
Merge "Removing clamp_type from the bitstream." into experimental
Diffstat (limited to 'vp9/common')
-rw-r--r--vp9/common/vp9_alloccommon.c1
-rw-r--r--vp9/common/vp9_onyxc_int.h6
2 files changed, 0 insertions, 7 deletions
diff --git a/vp9/common/vp9_alloccommon.c b/vp9/common/vp9_alloccommon.c
index ec81fbd7a..d149f31b4 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 a39694ae5..6ddc356fb 100644
--- a/vp9/common/vp9_onyxc_int.h
+++ b/vp9/common/vp9_onyxc_int.h
@@ -112,11 +112,6 @@ typedef struct frame_contexts {
} 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,
@@ -152,7 +147,6 @@ typedef struct VP9Common {
int subsampling_y;
YUV_TYPE clr_type;
- CLAMP_TYPE clamp_type;
YV12_BUFFER_CONFIG *frame_to_show;