diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-01-26 00:05:11 -0500 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-01-26 00:05:13 -0500 |
| commit | 6c61e28e7a8fc6cca6808b8579195aa051fc03eb (patch) | |
| tree | 515ba1e955a510942932285e93bc68c4325e029c /vp8/encoder/quantize.c | |
| parent | e547ded617f5a6279ee5fe5864af4b3b43982a95 (diff) | |
| parent | 907e98fbb5d66133e57dd3b499d3d7d77420a7ce (diff) | |
| download | libvpx-6c61e28e7a8fc6cca6808b8579195aa051fc03eb.tar libvpx-6c61e28e7a8fc6cca6808b8579195aa051fc03eb.tar.gz libvpx-6c61e28e7a8fc6cca6808b8579195aa051fc03eb.tar.bz2 libvpx-6c61e28e7a8fc6cca6808b8579195aa051fc03eb.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I35581d7fd525fe972e750899e35de93867595e83
Diffstat (limited to 'vp8/encoder/quantize.c')
| -rw-r--r-- | vp8/encoder/quantize.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index be9f26c7f..4a2329fc1 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -129,9 +129,6 @@ void vp8_regular_quantize_b(BLOCK *b, BLOCKD *d) rc = vp8_default_zig_zag1d[i]; z = coeff_ptr[rc]; - //if ( i == 0 ) - // zbin = zbin_ptr[rc] + *zbin_boost_ptr + zbin_oq_value/2; - //else zbin = zbin_ptr[rc] + *zbin_boost_ptr + zbin_oq_value; zbin_boost_ptr ++; @@ -144,13 +141,13 @@ void vp8_regular_quantize_b(BLOCK *b, BLOCKD *d) y = (((x * quant_ptr[rc]) >> 16) + x) >> quant_shift_ptr[rc]; // quantize (x) x = (y ^ sz) - sz; // get the sign back - qcoeff_ptr[rc] = x; // write to destination - dqcoeff_ptr[rc] = x * dequant_ptr[rc]; // dequantized value + qcoeff_ptr[rc] = x; // write to destination + dqcoeff_ptr[rc] = x * dequant_ptr[rc]; // dequantized value if (y) { eob = i; // last nonzero coeffs - zbin_boost_ptr = &b->zrun_zbin_boost[0]; // reset zero runlength + zbin_boost_ptr = b->zrun_zbin_boost; // reset zero runlength } } } |