generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed encoder decoder mismatch.

Browse Source 
Reverted part of change
I19981d1ef0b33e4e5732739574f367fe82771a84

That gives rise to an enc/dec mismatch.
As things stand the memsets are still needed.

Change-Id: I9fa076a703909aa0c4da0059ac6ae19aa530db30
This commit is contained in:
Paul Wilkins
2013-02-13 18:49:55 +00:00
parent 0d284ffed1
commit 56049d9488
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/encoder/vp9_quantize.c
View File

@@ -228,6 +228,12 @@ void vp9_regular_quantize_b_2x2(BLOCK *b, BLOCKD *d) {
} }
void vp9_regular_quantize_b_8x8(BLOCK *b, BLOCKD *d) { void vp9_regular_quantize_b_8x8(BLOCK *b, BLOCKD *d) {
int16_t *qcoeff_ptr = d->qcoeff;
int16_t *dqcoeff_ptr = d->dqcoeff;
vpx_memset(qcoeff_ptr, 0, 64 * sizeof(int16_t));
vpx_memset(dqcoeff_ptr, 0, 64 * sizeof(int16_t));
if (!b->skip_block) { if (!b->skip_block) {
int i, rc, eob; int i, rc, eob;
int zbin; int zbin;
@@ -239,14 +245,9 @@ void vp9_regular_quantize_b_8x8(BLOCK *b, BLOCKD *d) {
int16_t *round_ptr = b->round; int16_t *round_ptr = b->round;
int16_t *quant_ptr = b->quant; int16_t *quant_ptr = b->quant;
uint8_t *quant_shift_ptr = b->quant_shift; 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; int16_t *dequant_ptr = d->dequant;
int zbin_oq_value = b->zbin_extra; int zbin_oq_value = b->zbin_extra;
vpx_memset(qcoeff_ptr, 0, 64 * sizeof(int16_t));
vpx_memset(dqcoeff_ptr, 0, 64 * sizeof(int16_t));
eob = -1; eob = -1;
// Special case for DC as it is the one triggering access in various // Special case for DC as it is the one triggering access in various