From ec080fa9dece663d00409bd59dbea0e02b9d47af Mon Sep 17 00:00:00 2001
From: Paul Wilkins <paulwilkins@google.com>
Date: Fri, 22 Mar 2013 15:47:17 +0000
Subject: [PATCH] Disable zero bin mode boost.
As things stand the zero bin mode boost is hurting somewhat.
In part this seems to be because the boost applied as is
interferes with the rd mode selection loop.
Average gains (derf 0.072, yt 0.243, ythd 0.179 std-hd 0.212%)
Change-Id: Icaecea3908d9a7352370e49b8fa822f2c2c49dc1
---
vp9/encoder/vp9_onyx_if.c | 6 +++---
vp9/encoder/vp9_onyx_int.h | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 7a169e4f37..72cfd9d1b1 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -2698,10 +2698,10 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
// 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)
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index 4a1c3c0ec6..891cc3f522 100644
--- 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
--
GitLab