[SCM] libav/experimental: Shift 9-15 bit samples to use full 16-bit range. Patch by Laurent Aimar <fenrir at VLCsite> Thread: [PATCH] Fixed wavpack 9-15 bits support

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 760db32a0cac8adedac8876753137d3f139bdcda
Author: Laurent Aimar <fenrir at via.ecp.fr>
Date:   Thu Apr 23 07:44:04 2009 +0000

    Shift 9-15 bit samples to use full 16-bit range.
    Patch by Laurent Aimar <fenrir at VLCsite>
    Thread: [PATCH] Fixed wavpack 9-15 bits support
    
    Originally committed as revision 18666 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index bf68406..4da4690 100644
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -91,6 +91,7 @@ typedef struct WavpackContext {
     Decorr decorr[MAX_TERMS];
     int zero, one, zeroes;
     int and, or, shift;
+    int post_shift;
     int hybrid, hybrid_bitrate;
     WvChannel ch[2];
 } WavpackContext;
@@ -405,9 +406,9 @@ static int wv_unpack_stereo(WavpackContext *s, GetBitContext *gb, int16_t *dst)
             L += (R -= (L >> 1));
         crc = (crc * 3 + L) * 3 + R;
         bit = (L & s->and) | s->or;
-        *dst++ = ((L + bit) << s->shift) - bit;
+        *dst++ = (((L + bit) << s->shift) - bit) << s->post_shift;
         bit = (R & s->and) | s->or;
-        *dst++ = ((R + bit) << s->shift) - bit;
+        *dst++ = (((R + bit) << s->shift) - bit) << s->post_shift;
         count++;
     }while(!last && count < s->samples);
 
@@ -451,7 +452,7 @@ static int wv_unpack_mono(WavpackContext *s, GetBitContext *gb, int16_t *dst)
         pos = (pos + 1) & 7;
         crc = crc * 3 + S;
         bit = (S & s->and) | s->or;
-        *dst++ = ((S + bit) << s->shift) - bit;
+        *dst++ = (((S + bit) << s->shift) - bit) << s->post_shift;
         count++;
     }while(!last && count < s->samples);
 
@@ -512,6 +513,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx,
     s->joint = s->frame_flags & WV_JOINT_STEREO;
     s->hybrid = s->frame_flags & WV_HYBRID_MODE;
     s->hybrid_bitrate = s->frame_flags & WV_HYBRID_BITRATE;
+    s->post_shift = (s->frame_flags >> 13) & 0x1f;
     s->CRC = AV_RL32(buf); buf += 4;
     // parse metadata blocks
     while(buf < buf_end){

-- 
Libav/FFmpeg packaging