source/libvpx/vp9/encoder/vp9_quantize.c - Issue 11974002: libvpx: Pull from upstream

Unified Diff: source/libvpx/vp9/encoder/vp9_quantize.c

Issue 11974002: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: source/libvpx/vp9/encoder/vp9_quantize.c

===================================================================

--- source/libvpx/vp9/encoder/vp9_quantize.c (revision 177019)

+++ source/libvpx/vp9/encoder/vp9_quantize.c (working copy)

@@ -25,30 +25,30 @@

int i, rc, eob;

int zbin;

int x, y, z, sz;

- short *zbin_boost_ptr = b->zrun_zbin_boost;

- short *coeff_ptr = b->coeff;

- short *zbin_ptr = b->zbin;

- short *round_ptr = b->round;

- short *quant_ptr = b->quant;

- unsigned char *quant_shift_ptr = b->quant_shift;

- short *qcoeff_ptr = d->qcoeff;

- short *dqcoeff_ptr = d->dqcoeff;

- short *dequant_ptr = d->dequant;

- short zbin_oq_value = b->zbin_extra;

+ int16_t *zbin_boost_ptr = b->zrun_zbin_boost;

+ int16_t *coeff_ptr = b->coeff;

+ int16_t *zbin_ptr = b->zbin;

+ int16_t *round_ptr = b->round;

+ int16_t *quant_ptr = b->quant;

+ uint8_t *quant_shift_ptr = b->quant_shift;

+ int16_t *qcoeff_ptr = d->qcoeff;

+ int16_t *dqcoeff_ptr = d->dqcoeff;

+ int16_t *dequant_ptr = d->dequant;

+ int zbin_oq_value = b->zbin_extra;

int const *pt_scan ;

switch (tx_type) {

- case ADST_DCT :

- pt_scan = vp9_row_scan;

+ case ADST_DCT:

+ pt_scan = vp9_row_scan_4x4;

break;

- case DCT_ADST :

- pt_scan = vp9_col_scan;

+ case DCT_ADST:

+ pt_scan = vp9_col_scan_4x4;

break;

- default :

- pt_scan = vp9_default_zig_zag1d;

+ default:

+ pt_scan = vp9_default_zig_zag1d_4x4;

break;

}

@@ -89,16 +89,16 @@

int i, rc, eob;

int zbin;

int x, y, z, sz;

- short *zbin_boost_ptr = b->zrun_zbin_boost;

- short *coeff_ptr = b->coeff;

- short *zbin_ptr = b->zbin;

- short *round_ptr = b->round;

- short *quant_ptr = b->quant;

- unsigned char *quant_shift_ptr = b->quant_shift;

- short *qcoeff_ptr = d->qcoeff;

- short *dqcoeff_ptr = d->dqcoeff;

- short *dequant_ptr = d->dequant;

- short zbin_oq_value = b->zbin_extra;

+ int16_t *zbin_boost_ptr = b->zrun_zbin_boost;

+ int16_t *coeff_ptr = b->coeff;

+ int16_t *zbin_ptr = b->zbin;

+ int16_t *round_ptr = b->round;

+ int16_t *quant_ptr = b->quant;

+ uint8_t *quant_shift_ptr = b->quant_shift;

+ int16_t *qcoeff_ptr = d->qcoeff;

+ int16_t *dqcoeff_ptr = d->dqcoeff;

+ int16_t *dequant_ptr = d->dequant;

+ int zbin_oq_value = b->zbin_extra;

vpx_memset(qcoeff_ptr, 0, 32);

vpx_memset(dqcoeff_ptr, 0, 32);

@@ -106,7 +106,7 @@

eob = -1;

