[FFmpeg-cvslog] Use quantizer value read from bitstream

Mashiat Sarker Shakkhar git at videolan.org
Tue Jan 3 23:53:10 CET 2012


ffmpeg | branch: master | Mashiat Sarker Shakkhar <shahriman_ams at yahoo.com> | Sun Jan  1 14:32:10 2012 +0600| [3d8449512840215ab48d1b2e337bbd0841635300] | committer: Mashiat Sarker Shakkhar

Use quantizer value read from bitstream

Currently the code initializes quantizer even
before reading it from bitstream and uses that
to dequantize samples.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3d8449512840215ab48d1b2e337bbd0841635300
---

 libavcodec/wmalosslessdec.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libavcodec/wmalosslessdec.c b/libavcodec/wmalosslessdec.c
index da8bb59..ce845f1 100644
--- a/libavcodec/wmalosslessdec.c
+++ b/libavcodec/wmalosslessdec.c
@@ -1067,7 +1067,6 @@ static int decode_subframe(WmallDecodeCtx *s)
     int total_samples   = s->samples_per_frame * s->num_channels;
     int rawpcm_tile;
     int padding_zeroes;
-    int quant_stepsize = s->quant_stepsize;
 
     s->subframe_offset = get_bits_count(&s->gb);
 
@@ -1194,9 +1193,10 @@ static int decode_subframe(WmallDecodeCtx *s)
         revert_acfilter(s, subframe_len);
 
     /* Dequantize */
-    for (i = 0; i < s->num_channels; i++)
-        for (j = 0; j < subframe_len; j++)
-            s->channel_residues[i][j] *= quant_stepsize;
+    if (s->quant_stepsize != 1)
+        for (i = 0; i < s->num_channels; i++)
+            for (j = 0; j < subframe_len; j++)
+                s->channel_residues[i][j] *= s->quant_stepsize;
 
     /** handled one subframe */
 



More information about the ffmpeg-cvslog mailing list