ref: bb6e47c1c9154304c823ed8a94eece973ff3baac
parent: 15cf55b3ca44fd58c8d0fd51819146e8544e8e81
parent: 0d3d6e0e31c5ce04bac92e9769d896079e866b17
author: Paul Wilkins <paulwilkins@google.com>
date: Thu Dec 4 23:11:43 EST 2014
Merge "Increase strength of AQ1."
--- a/vp9/encoder/vp9_aq_variance.c
+++ b/vp9/encoder/vp9_aq_variance.c
@@ -19,7 +19,7 @@
#include "vp9/encoder/vp9_segmentation.h"
#include "vp9/common/vp9_systemdependent.h"
-#define ENERGY_MIN (-1)
+#define ENERGY_MIN (-4)
#define ENERGY_MAX (1)
#define ENERGY_SPAN (ENERGY_MAX - ENERGY_MIN + 1)
#define ENERGY_IN_BOUNDS(energy)\
@@ -26,8 +26,8 @@
assert((energy) >= ENERGY_MIN && (energy) <= ENERGY_MAX)
static const double rate_ratio[MAX_SEGMENTS] =
- {1.143, 1.0, 0.875, 1.0, 1.0, 1.0, 1.0, 1.0};-static const int segment_id[ENERGY_SPAN] = {0, 1, 2};+ {2.5, 2.0, 1.5, 1.0, 0.75, 1.0, 1.0, 1.0};+static const int segment_id[ENERGY_SPAN] = {0, 1, 1, 2, 3, 4};#define SEGMENT_ID(i) segment_id[(i) - ENERGY_MIN]
--
⑨