ref: 99a4939ec34c2b024efe3e215c00a535fb33570f
parent: bfe7666142d0d3094ed6dffe59f02c5abe7c4848
parent: ec080fa9dece663d00409bd59dbea0e02b9d47af
author: Paul Wilkins <paulwilkins@google.com>
date: Fri Mar 22 06:59:43 EDT 2013
Merge "Disable zero bin mode boost." into experimental
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -2698,10 +2698,10 @@
// is above a threshold
cpi->zbin_mode_boost = 0;
- if (cpi->oxcf.lossless)
+ // if (cpi->oxcf.lossless)
cpi->zbin_mode_boost_enabled = FALSE;
- else
- cpi->zbin_mode_boost_enabled = TRUE;
+ // else
+ // cpi->zbin_mode_boost_enabled = TRUE;
// Current default encoder behaviour for the altref sign bias
if (cpi->source_alt_ref_active)
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -51,9 +51,9 @@
#define MIN_THRESHMULT 32
#define MAX_THRESHMULT 512
-#define GF_ZEROMV_ZBIN_BOOST 12
-#define LF_ZEROMV_ZBIN_BOOST 6
-#define MV_ZBIN_BOOST 4
+#define GF_ZEROMV_ZBIN_BOOST 0
+#define LF_ZEROMV_ZBIN_BOOST 0
+#define MV_ZBIN_BOOST 0
#define SPLIT_MV_ZBIN_BOOST 0
#define INTRA_ZBIN_BOOST 0