summaryrefslogtreecommitdiff
path: root/libavcodec/wavpack.c
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@via.ecp.fr>2009-04-23 07:44:04 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2009-04-23 07:44:04 +0000
commit760db32a0cac8adedac8876753137d3f139bdcda (patch)
tree3f67ed101c89b44aeae21199556dc50646277300 /libavcodec/wavpack.c
parentb750fb6945626a7c6255af883d3d7073a32aaf09 (diff)
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
Diffstat (limited to 'libavcodec/wavpack.c')
-rw-r--r--libavcodec/wavpack.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index bf68406852..4da4690fea 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){