mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
wavpack: K&R formatting cosmetics
Signed-off-by: Diego Biurrun <diego@biurrun.de>
This commit is contained in:
Luca Barbato
Diego Biurrun
parent
350914fc80
commit
0f689a3d97
@ -229,7 +229,6 @@ static av_always_inline int wp_log2(int32_t val)
|
|||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static av_always_inline int get_tail(GetBitContext *gb, int k)
|
static av_always_inline int get_tail(GetBitContext *gb, int k)
|
||||||
{
|
{
|
||||||
int p, e, res;
|
int p, e, res;
|
||||||
@ -406,7 +405,8 @@ static inline int wv_get_value_integer(WavpackFrameContext *s, uint32_t *crc,
|
|||||||
if (s->extra_bits) {
|
if (s->extra_bits) {
|
||||||
S <<= s->extra_bits;
|
S <<= s->extra_bits;
|
||||||
|
|
||||||
if (s->got_extra_bits && get_bits_left(&s->gb_extra_bits) >= s->extra_bits) {
|
if (s->got_extra_bits &&
|
||||||
|
get_bits_left(&s->gb_extra_bits) >= s->extra_bits) {
|
||||||
S |= get_bits(&s->gb_extra_bits, s->extra_bits);
|
S |= get_bits(&s->gb_extra_bits, s->extra_bits);
|
||||||
*crc = *crc * 9 + (S & 0xffff) * 3 + ((unsigned)S >> 16);
|
*crc = *crc * 9 + (S & 0xffff) * 3 + ((unsigned)S >> 16);
|
||||||
}
|
}
|
||||||
@ -460,7 +460,8 @@ static float wv_get_value_float(WavpackFrameContext *s, uint32_t *crc, int S)
|
|||||||
if (shift) {
|
if (shift) {
|
||||||
S <<= shift;
|
S <<= shift;
|
||||||
if ((s->float_flag & WV_FLT_SHIFT_ONES) ||
|
if ((s->float_flag & WV_FLT_SHIFT_ONES) ||
|
||||||
(s->got_extra_bits && (s->float_flag & WV_FLT_SHIFT_SAME) &&
|
(s->got_extra_bits &&
|
||||||
|
(s->float_flag & WV_FLT_SHIFT_SAME) &&
|
||||||
get_bits1(&s->gb_extra_bits))) {
|
get_bits1(&s->gb_extra_bits))) {
|
||||||
S |= (1 << shift) - 1;
|
S |= (1 << shift) - 1;
|
||||||
} else if (s->got_extra_bits &&
|
} else if (s->got_extra_bits &&
|
||||||
@ -563,8 +564,10 @@ static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb,
|
|||||||
L2 = L + ((s->decorr[i].weightA * A + 512) >> 10);
|
L2 = L + ((s->decorr[i].weightA * A + 512) >> 10);
|
||||||
R2 = R + ((s->decorr[i].weightB * B + 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 (A && L)
|
||||||
if (B && R) s->decorr[i].weightB -= ((((R ^ B) >> 30) & 2) - 1) * s->decorr[i].delta;
|
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].samplesA[j] = L = L2;
|
||||||
s->decorr[i].samplesB[j] = R = R2;
|
s->decorr[i].samplesB[j] = R = R2;
|
||||||
} else if (t == -1) {
|
} else if (t == -1) {
|
||||||
@ -699,7 +702,6 @@ static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb,
|
|||||||
|
|
||||||
static av_cold int wv_alloc_frame_context(WavpackContext *c)
|
static av_cold int wv_alloc_frame_context(WavpackContext *c)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (c->fdec_num == WV_MAX_FRAME_DECODERS)
|
if (c->fdec_num == WV_MAX_FRAME_DECODERS)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
@ -723,12 +725,12 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx)
|
|||||||
else
|
else
|
||||||
avctx->sample_fmt = AV_SAMPLE_FMT_S32;
|
avctx->sample_fmt = AV_SAMPLE_FMT_S32;
|
||||||
if (avctx->channels <= 2 && !avctx->channel_layout)
|
if (avctx->channels <= 2 && !avctx->channel_layout)
|
||||||
avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO :
|
avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO
|
||||||
AV_CH_LAYOUT_MONO;
|
: AV_CH_LAYOUT_MONO;
|
||||||
|
|
||||||
s->multichannel = avctx->channels > 2;
|
s->multichannel = avctx->channels > 2;
|
||||||
/* lavf demuxer does not provide extradata, Matroska stores 0x403
|
/* lavf demuxer does not provide extradata, Matroska stores 0x403
|
||||||
there, use this to detect decoding mode for multichannel */
|
* there, use this to detect decoding mode for multichannel */
|
||||||
s->mkv_mode = 0;
|
s->mkv_mode = 0;
|
||||||
if (s->multichannel && avctx->extradata && avctx->extradata_size == 2) {
|
if (s->multichannel && avctx->extradata && avctx->extradata_size == 2) {
|
||||||
int ver = AV_RL16(avctx->extradata);
|
int ver = AV_RL16(avctx->extradata);
|
||||||
@ -780,7 +782,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
|
|
||||||
s = wc->fdec[block_no];
|
s = wc->fdec[block_no];
|
||||||
if (!s) {
|
if (!s) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Context for block %d is not present\n", block_no);
|
av_log(avctx, AV_LOG_ERROR, "Context for block %d is not present\n",
|
||||||
|
block_no);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -791,7 +794,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
s->got_extra_bits = 0;
|
s->got_extra_bits = 0;
|
||||||
|
|
||||||
if (!wc->mkv_mode) {
|
if (!wc->mkv_mode) {
|
||||||
s->samples = AV_RL32(buf); buf += 4;
|
s->samples = AV_RL32(buf);
|
||||||
|
buf += 4;
|
||||||
if (!s->samples) {
|
if (!s->samples) {
|
||||||
*got_frame_ptr = 0;
|
*got_frame_ptr = 0;
|
||||||
return 0;
|
return 0;
|
||||||
@ -799,7 +803,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
} else {
|
} else {
|
||||||
s->samples = wc->samples;
|
s->samples = wc->samples;
|
||||||
}
|
}
|
||||||
s->frame_flags = AV_RL32(buf); buf += 4;
|
s->frame_flags = AV_RL32(buf);
|
||||||
|
buf += 4;
|
||||||
bpp = av_get_bytes_per_sample(avctx->sample_fmt);
|
bpp = av_get_bytes_per_sample(avctx->sample_fmt);
|
||||||
samples = (uint8_t *)samples + bpp * wc->ch_offset;
|
samples = (uint8_t *)samples + bpp * wc->ch_offset;
|
||||||
orig_bpp = ((s->frame_flags & 0x03) + 1) << 3;
|
orig_bpp = ((s->frame_flags & 0x03) + 1) << 3;
|
||||||
@ -812,7 +817,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
s->post_shift = bpp * 8 - orig_bpp + ((s->frame_flags >> 13) & 0x1f);
|
s->post_shift = bpp * 8 - orig_bpp + ((s->frame_flags >> 13) & 0x1f);
|
||||||
s->hybrid_maxclip = ((1LL << (orig_bpp - 1)) - 1);
|
s->hybrid_maxclip = ((1LL << (orig_bpp - 1)) - 1);
|
||||||
s->hybrid_minclip = ((-1LL << (orig_bpp - 1)));
|
s->hybrid_minclip = ((-1LL << (orig_bpp - 1)));
|
||||||
s->CRC = AV_RL32(buf); buf += 4;
|
s->CRC = AV_RL32(buf);
|
||||||
|
buf += 4;
|
||||||
if (wc->mkv_mode)
|
if (wc->mkv_mode)
|
||||||
buf += 4; // skip block size;
|
buf += 4; // skip block size;
|
||||||
|
|
||||||
@ -831,11 +837,13 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
if (id & WP_IDF_ODD)
|
if (id & WP_IDF_ODD)
|
||||||
size--;
|
size--;
|
||||||
if (size < 0) {
|
if (size < 0) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Got incorrect block %02X with size %i\n", id, size);
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
|
"Got incorrect block %02X with size %i\n", id, size);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (buf + ssize > buf_end) {
|
if (buf + ssize > buf_end) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Block size %i is out of bounds\n", size);
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
|
"Block size %i is out of bounds\n", size);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (id & WP_IDF_IGNORE) {
|
if (id & WP_IDF_IGNORE) {
|
||||||
@ -893,23 +901,31 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
t = 0;
|
t = 0;
|
||||||
for (i = s->terms - 1; (i >= 0) && (t < size); i--) {
|
for (i = s->terms - 1; (i >= 0) && (t < size); i--) {
|
||||||
if (s->decorr[i].value > 8) {
|
if (s->decorr[i].value > 8) {
|
||||||
s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2;
|
s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf));
|
||||||
s->decorr[i].samplesA[1] = wp_exp2(AV_RL16(buf)); buf += 2;
|
buf += 2;
|
||||||
|
s->decorr[i].samplesA[1] = wp_exp2(AV_RL16(buf));
|
||||||
|
buf += 2;
|
||||||
if (s->stereo_in) {
|
if (s->stereo_in) {
|
||||||
s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2;
|
s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf));
|
||||||
s->decorr[i].samplesB[1] = wp_exp2(AV_RL16(buf)); buf += 2;
|
buf += 2;
|
||||||
|
s->decorr[i].samplesB[1] = wp_exp2(AV_RL16(buf));
|
||||||
|
buf += 2;
|
||||||
t += 4;
|
t += 4;
|
||||||
}
|
}
|
||||||
t += 4;
|
t += 4;
|
||||||
} else if (s->decorr[i].value < 0) {
|
} else if (s->decorr[i].value < 0) {
|
||||||
s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2;
|
s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf));
|
||||||
s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2;
|
buf += 2;
|
||||||
|
s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf));
|
||||||
|
buf += 2;
|
||||||
t += 4;
|
t += 4;
|
||||||
} else {
|
} else {
|
||||||
for (j = 0; j < s->decorr[i].value; j++) {
|
for (j = 0; j < s->decorr[i].value; j++) {
|
||||||
s->decorr[i].samplesA[j] = wp_exp2(AV_RL16(buf)); buf += 2;
|
s->decorr[i].samplesA[j] = wp_exp2(AV_RL16(buf));
|
||||||
|
buf += 2;
|
||||||
if (s->stereo_in) {
|
if (s->stereo_in) {
|
||||||
s->decorr[i].samplesB[j] = wp_exp2(AV_RL16(buf)); buf += 2;
|
s->decorr[i].samplesB[j] = wp_exp2(AV_RL16(buf));
|
||||||
|
buf += 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
t += s->decorr[i].value * 2 * (s->stereo_in + 1);
|
t += s->decorr[i].value * 2 * (s->stereo_in + 1);
|
||||||
@ -919,17 +935,17 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
break;
|
break;
|
||||||
case WP_ID_ENTROPY:
|
case WP_ID_ENTROPY:
|
||||||
if (size != 6 * (s->stereo_in + 1)) {
|
if (size != 6 * (s->stereo_in + 1)) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Entropy vars size should be %i, "
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
"got %i", 6 * (s->stereo_in + 1), size);
|
"Entropy vars size should be %i, got %i",
|
||||||
|
6 * (s->stereo_in + 1), size);
|
||||||
buf += ssize;
|
buf += ssize;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
for (j = 0; j <= s->stereo_in; j++) {
|
for (j = 0; j <= s->stereo_in; j++)
|
||||||
for (i = 0; i < 3; i++) {
|
for (i = 0; i < 3; i++) {
|
||||||
s->ch[j].median[i] = wp_exp2(AV_RL16(buf));
|
s->ch[j].median[i] = wp_exp2(AV_RL16(buf));
|
||||||
buf += 2;
|
buf += 2;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
got_entropy = 1;
|
got_entropy = 1;
|
||||||
break;
|
break;
|
||||||
case WP_ID_HYBRID:
|
case WP_ID_HYBRID:
|
||||||
@ -958,7 +974,9 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
break;
|
break;
|
||||||
case WP_ID_INT32INFO:
|
case WP_ID_INT32INFO:
|
||||||
if (size != 4) {
|
if (size != 4) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Invalid INT32INFO, size = %i, sent_bits = %i\n", size, *buf);
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
|
"Invalid INT32INFO, size = %i, sent_bits = %i\n",
|
||||||
|
size, *buf);
|
||||||
buf += ssize;
|
buf += ssize;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -974,8 +992,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
s->shift = buf[3];
|
s->shift = buf[3];
|
||||||
}
|
}
|
||||||
/* original WavPack decoder forces 32-bit lossy sound to be treated
|
/* original WavPack decoder forces 32-bit lossy sound to be treated
|
||||||
* as 24-bit one in order to have proper clipping
|
* as 24-bit one in order to have proper clipping */
|
||||||
*/
|
|
||||||
if (s->hybrid && bpp == 4 && s->post_shift < 8 && s->shift > 8) {
|
if (s->hybrid && bpp == 4 && s->post_shift < 8 && s->shift > 8) {
|
||||||
s->post_shift += 8;
|
s->post_shift += 8;
|
||||||
s->shift -= 8;
|
s->shift -= 8;
|
||||||
@ -986,7 +1003,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
break;
|
break;
|
||||||
case WP_ID_FLOATINFO:
|
case WP_ID_FLOATINFO:
|
||||||
if (size != 4) {
|
if (size != 4) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Invalid FLOATINFO, size = %i\n", size);
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
|
"Invalid FLOATINFO, size = %i\n", size);
|
||||||
buf += ssize;
|
buf += ssize;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -1020,15 +1038,24 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
break;
|
break;
|
||||||
case WP_ID_CHANINFO:
|
case WP_ID_CHANINFO:
|
||||||
if (size <= 1) {
|
if (size <= 1) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Insufficient channel information\n");
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
|
"Insufficient channel information\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
chan = *buf++;
|
chan = *buf++;
|
||||||
switch (size - 2) {
|
switch (size - 2) {
|
||||||
case 0: chmask = *buf; break;
|
case 0:
|
||||||
case 1: chmask = AV_RL16(buf); break;
|
chmask = *buf;
|
||||||
case 2: chmask = AV_RL24(buf); break;
|
break;
|
||||||
case 3: chmask = AV_RL32(buf); break;
|
case 1:
|
||||||
|
chmask = AV_RL16(buf);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
chmask = AV_RL24(buf);
|
||||||
|
break;
|
||||||
|
case 3:
|
||||||
|
chmask = AV_RL32(buf);
|
||||||
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
chan |= (buf[1] & 0xF) << 8;
|
chan |= (buf[1] & 0xF) << 8;
|
||||||
chmask = AV_RL24(buf + 2);
|
chmask = AV_RL24(buf + 2);
|
||||||
@ -1040,9 +1067,10 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
|
|||||||
chmask = avctx->channel_layout;
|
chmask = avctx->channel_layout;
|
||||||
}
|
}
|
||||||
if (chan != avctx->channels) {
|
if (chan != avctx->channels) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Block reports total %d channels, "
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
"decoder believes it's %d channels\n", chan,
|
"Block reports total %d channels, "
|
||||||
avctx->channels);
|
"decoder believes it's %d channels\n",
|
||||||
|
chan, avctx->channels);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
if (!avctx->channel_layout)
|
if (!avctx->channel_layout)
|
||||||
@ -1177,7 +1205,8 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
|
|
||||||
/* determine number of samples */
|
/* determine number of samples */
|
||||||
if (s->mkv_mode) {
|
if (s->mkv_mode) {
|
||||||
s->samples = AV_RL32(buf); buf += 4;
|
s->samples = AV_RL32(buf);
|
||||||
|
buf += 4;
|
||||||
frame_flags = AV_RL32(buf);
|
frame_flags = AV_RL32(buf);
|
||||||
} else {
|
} else {
|
||||||
if (s->multichannel) {
|
if (s->multichannel) {
|
||||||
@ -1215,7 +1244,9 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
frame_size = buf_size;
|
frame_size = buf_size;
|
||||||
} else {
|
} else {
|
||||||
if (!s->mkv_mode) {
|
if (!s->mkv_mode) {
|
||||||
frame_size = AV_RL32(buf) - 12; buf += 4; buf_size -= 4;
|
frame_size = AV_RL32(buf) - 12;
|
||||||
|
buf += 4;
|
||||||
|
buf_size -= 4;
|
||||||
} else {
|
} else {
|
||||||
if (buf_size < 12) // MKV files can have zero flags after last block
|
if (buf_size < 12) // MKV files can have zero flags after last block
|
||||||
break;
|
break;
|
||||||
@ -1223,8 +1254,9 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (frame_size < 0 || frame_size > buf_size) {
|
if (frame_size < 0 || frame_size > buf_size) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Block %d has invalid size (size %d "
|
av_log(avctx, AV_LOG_ERROR,
|
||||||
"vs. %d bytes left)\n", s->block, frame_size, buf_size);
|
"Block %d has invalid size (size %d vs. %d bytes left)\n",
|
||||||
|
s->block, frame_size, buf_size);
|
||||||
wavpack_decode_flush(avctx);
|
wavpack_decode_flush(avctx);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
@ -1235,7 +1267,8 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
s->block++;
|
s->block++;
|
||||||
buf += frame_size; buf_size -= frame_size;
|
buf += frame_size;
|
||||||
|
buf_size -= frame_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
return avpkt->size;
|
return avpkt->size;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user