Merge "Disable zero bin mode boost." into experimental

This commit is contained in:
Paul Wilkins
2013-03-22 10:59:43 -07:00
committed by Gerrit Code Review
2 changed files with 6 additions and 6 deletions

View File

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

View File

@@ -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