Commit 7640ee42 authored by Sarah Parker's avatar Sarah Parker
Browse files

Separate inter and intra new-quant profiles

This also adds some tuning to the intra parameters. The current
gains are 0.22% on lowres.

Change-Id: I923134096cda608672d2fba7771c1f7a9fbc8efe
parent 5d149e1d
...@@ -38,12 +38,18 @@ static const qprofile_type nuq[QUANT_PROFILES][2] = { ...@@ -38,12 +38,18 @@ static const qprofile_type nuq[QUANT_PROFILES][2] = {
{ { 64, 128, 128 }, 0 }, // ac { { 64, 128, 128 }, 0 }, // ac
}, },
{ {
{ { 64, 128, 128 }, 4 }, // dc // intra
{ { 64, 128, 128 }, 4 }, // ac { { 64, 128, 128 }, 3 }, // dc
{ { 64, 128, 128 }, 3 }, // ac
},
{
{ { 64, 128, 128 }, 14 }, // dc
{ { 64, 128, 128 }, 14 }, // ac
}, },
{ {
{ { 64, 128, 128 }, 6 }, // dc // inter
{ { 64, 128, 128 }, 6 }, // ac { { 64, 128, 128 }, 4 }, // dc
{ { 64, 128, 128 }, 4 }, // ac
}, },
{ {
{ { 64, 128, 128 }, 8 }, // dc { { 64, 128, 128 }, 8 }, // dc
......
...@@ -75,7 +75,7 @@ static inline TX_SIZE get_qm_tx_size(TX_SIZE tx_size) { ...@@ -75,7 +75,7 @@ static inline TX_SIZE get_qm_tx_size(TX_SIZE tx_size) {
#if CONFIG_NEW_QUANT #if CONFIG_NEW_QUANT
#define QUANT_PROFILES 4 #define QUANT_PROFILES 5
#define QUANT_RANGES 2 #define QUANT_RANGES 2
#define NUQ_KNOTS 3 #define NUQ_KNOTS 3
...@@ -97,12 +97,12 @@ static INLINE int get_dq_profile(int qindex, int is_inter, ...@@ -97,12 +97,12 @@ static INLINE int get_dq_profile(int qindex, int is_inter,
{ {
// intra // intra
{ 2, 1 }, // Y { 2, 1 }, // Y
{ 3, 1 }, // UV { 2, 1 }, // UV
}, },
{ {
// inter // inter
{ 2, 1 }, // Y { 4, 3 }, // Y
{ 3, 1 }, // UV { 4, 3 }, // UV
}, },
}; };
if (!qindex) return 0; // lossless if (!qindex) return 0; // lossless
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment