*/
#define ALT_BITSTREAM_READER_LE
#include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
+#include "unary.h"
/**
- * @file wavpack.c
+ * @file libavcodec/wavpack.c
* WavPack lossless audio decoder
*/
-#define WV_JOINT 0x0010
+#define WV_MONO 0x00000004
+#define WV_JOINT_STEREO 0x00000010
+#define WV_FALSE_STEREO 0x40000000
+
+#define WV_HYBRID_MODE 0x00000008
+#define WV_HYBRID_SHAPE 0x00000008
+#define WV_HYBRID_BITRATE 0x00000200
+#define WV_HYBRID_BALANCE 0x00000400
enum WP_ID_Flags{
WP_IDF_MASK = 0x1F,
WP_ID_INT32INFO,
WP_ID_DATA,
WP_ID_CORR,
- WP_ID_FLT,
+ WP_ID_EXTRABITS,
WP_ID_CHANINFO
};
int samplesB[8];
} Decorr;
+typedef struct WvChannel {
+ int median[3];
+ int slow_level, error_limit;
+ int bitrate_acc, bitrate_delta;
+} WvChannel;
+
typedef struct WavpackContext {
AVCodecContext *avctx;
- int stereo;
+ int frame_flags;
+ int stereo, stereo_in;
int joint;
uint32_t CRC;
GetBitContext gb;
+ int got_extra_bits;
+ uint32_t crc_extra_bits;
+ GetBitContext gb_extra_bits;
int data_size; // in bits
int samples;
- int median[6];
int terms;
Decorr decorr[MAX_TERMS];
int zero, one, zeroes;
+ int extra_bits;
+ int and, or, shift;
+ int post_shift;
+ int hybrid, hybrid_bitrate;
+ WvChannel ch[2];
} WavpackContext;
// exponent table copied from WavPack source
0xea, 0xec, 0xed, 0xee, 0xf0, 0xf1, 0xf2, 0xf4, 0xf5, 0xf6, 0xf8, 0xf9, 0xfa, 0xfc, 0xfd, 0xff
};
+static const uint8_t wp_log2_table [] = {
+ 0x00, 0x01, 0x03, 0x04, 0x06, 0x07, 0x09, 0x0a, 0x0b, 0x0d, 0x0e, 0x10, 0x11, 0x12, 0x14, 0x15,
+ 0x16, 0x18, 0x19, 0x1a, 0x1c, 0x1d, 0x1e, 0x20, 0x21, 0x22, 0x24, 0x25, 0x26, 0x28, 0x29, 0x2a,
+ 0x2c, 0x2d, 0x2e, 0x2f, 0x31, 0x32, 0x33, 0x34, 0x36, 0x37, 0x38, 0x39, 0x3b, 0x3c, 0x3d, 0x3e,
+ 0x3f, 0x41, 0x42, 0x43, 0x44, 0x45, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4d, 0x4e, 0x4f, 0x50, 0x51,
+ 0x52, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5a, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 0x63,
+ 0x64, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x74, 0x75,
+ 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84, 0x85,
+ 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
+ 0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
+ 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb2,
+ 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc0,
+ 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcb, 0xcc, 0xcd, 0xce,
+ 0xcf, 0xd0, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd8, 0xd9, 0xda, 0xdb,
+ 0xdc, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe4, 0xe5, 0xe6, 0xe7, 0xe7,
+ 0xe8, 0xe9, 0xea, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xee, 0xef, 0xf0, 0xf1, 0xf1, 0xf2, 0xf3, 0xf4,
+ 0xf4, 0xf5, 0xf6, 0xf7, 0xf7, 0xf8, 0xf9, 0xf9, 0xfa, 0xfb, 0xfc, 0xfc, 0xfd, 0xfe, 0xff, 0xff
+};
+
static av_always_inline int wp_exp2(int16_t val)
{
int res, neg = 0;
return neg ? -res : res;
}
-static inline int get_unary(GetBitContext *gb){
- int r=0;
- while(get_bits1(gb) && r<33)r++;
- return r;
+static av_always_inline int wp_log2(int32_t val)
+{
+ int bits;
+
+ if(!val)
+ return 0;
+ if(val == 1)
+ return 256;
+ val += val >> 9;
+ bits = av_log2(val) + 1;
+ if(bits < 9)
+ return (bits << 8) + wp_log2_table[(val << (9 - bits)) & 0xFF];
+ else
+ return (bits << 8) + wp_log2_table[(val >> (bits - 9)) & 0xFF];
}
+#define LEVEL_DECAY(a) ((a + 0x80) >> 8)
+
// macros for manipulating median values
-#define GET_MED(n) ((median[n] >> 4) + 1)
-#define DEC_MED(n) median[n] -= ((median[n] + (128>>n) - 2) / (128>>n)) * 2
-#define INC_MED(n) median[n] += ((median[n] + (128>>n)) / (128>>n)) * 5
+#define GET_MED(n) ((c->median[n] >> 4) + 1)
+#define DEC_MED(n) c->median[n] -= ((c->median[n] + (128>>n) - 2) / (128>>n)) * 2
+#define INC_MED(n) c->median[n] += ((c->median[n] + (128>>n)) / (128>>n)) * 5
// macros for applying weight
#define UPDATE_WEIGHT_CLIP(weight, delta, samples, in) \
return res;
}
-static int wv_get_value(WavpackContext *ctx, GetBitContext *gb, int *median, int *last)
+static void update_error_limit(WavpackContext *ctx)
+{
+ int i, br[2], sl[2];
+
+ for(i = 0; i <= ctx->stereo_in; i++){
+ ctx->ch[i].bitrate_acc += ctx->ch[i].bitrate_delta;
+ br[i] = ctx->ch[i].bitrate_acc >> 16;
+ sl[i] = LEVEL_DECAY(ctx->ch[i].slow_level);
+ }
+ if(ctx->stereo_in && ctx->hybrid_bitrate){
+ int balance = (sl[1] - sl[0] + br[1] + 1) >> 1;
+ if(balance > br[0]){
+ br[1] = br[0] << 1;
+ br[0] = 0;
+ }else if(-balance > br[0]){
+ br[0] <<= 1;
+ br[1] = 0;
+ }else{
+ br[1] = br[0] + balance;
+ br[0] = br[0] - balance;
+ }
+ }
+ for(i = 0; i <= ctx->stereo_in; i++){
+ if(ctx->hybrid_bitrate){
+ if(sl[i] - br[i] > -0x100)
+ ctx->ch[i].error_limit = wp_exp2(sl[i] - br[i] + 0x100);
+ else
+ ctx->ch[i].error_limit = 0;
+ }else{
+ ctx->ch[i].error_limit = wp_exp2(br[i]);
+ }
+ }
+}
+
+static int wv_get_value(WavpackContext *ctx, GetBitContext *gb, int channel, int *last)
{
int t, t2;
int sign, base, add, ret;
+ WvChannel *c = &ctx->ch[channel];
*last = 0;
- if((ctx->median[0] < 2U) && (ctx->median[3] < 2U) && !ctx->zero && !ctx->one){
+ if((ctx->ch[0].median[0] < 2U) && (ctx->ch[1].median[0] < 2U) && !ctx->zero && !ctx->one){
if(ctx->zeroes){
ctx->zeroes--;
- if(ctx->zeroes)
+ if(ctx->zeroes){
+ c->slow_level -= LEVEL_DECAY(c->slow_level);
return 0;
+ }
}else{
- t = get_unary(gb);
+ t = get_unary_0_33(gb);
if(t >= 2) t = get_bits(gb, t - 1) | (1 << (t-1));
ctx->zeroes = t;
if(ctx->zeroes){
- memset(ctx->median, 0, sizeof(ctx->median));
+ memset(ctx->ch[0].median, 0, sizeof(ctx->ch[0].median));
+ memset(ctx->ch[1].median, 0, sizeof(ctx->ch[1].median));
+ c->slow_level -= LEVEL_DECAY(c->slow_level);
return 0;
}
}
t = 0;
ctx->zero = 0;
}else{
- t = get_unary(gb);
+ t = get_unary_0_33(gb);
if(get_bits_count(gb) >= ctx->data_size){
*last = 1;
return 0;
}
if(t == 16) {
- t2 = get_unary(gb);
+ t2 = get_unary_0_33(gb);
if(t2 < 2) t += t2;
else t += get_bits(gb, t2 - 1) | (1 << (t2 - 1));
}
ctx->zero = !ctx->one;
}
+ if(ctx->hybrid && !channel)
+ update_error_limit(ctx);
+
if(!t){
base = 0;
add = GET_MED(0) - 1;
INC_MED(1);
INC_MED(2);
}
- ret = base + get_tail(gb, add);
+ if(!c->error_limit){
+ ret = base + get_tail(gb, add);
+ }else{
+ int mid = (base*2 + add + 1) >> 1;
+ while(add > c->error_limit){
+ if(get_bits1(gb)){
+ add -= (mid - base);
+ base = mid;
+ }else
+ add = mid - base - 1;
+ mid = (base*2 + add + 1) >> 1;
+ }
+ ret = mid;
+ }
sign = get_bits1(gb);
+ if(ctx->hybrid_bitrate)
+ c->slow_level += wp_log2(ret) - LEVEL_DECAY(c->slow_level);
return sign ? ~ret : ret;
}
-static int wv_unpack_stereo(WavpackContext *s, GetBitContext *gb, int16_t *dst)
+static inline int wv_get_value_integer(WavpackContext *s, uint32_t *crc, int S)
+{
+ int bit;
+
+ if(s->extra_bits){
+ S <<= s->extra_bits;
+
+ if(s->got_extra_bits){
+ S |= get_bits(&s->gb_extra_bits, s->extra_bits);
+ *crc = *crc * 9 + (S&0xffff) * 3 + ((unsigned)S>>16);
+ }
+ }
+ bit = (S & s->and) | s->or;
+ return (((S + bit) << s->shift) - bit) << s->post_shift;
+}
+
+static inline int wv_unpack_stereo(WavpackContext *s, GetBitContext *gb, void *dst, const int hires)
{
int i, j, count = 0;
int last, t;
int A, B, L, L2, R, R2;
int pos = 0;
uint32_t crc = 0xFFFFFFFF;
+ uint32_t crc_extra_bits = 0xFFFFFFFF;
+ int16_t *dst16 = dst;
+ int32_t *dst32 = dst;
s->one = s->zero = s->zeroes = 0;
do{
- L = wv_get_value(s, gb, s->median, &last);
+ L = wv_get_value(s, gb, 0, &last);
if(last) break;
- R = wv_get_value(s, gb, s->median + 3, &last);
+ R = wv_get_value(s, gb, 1, &last);
if(last) break;
for(i = 0; i < s->terms; i++){
t = s->decorr[i].value;
- j = 0;
if(t > 0){
if(t > 8){
if(t & 1){
B = s->decorr[i].samplesB[pos];
j = (pos + t) & 7;
}
- L2 = L + ((s->decorr[i].weightA * A + 512) >> 10);
- R2 = R + ((s->decorr[i].weightB * B + 512) >> 10);
+ if(hires){
+ L2 = L + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10);
+ R2 = R + ((s->decorr[i].weightB * (int64_t)B + 512) >> 10);
+ }else{
+ L2 = L + ((s->decorr[i].weightA * A + 512) >> 10);
+ R2 = R + ((s->decorr[i].weightB * B + 512) >> 10);
+ }
if(A && L) s->decorr[i].weightA -= ((((L ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
if(B && R) s->decorr[i].weightB -= ((((R ^ B) >> 30) & 2) - 1) * s->decorr[i].delta;
s->decorr[i].samplesA[j] = L = L2;
s->decorr[i].samplesB[j] = R = R2;
}else if(t == -1){
- L2 = L + ((s->decorr[i].weightA * s->decorr[i].samplesA[0] + 512) >> 10);
+ if(hires)
+ L2 = L + ((s->decorr[i].weightA * (int64_t)s->decorr[i].samplesA[0] + 512) >> 10);
+ else
+ L2 = L + ((s->decorr[i].weightA * s->decorr[i].samplesA[0] + 512) >> 10);
UPDATE_WEIGHT_CLIP(s->decorr[i].weightA, s->decorr[i].delta, s->decorr[i].samplesA[0], L);
L = L2;
- R2 = R + ((s->decorr[i].weightB * L2 + 512) >> 10);
+ if(hires)
+ R2 = R + ((s->decorr[i].weightB * (int64_t)L2 + 512) >> 10);
+ else
+ R2 = R + ((s->decorr[i].weightB * L2 + 512) >> 10);
UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, L2, R);
R = R2;
s->decorr[i].samplesA[0] = R;
}else{
- R2 = R + ((s->decorr[i].weightB * s->decorr[i].samplesB[0] + 512) >> 10);
+ if(hires)
+ R2 = R + ((s->decorr[i].weightB * (int64_t)s->decorr[i].samplesB[0] + 512) >> 10);
+ else
+ R2 = R + ((s->decorr[i].weightB * s->decorr[i].samplesB[0] + 512) >> 10);
UPDATE_WEIGHT_CLIP(s->decorr[i].weightB, s->decorr[i].delta, s->decorr[i].samplesB[0], R);
R = R2;
s->decorr[i].samplesA[0] = R;
}
- L2 = L + ((s->decorr[i].weightA * R2 + 512) >> 10);
+ if(hires)
+ L2 = L + ((s->decorr[i].weightA * (int64_t)R2 + 512) >> 10);
+ else
+ L2 = L + ((s->decorr[i].weightA * R2 + 512) >> 10);
UPDATE_WEIGHT_CLIP(s->decorr[i].weightA, s->decorr[i].delta, R2, L);
L = L2;
s->decorr[i].samplesB[0] = L;
if(s->joint)
L += (R -= (L >> 1));
crc = (crc * 3 + L) * 3 + R;
- *dst++ = L;
- *dst++ = R;
+ if(hires){
+ *dst32++ = wv_get_value_integer(s, &crc_extra_bits, L);
+ *dst32++ = wv_get_value_integer(s, &crc_extra_bits, R);
+ } else {
+ *dst16++ = wv_get_value_integer(s, &crc_extra_bits, L);
+ *dst16++ = wv_get_value_integer(s, &crc_extra_bits, R);
+ }
count++;
}while(!last && count < s->samples);
av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
return -1;
}
+ if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
+ av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
+ return -1;
+ }
return count * 2;
}
-static int wv_unpack_mono(WavpackContext *s, GetBitContext *gb, int16_t *dst)
+static inline int wv_unpack_mono(WavpackContext *s, GetBitContext *gb, void *dst, const int hires)
{
int i, j, count = 0;
int last, t;
int A, S, T;
int pos = 0;
uint32_t crc = 0xFFFFFFFF;
+ uint32_t crc_extra_bits = 0xFFFFFFFF;
+ int16_t *dst16 = dst;
+ int32_t *dst32 = dst;
s->one = s->zero = s->zeroes = 0;
do{
- T = wv_get_value(s, gb, s->median, &last);
+ T = wv_get_value(s, gb, 0, &last);
S = 0;
if(last) break;
for(i = 0; i < s->terms; i++){
A = s->decorr[i].samplesA[pos];
j = (pos + t) & 7;
}
- S = T + ((s->decorr[i].weightA * A + 512) >> 10);
+ if(hires)
+ S = T + ((s->decorr[i].weightA * (int64_t)A + 512) >> 10);
+ else
+ S = T + ((s->decorr[i].weightA * A + 512) >> 10);
if(A && T) s->decorr[i].weightA -= ((((T ^ A) >> 30) & 2) - 1) * s->decorr[i].delta;
s->decorr[i].samplesA[j] = T = S;
}
pos = (pos + 1) & 7;
crc = crc * 3 + S;
- *dst++ = S;
+
+ if(hires)
+ *dst32++ = wv_get_value_integer(s, &crc_extra_bits, S);
+ else
+ *dst16++ = wv_get_value_integer(s, &crc_extra_bits, S);
count++;
}while(!last && count < s->samples);
av_log(s->avctx, AV_LOG_ERROR, "CRC error\n");
return -1;
}
+ if(s->got_extra_bits && crc_extra_bits != s->crc_extra_bits){
+ av_log(s->avctx, AV_LOG_ERROR, "Extra bits CRC error\n");
+ return -1;
+ }
return count;
}
-static int wavpack_decode_init(AVCodecContext *avctx)
+static av_cold int wavpack_decode_init(AVCodecContext *avctx)
{
WavpackContext *s = avctx->priv_data;
s->avctx = avctx;
s->stereo = (avctx->channels == 2);
-
- return 0;
-}
-
-static int wavpack_decode_close(AVCodecContext *avctx)
-{
-// WavpackContext *s = avctx->priv_data;
+ if(avctx->bits_per_coded_sample <= 16)
+ avctx->sample_fmt = SAMPLE_FMT_S16;
+ else
+ avctx->sample_fmt = SAMPLE_FMT_S32;
+ avctx->channel_layout = (avctx->channels==2) ? CH_LAYOUT_STEREO : CH_LAYOUT_MONO;
return 0;
}
static int wavpack_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
- uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
WavpackContext *s = avctx->priv_data;
- int16_t *samples = data;
+ void *samples = data;
int samplecount;
int got_terms = 0, got_weights = 0, got_samples = 0, got_entropy = 0, got_bs = 0;
- uint8_t* buf_end = buf + buf_size;
+ int got_hybrid = 0;
+ const uint8_t* buf_end = buf + buf_size;
int i, j, id, size, ssize, weights, t;
+ int bpp;
if (buf_size == 0){
*data_size = 0;
}
memset(s->decorr, 0, MAX_TERMS * sizeof(Decorr));
+ memset(s->ch, 0, sizeof(s->ch));
+ s->extra_bits = 0;
+ s->and = s->or = s->shift = 0;
+ s->got_extra_bits = 0;
s->samples = AV_RL32(buf); buf += 4;
if(!s->samples){
*data_size = 0;
return buf_size;
}
+ s->frame_flags = AV_RL32(buf); buf += 4;
+ if((s->frame_flags&0x03) <= 1){
+ bpp = 2;
+ avctx->sample_fmt = SAMPLE_FMT_S16;
+ } else {
+ bpp = 4;
+ avctx->sample_fmt = SAMPLE_FMT_S32;
+ }
+ s->stereo_in = (s->frame_flags & WV_FALSE_STEREO) ? 0 : s->stereo;
+ 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 = 8 * (bpp-1-(s->frame_flags&0x03)) + ((s->frame_flags >> 13) & 0x1f);
+ s->CRC = AV_RL32(buf); buf += 4;
+
/* should not happen but who knows */
- if(s->samples * 2 * avctx->channels > *data_size){
+ if(s->samples * bpp * avctx->channels > *data_size){
av_log(avctx, AV_LOG_ERROR, "Packet size is too big to be handled in lavc!\n");
return -1;
}
- s->joint = AV_RL32(buf) & WV_JOINT; buf += 4;
- s->CRC = AV_RL32(buf); buf += 4;
+
// parse metadata blocks
while(buf < buf_end){
id = *buf++;
av_log(avctx, AV_LOG_ERROR, "No decorrelation terms met\n");
continue;
}
- weights = size >> s->stereo;
+ weights = size >> s->stereo_in;
if(weights > MAX_TERMS || weights > s->terms){
av_log(avctx, AV_LOG_ERROR, "Too many decorrelation weights\n");
buf += ssize;
s->decorr[s->terms - i - 1].weightA = t << 3;
if(s->decorr[s->terms - i - 1].weightA > 0)
s->decorr[s->terms - i - 1].weightA += (s->decorr[s->terms - i - 1].weightA + 64) >> 7;
- if(s->stereo){
+ if(s->stereo_in){
t = (int8_t)(*buf++);
s->decorr[s->terms - i - 1].weightB = t << 3;
if(s->decorr[s->terms - i - 1].weightB > 0)
if(s->decorr[i].value > 8){
s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2;
s->decorr[i].samplesA[1] = wp_exp2(AV_RL16(buf)); buf += 2;
- if(s->stereo){
+ if(s->stereo_in){
s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2;
s->decorr[i].samplesB[1] = wp_exp2(AV_RL16(buf)); buf += 2;
t += 4;
}else{
for(j = 0; j < s->decorr[i].value; j++){
s->decorr[i].samplesA[j] = wp_exp2(AV_RL16(buf)); buf += 2;
- if(s->stereo){
+ if(s->stereo_in){
s->decorr[i].samplesB[j] = wp_exp2(AV_RL16(buf)); buf += 2;
}
}
- t += s->decorr[i].value * 2 * avctx->channels;
+ t += s->decorr[i].value * 2 * (s->stereo_in + 1);
}
}
got_samples = 1;
break;
case WP_ID_ENTROPY:
- if(size != 6 * avctx->channels){
- av_log(avctx, AV_LOG_ERROR, "Entropy vars size should be %i, got %i", 6 * avctx->channels, size);
+ if(size != 6 * (s->stereo_in + 1)){
+ av_log(avctx, AV_LOG_ERROR, "Entropy vars size should be %i, got %i", 6 * (s->stereo_in + 1), size);
buf += ssize;
continue;
}
- for(i = 0; i < 3 * avctx->channels; i++){
- s->median[i] = wp_exp2(AV_RL16(buf));
- buf += 2;
+ for(j = 0; j <= s->stereo_in; j++){
+ for(i = 0; i < 3; i++){
+ s->ch[j].median[i] = wp_exp2(AV_RL16(buf));
+ buf += 2;
+ }
}
got_entropy = 1;
break;
+ case WP_ID_HYBRID:
+ if(s->hybrid_bitrate){
+ for(i = 0; i <= s->stereo_in; i++){
+ s->ch[i].slow_level = wp_exp2(AV_RL16(buf));
+ buf += 2;
+ size -= 2;
+ }
+ }
+ for(i = 0; i < (s->stereo_in + 1); i++){
+ s->ch[i].bitrate_acc = AV_RL16(buf) << 16;
+ buf += 2;
+ size -= 2;
+ }
+ if(size > 0){
+ for(i = 0; i < (s->stereo_in + 1); i++){
+ s->ch[i].bitrate_delta = wp_exp2((int16_t)AV_RL16(buf));
+ buf += 2;
+ }
+ }else{
+ for(i = 0; i < (s->stereo_in + 1); i++)
+ s->ch[i].bitrate_delta = 0;
+ }
+ got_hybrid = 1;
+ break;
+ case WP_ID_INT32INFO:
+ if(size != 4){
+ av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
+ buf += ssize;
+ continue;
+ }
+ if(buf[0])
+ s->extra_bits = buf[0];
+ else if(buf[1])
+ s->shift = buf[1];
+ else if(buf[2]){
+ s->and = s->or = 1;
+ s->shift = buf[2];
+ }else if(buf[3]){
+ s->and = 1;
+ s->shift = buf[3];
+ }
+ buf += 4;
+ break;
case WP_ID_DATA:
init_get_bits(&s->gb, buf, size * 8);
s->data_size = size * 8;
buf += size;
got_bs = 1;
break;
+ case WP_ID_EXTRABITS:
+ if(size <= 4){
+ av_log(avctx, AV_LOG_ERROR, "Invalid EXTRABITS, size = %i\n", size);
+ buf += size;
+ continue;
+ }
+ init_get_bits(&s->gb_extra_bits, buf, size * 8);
+ s->crc_extra_bits = get_bits_long(&s->gb_extra_bits, 32);
+ buf += size;
+ s->got_extra_bits = 1;
+ break;
default:
buf += size;
}
av_log(avctx, AV_LOG_ERROR, "No block with entropy info\n");
return -1;
}
+ if(s->hybrid && !got_hybrid){
+ av_log(avctx, AV_LOG_ERROR, "Hybrid config not found\n");
+ return -1;
+ }
if(!got_bs){
av_log(avctx, AV_LOG_ERROR, "Packed samples not found\n");
return -1;
}
+ if(s->got_extra_bits){
+ const int size = s->gb_extra_bits.size_in_bits - get_bits_count(&s->gb_extra_bits);
+ const int wanted = s->samples * s->extra_bits << s->stereo_in;
+ if(size < wanted){
+ av_log(avctx, AV_LOG_ERROR, "Too small EXTRABITS\n");
+ s->got_extra_bits = 0;
+ }
+ }
- if(s->stereo)
- samplecount = wv_unpack_stereo(s, &s->gb, samples);
- else
- samplecount = wv_unpack_mono(s, &s->gb, samples);
- *data_size = samplecount * 2;
+ if(s->stereo_in){
+ if(bpp == 2)
+ samplecount = wv_unpack_stereo(s, &s->gb, samples, 0);
+ else
+ samplecount = wv_unpack_stereo(s, &s->gb, samples, 1);
+ }else{
+ if(bpp == 2)
+ samplecount = wv_unpack_mono(s, &s->gb, samples, 0);
+ else
+ samplecount = wv_unpack_mono(s, &s->gb, samples, 1);
+ if(s->stereo && bpp == 2){
+ int16_t *dst = (int16_t*)samples + samplecount * 2;
+ int16_t *src = (int16_t*)samples + samplecount;
+ int cnt = samplecount;
+ while(cnt--){
+ *--dst = *--src;
+ *--dst = *src;
+ }
+ samplecount *= 2;
+ }else if(s->stereo){ //32-bit output
+ int32_t *dst = (int32_t*)samples + samplecount * 2;
+ int32_t *src = (int32_t*)samples + samplecount;
+ int cnt = samplecount;
+ while(cnt--){
+ *--dst = *--src;
+ *--dst = *src;
+ }
+ samplecount *= 2;
+ }
+ }
+ *data_size = samplecount * bpp;
return buf_size;
}
sizeof(WavpackContext),
wavpack_decode_init,
NULL,
- wavpack_decode_close,
+ NULL,
wavpack_decode_frame,
+ .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
};
projects / frescor / ffmpeg.git / blobdiff