virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Shift 9-15 bit samples to use full 16-bit range.

Browse Source 
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
This commit is contained in:
Laurent Aimar 2009-04-23 07:44:04 +00:00 committed by Kostya Shishkov
parent b750fb6945
commit 760db32a0c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/wavpack.c
View File

@ -91,6 +91,7 @@ typedef struct WavpackContext {
Decorr decorr[MAX_TERMS]; Decorr decorr[MAX_TERMS];
int zero, one, zeroes; int zero, one, zeroes;
int and, or, shift; int and, or, shift;
int post_shift;
int hybrid, hybrid_bitrate; int hybrid, hybrid_bitrate;
WvChannel ch[2]; WvChannel ch[2];
} WavpackContext; } WavpackContext;
@ -405,9 +406,9 @@ static int wv_unpack_stereo(WavpackContext *s, GetBitContext *gb, int16_t *dst)
L += (R -= (L >> 1)); L += (R -= (L >> 1));
crc = (crc * 3 + L) * 3 + R; crc = (crc * 3 + L) * 3 + R;
bit = (L & s->and) | s->or; 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; bit = (R & s->and) | s->or;
*dst++ = ((R + bit) << s->shift) - bit; *dst++ = (((R + bit) << s->shift) - bit) << s->post_shift;
count++; count++;
}while(!last && count < s->samples); }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; pos = (pos + 1) & 7;
crc = crc * 3 + S; crc = crc * 3 + S;
bit = (S & s->and) | s->or; bit = (S & s->and) | s->or;
*dst++ = ((S + bit) << s->shift) - bit; *dst++ = (((S + bit) << s->shift) - bit) << s->post_shift;
count++; count++;
}while(!last && count < s->samples); }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->joint = s->frame_flags & WV_JOINT_STEREO;
s->hybrid = s->frame_flags & WV_HYBRID_MODE; s->hybrid = s->frame_flags & WV_HYBRID_MODE;
s->hybrid_bitrate = s->frame_flags & WV_HYBRID_BITRATE; s->hybrid_bitrate = s->frame_flags & WV_HYBRID_BITRATE;
s->post_shift = (s->frame_flags >> 13) & 0x1f;
s->CRC = AV_RL32(buf); buf += 4; s->CRC = AV_RL32(buf); buf += 4;
// parse metadata blocks // parse metadata blocks
while(buf < buf_end){ while(buf < buf_end){