for (i = 0; i < b->eob_max_offset; i++) {

- rc = vp9_default_zig_zag1d[i];

+ rc = vp9_default_zig_zag1d_4x4[i];

z = coeff_ptr[rc];

zbin = zbin_ptr[rc] + *zbin_boost_ptr + zbin_oq_value;

@@ -174,17 +174,17 @@

int i, rc, eob;

int zbin;

int x, y, z, sz;

- short *zbin_boost_ptr = b->zrun_zbin_boost;

+ int16_t *zbin_boost_ptr = b->zrun_zbin_boost;

int zbin_zrun_index = 0;

- short *coeff_ptr = b->coeff;

- short *zbin_ptr = b->zbin;

- short *round_ptr = b->round;

- short *quant_ptr = b->quant;

- unsigned char *quant_shift_ptr = b->quant_shift;

- short *qcoeff_ptr = d->qcoeff;

- short *dqcoeff_ptr = d->dqcoeff;

- short *dequant_ptr = d->dequant;

- short zbin_oq_value = b->zbin_extra;

+ int16_t *coeff_ptr = b->coeff;

+ int16_t *zbin_ptr = b->zbin;

+ int16_t *round_ptr = b->round;

+ int16_t *quant_ptr = b->quant;

+ uint8_t *quant_shift_ptr = b->quant_shift;

+ int16_t *qcoeff_ptr = d->qcoeff;

+ int16_t *dqcoeff_ptr = d->dqcoeff;

+ int16_t *dequant_ptr = d->dequant;

+ int zbin_oq_value = b->zbin_extra;

// double q2nd = 4;

vpx_memset(qcoeff_ptr, 0, 32);

vpx_memset(dqcoeff_ptr, 0, 32);

@@ -192,7 +192,7 @@

eob = -1;

for (i = 0; i < b->eob_max_offset_8x8; i++) {

- rc = vp9_default_zig_zag1d[i];

+ rc = vp9_default_zig_zag1d_4x4[i];

z = coeff_ptr[rc];

zbin_boost_ptr = &b->zrun_zbin_boost[zbin_zrun_index];

@@ -224,19 +224,19 @@

int i, rc, eob;

int zbin;

int x, y, z, sz;

- short *zbin_boost_ptr = b->zrun_zbin_boost_8x8;

- short *coeff_ptr = b->coeff;

- short *zbin_ptr = b->zbin_8x8;

- short *round_ptr = b->round;

- short *quant_ptr = b->quant;

- unsigned char *quant_shift_ptr = b->quant_shift;

- short *qcoeff_ptr = d->qcoeff;

- short *dqcoeff_ptr = d->dqcoeff;

- short *dequant_ptr = d->dequant;

- short zbin_oq_value = b->zbin_extra;

+ int16_t *zbin_boost_ptr = b->zrun_zbin_boost_8x8;

+ int16_t *coeff_ptr = b->coeff;

+ int16_t *zbin_ptr = b->zbin_8x8;

+ int16_t *round_ptr = b->round;

+ int16_t *quant_ptr = b->quant;

+ uint8_t *quant_shift_ptr = b->quant_shift;

+ int16_t *qcoeff_ptr = d->qcoeff;

+ int16_t *dqcoeff_ptr = d->dqcoeff;

+ int16_t *dequant_ptr = d->dequant;

+ int zbin_oq_value = b->zbin_extra;

- vpx_memset(qcoeff_ptr, 0, 64 * sizeof(short));

- vpx_memset(dqcoeff_ptr, 0, 64 * sizeof(short));

+ vpx_memset(qcoeff_ptr, 0, 64 * sizeof(int16_t));

+ vpx_memset(dqcoeff_ptr, 0, 64 * sizeof(int16_t));

eob = -1;

@@ -323,28 +323,25 @@

vp9_quantize_mbuv_8x8(x);

}

-void vp9_regular_quantize_b_16x16(BLOCK *b, BLOCKD *d) {

+static void quantize(int16_t *zbin_boost_orig_ptr,

+ int16_t *coeff_ptr, int n_coeffs, int max_coeffs,

+ int16_t *zbin_ptr, int16_t *round_ptr, int16_t *quant_ptr,

+ uint8_t *quant_shift_ptr,

+ int16_t *qcoeff_ptr, int16_t *dqcoeff_ptr,

+ int16_t *dequant_ptr, int zbin_oq_value,

+ int *eob_ptr, const int *scan, int mul) {

int i, rc, eob;

int zbin;

int x, y, z, sz;

- short *zbin_boost_ptr = b->zrun_zbin_boost_16x16;

- short *coeff_ptr = b->coeff;

- short *zbin_ptr = b->zbin_16x16;

- short *round_ptr = b->round;

- short *quant_ptr = b->quant;

- unsigned char *quant_shift_ptr = b->quant_shift;

- short *qcoeff_ptr = d->qcoeff;

- short *dqcoeff_ptr = d->dqcoeff;

- short *dequant_ptr = d->dequant;

- short zbin_oq_value = b->zbin_extra;

+ int16_t *zbin_boost_ptr = zbin_boost_orig_ptr;

- vpx_memset(qcoeff_ptr, 0, 256*sizeof(short));

- vpx_memset(dqcoeff_ptr, 0, 256*sizeof(short));

+ vpx_memset(qcoeff_ptr, 0, n_coeffs*sizeof(int16_t));

+ vpx_memset(dqcoeff_ptr, 0, n_coeffs*sizeof(int16_t));

eob = -1;

- for (i = 0; i < b->eob_max_offset_16x16; i++) {

- rc = vp9_default_zig_zag1d_16x16[i];

- z = coeff_ptr[rc];

+ for (i = 0; i < max_coeffs; i++) {

+ rc = scan[i];

+ z = coeff_ptr[rc] * mul;

zbin = (zbin_ptr[rc!=0] + *zbin_boost_ptr + zbin_oq_value);

zbin_boost_ptr ++;

@@ -354,22 +351,68 @@

if (x >= zbin) {

x += (round_ptr[rc!=0]);

- y = ((int)(((int)(x * quant_ptr[rc!=0]) >> 16) + x))

+ y = ((int)(((int)(x * quant_ptr[rc != 0]) >> 16) + x))

>> quant_shift_ptr[rc!=0]; // quantize (x)

x = (y ^ sz) - sz; // get the sign back

qcoeff_ptr[rc] = x; // write to destination

- dqcoeff_ptr[rc] = x * dequant_ptr[rc!=0]; // dequantized value

+ dqcoeff_ptr[rc] = x * dequant_ptr[rc != 0] / mul; // dequantized value

if (y) {

eob = i; // last nonzero coeffs

- zbin_boost_ptr = b->zrun_zbin_boost_16x16;

+ zbin_boost_ptr = zbin_boost_orig_ptr;

}

- d->eob = eob + 1;

+ *eob_ptr = eob + 1;

}

+void vp9_regular_quantize_b_16x16(BLOCK *b, BLOCKD *d) {

+ quantize(b->zrun_zbin_boost_16x16,

+ b->coeff,

+ 256, b->eob_max_offset_16x16,

+ b->zbin_16x16, b->round, b->quant, b->quant_shift,

+ d->qcoeff,

+ d->dqcoeff,

+ d->dequant,

+ b->zbin_extra,

+ &d->eob, vp9_default_zig_zag1d_16x16, 1);

+void vp9_quantize_sby_32x32(MACROBLOCK *x) {

+ x->e_mbd.block[0].eob = 0;

+ quantize(x->block[0].zrun_zbin_boost_32x32,

+ x->sb_coeff_data.coeff,

+ 1024, x->block[0].eob_max_offset_32x32,

+ x->block[0].zbin_32x32,

+ x->block[0].round, x->block[0].quant, x->block[0].quant_shift,

+ x->e_mbd.sb_coeff_data.qcoeff,

+ x->e_mbd.sb_coeff_data.dqcoeff,

+ x->e_mbd.block[0].dequant,

+ x->block[0].zbin_extra,

+ &x->e_mbd.block[0].eob,

+ vp9_default_zig_zag1d_32x32, 2);

+void vp9_quantize_sbuv_16x16(MACROBLOCK *x) {

+ int i;

+ x->e_mbd.block[16].eob = 0;

+ x->e_mbd.block[20].eob = 0;

+ for (i = 16; i < 24; i += 4)

+ quantize(x->block[i].zrun_zbin_boost_16x16,

+ x->sb_coeff_data.coeff + 1024 + (i - 16) * 64,

+ 256, x->block[i].eob_max_offset_16x16,

+ x->block[i].zbin_16x16,

+ x->block[i].round, x->block[0].quant, x->block[i].quant_shift,

+ x->e_mbd.sb_coeff_data.qcoeff + 1024 + (i - 16) * 64,

+ x->e_mbd.sb_coeff_data.dqcoeff + 1024 + (i - 16) * 64,

+ x->e_mbd.block[i].dequant,

+ x->block[i].zbin_extra,

+ &x->e_mbd.block[i].eob,

+ vp9_default_zig_zag1d_16x16, 1);

/* quantize_b_pair function pointer in MACROBLOCK structure is set to one of

* these two C functions if corresponding optimized routine is not available.

* NEON optimized version implements currently the fast quantization for pair

@@ -380,15 +423,15 @@

vp9_regular_quantize_b_4x4(b2, d2);

}

-static void invert_quant(short *quant,

- unsigned char *shift, short d) {

+static void invert_quant(int16_t *quant,

+ uint8_t *shift, int d) {

unsigned t;

int l;

t = d;

for (l = 0; t > 1; l++)

t >>= 1;

t = 1 + (1 << (16 + l)) / d;

- *quant = (short)(t - (1 << 16));

+ *quant = (int16_t)(t - (1 << 16));

*shift = l;

}

@@ -427,6 +470,72 @@

48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,

};

+ static const int zbin_boost_32x32[1024] = {

+ 0, 0, 0, 8, 8, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28,

+ 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 48, 48, 48, 48, 48, 48,

+ 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48, 48,

+ };

int qrounding_factor = 48;

@@ -454,7 +563,11 @@

cpi->zrun_zbin_boost_y1[Q][0] = (quant_val * zbin_boost[0]) >> 7;

cpi->zrun_zbin_boost_y1_8x8[Q][0] =

((quant_val * zbin_boost_8x8[0]) + 64) >> 7;

- cpi->zrun_zbin_boost_y1_16x16[Q][0] = ((quant_val * zbin_boost_16x16[0]) + 64) >> 7;

+ cpi->zrun_zbin_boost_y1_16x16[Q][0] =

+ ((quant_val * zbin_boost_16x16[0]) + 64) >> 7;

+ cpi->Y1zbin_32x32[Q][0] = ((qzbin_factor * quant_val) + 64) >> 7;

+ cpi->zrun_zbin_boost_y1_32x32[Q][0] =

+ ((quant_val * zbin_boost_32x32[0]) + 64) >> 7;

quant_val = vp9_dc2quant(Q, cpi->common.y2dc_delta_q);

@@ -468,7 +581,8 @@

cpi->zrun_zbin_boost_y2[Q][0] = (quant_val * zbin_boost[0]) >> 7;

cpi->zrun_zbin_boost_y2_8x8[Q][0] =

((quant_val * zbin_boost_8x8[0]) + 64) >> 7;

- cpi->zrun_zbin_boost_y2_16x16[Q][0] = ((quant_val * zbin_boost_16x16[0]) + 64) >> 7;

+ cpi->zrun_zbin_boost_y2_16x16[Q][0] =

+ ((quant_val * zbin_boost_16x16[0]) + 64) >> 7;

quant_val = vp9_dc_uv_quant(Q, cpi->common.uvdc_delta_q);

invert_quant(cpi->UVquant[Q] + 0,

@@ -481,11 +595,12 @@

cpi->zrun_zbin_boost_uv[Q][0] = (quant_val * zbin_boost[0]) >> 7;

cpi->zrun_zbin_boost_uv_8x8[Q][0] =

((quant_val * zbin_boost_8x8[0]) + 64) >> 7;

- cpi->zrun_zbin_boost_uv_16x16[Q][0] = ((quant_val * zbin_boost_16x16[0]) + 64) >> 7;

+ cpi->zrun_zbin_boost_uv_16x16[Q][0] =

+ ((quant_val * zbin_boost_16x16[0]) + 64) >> 7;

// all the 4x4 ac values =;

for (i = 1; i < 16; i++) {

- int rc = vp9_default_zig_zag1d[i];

+ int rc = vp9_default_zig_zag1d_4x4[i];

quant_val = vp9_ac_yquant(Q);

invert_quant(cpi->Y1quant[Q] + rc,

@@ -543,16 +658,28 @@

quant_val = vp9_ac_yquant(Q);

cpi->Y1zbin_16x16[Q][rc] = ((qzbin_factor * quant_val) + 64) >> 7;

- cpi->zrun_zbin_boost_y1_16x16[Q][i] = ((quant_val * zbin_boost_16x16[i]) + 64) >> 7;

+ cpi->zrun_zbin_boost_y1_16x16[Q][i] =

+ ((quant_val * zbin_boost_16x16[i]) + 64) >> 7;

quant_val = vp9_ac2quant(Q, cpi->common.y2ac_delta_q);

cpi->Y2zbin_16x16[Q][rc] = ((qzbin_factor * quant_val) + 64) >> 7;

- cpi->zrun_zbin_boost_y2_16x16[Q][i] = ((quant_val * zbin_boost_16x16[i]) + 64) >> 7;

+ cpi->zrun_zbin_boost_y2_16x16[Q][i] =

+ ((quant_val * zbin_boost_16x16[i]) + 64) >> 7;

quant_val = vp9_ac_uv_quant(Q, cpi->common.uvac_delta_q);

cpi->UVzbin_16x16[Q][rc] = ((qzbin_factor * quant_val) + 64) >> 7;

- cpi->zrun_zbin_boost_uv_16x16[Q][i] = ((quant_val * zbin_boost_16x16[i]) + 64) >> 7;

+ cpi->zrun_zbin_boost_uv_16x16[Q][i] =

+ ((quant_val * zbin_boost_16x16[i]) + 64) >> 7;

}

+ // 32x32 structures. Same comment above applies.

+ for (i = 1; i < 1024; i++) {

+ int rc = vp9_default_zig_zag1d_32x32[i];

+ quant_val = vp9_ac_yquant(Q);

+ cpi->Y1zbin_32x32[Q][rc] = ((qzbin_factor * quant_val) + 64) >> 7;

+ cpi->zrun_zbin_boost_y1_32x32[Q][i] =

+ ((quant_val * zbin_boost_32x32[i]) + 64) >> 7;

+ }

}

@@ -592,12 +719,14 @@

x->block[i].zbin = cpi->Y1zbin[QIndex];

x->block[i].zbin_8x8 = cpi->Y1zbin_8x8[QIndex];

x->block[i].zbin_16x16 = cpi->Y1zbin_16x16[QIndex];

+ x->block[i].zbin_32x32 = cpi->Y1zbin_32x32[QIndex];

x->block[i].round = cpi->Y1round[QIndex];

x->e_mbd.block[i].dequant = cpi->common.Y1dequant[QIndex];

x->block[i].zrun_zbin_boost = cpi->zrun_zbin_boost_y1[QIndex];

x->block[i].zrun_zbin_boost_8x8 = cpi->zrun_zbin_boost_y1_8x8[QIndex];

x->block[i].zrun_zbin_boost_16x16 = cpi->zrun_zbin_boost_y1_16x16[QIndex];

- x->block[i].zbin_extra = (short)zbin_extra;

+ x->block[i].zrun_zbin_boost_32x32 = cpi->zrun_zbin_boost_y1_32x32[QIndex];

+ x->block[i].zbin_extra = (int16_t)zbin_extra;

// Segment max eob offset feature.

if (vp9_segfeature_active(xd, segment_id, SEG_LVL_EOB)) {

@@ -607,10 +736,13 @@

vp9_get_segdata(xd, segment_id, SEG_LVL_EOB);

x->block[i].eob_max_offset_16x16 =

vp9_get_segdata(xd, segment_id, SEG_LVL_EOB);

+ x->block[i].eob_max_offset_32x32 =

+ vp9_get_segdata(xd, segment_id, SEG_LVL_EOB);

} else {

x->block[i].eob_max_offset = 16;

x->block[i].eob_max_offset_8x8 = 64;

x->block[i].eob_max_offset_16x16 = 256;

+ x->block[i].eob_max_offset_32x32 = 1024;

}

@@ -632,7 +764,7 @@

x->block[i].zrun_zbin_boost_8x8 = cpi->zrun_zbin_boost_uv_8x8[QIndex];

x->block[i].zrun_zbin_boost_16x16 = cpi->zrun_zbin_boost_uv_16x16[QIndex];

- x->block[i].zbin_extra = (short)zbin_extra;

+ x->block[i].zbin_extra = (int16_t)zbin_extra;

// Segment max eob offset feature.

if (vp9_segfeature_active(xd, segment_id, SEG_LVL_EOB)) {

@@ -640,9 +772,12 @@

vp9_get_segdata(xd, segment_id, SEG_LVL_EOB);

x->block[i].eob_max_offset_8x8 =

vp9_get_segdata(xd, segment_id, SEG_LVL_EOB);

+ x->block[i].eob_max_offset_16x16 =

+ vp9_get_segdata(xd, segment_id, SEG_LVL_EOB);

} else {

x->block[i].eob_max_offset = 16;

x->block[i].eob_max_offset_8x8 = 64;

+ x->block[i].eob_max_offset_16x16 = 256;

}

@@ -662,7 +797,7 @@

x->block[24].zrun_zbin_boost = cpi->zrun_zbin_boost_y2[QIndex];

x->block[24].zrun_zbin_boost_8x8 = cpi->zrun_zbin_boost_y2_8x8[QIndex];

x->block[24].zrun_zbin_boost_16x16 = cpi->zrun_zbin_boost_y2_16x16[QIndex];

- x->block[24].zbin_extra = (short)zbin_extra;

+ x->block[24].zbin_extra = (int16_t)zbin_extra;

// TBD perhaps not use for Y2

// Segment max eob offset feature.

@@ -691,7 +826,7 @@

cpi->zbin_mode_boost +

x->act_zbin_adj)) >> 7;

for (i = 0; i < 16; i++) {

- x->block[i].zbin_extra = (short)zbin_extra;

+ x->block[i].zbin_extra = (int16_t)zbin_extra;

}

// UV

@@ -701,7 +836,7 @@

x->act_zbin_adj)) >> 7;

for (i = 16; i < 24; i++) {

- x->block[i].zbin_extra = (short)zbin_extra;

+ x->block[i].zbin_extra = (int16_t)zbin_extra;

}

// Y2

@@ -710,7 +845,7 @@

cpi->zbin_mode_boost +

x->act_zbin_adj)) >> 7;

- x->block[24].zbin_extra = (short)zbin_extra;

+ x->block[24].zbin_extra = (int16_t)zbin_extra;

}

void vp9_frame_init_quantizer(VP9_COMP *cpi) {

« no previous file with comments | « source/libvpx/vp9/encoder/vp9_quantize.h ('k') | source/libvpx/vp9/encoder/vp9_ratectrl.h » ('j') | no next file with comments »