Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e'

Browse Source 
* commit '0f689a3d97a1d3053ca0e9516b296909a72ff31e':
  wavpack: K&R formatting cosmetics

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/18/head
Michael Niedermayer 12 years ago
parent df07a833f1 0f689a3d97
commit 02788d2ac5
1 changed files with 159 additions and 126 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 121
      libavcodec/wavpack.c

121
libavcodec/wavpack.c
Unescape View File

@ -231,7 +231,6 @@ static av_always_inline int wp_log2(int32_t val)
} \
}
static av_always_inline int get_tail(GetBitContext *gb, int k)
{
int p, e, res;
@ -412,7 +411,8 @@ static inline int wv_get_value_integer(WavpackFrameContext *s, uint32_t *crc,
if (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);
*crc = *crc * 9 + (S & 0xffff) * 3 + ((unsigned)S >> 16);
}
@ -466,7 +466,8 @@ static float wv_get_value_float(WavpackFrameContext *s, uint32_t *crc, int S)
if (shift) {
S <<= shift;
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))) {
S |= (1 << shift) - 1;
} else if (s->got_extra_bits &&
@ -569,8 +570,10 @@ static inline int wv_unpack_stereo(WavpackFrameContext *s, GetBitContext *gb,
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;
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) {
@ -705,7 +708,6 @@ static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb,
static av_cold int wv_alloc_frame_context(WavpackContext *c)
{
if (c->fdec_num == WV_MAX_FRAME_DECODERS)
return -1;
@ -729,12 +731,12 @@ static av_cold int wavpack_decode_init(AVCodecContext *avctx)
else
avctx->sample_fmt = AV_SAMPLE_FMT_S32;
if (avctx->channels <= 2 && !avctx->channel_layout)
avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO :
AV_CH_LAYOUT_MONO;
avctx->channel_layout = (avctx->channels == 2) ? AV_CH_LAYOUT_STEREO
: AV_CH_LAYOUT_MONO;
s->multichannel = avctx->channels > 2;
/* 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;
if (s->multichannel && avctx->extradata && avctx->extradata_size == 2) {
int ver = AV_RL16(avctx->extradata);
@ -786,7 +788,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s = wc->fdec[block_no];
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;
}
@ -802,7 +805,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s->got_extra_bits = 0;
if (!wc->mkv_mode) {
s->samples = AV_RL32(buf); buf += 4;
s->samples = AV_RL32(buf);
buf += 4;
if (!s->samples) {
*got_frame_ptr = 0;
return 0;
@ -814,7 +818,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
} else {
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);
samples = (uint8_t *)samples + bpp * wc->ch_offset;
orig_bpp = ((s->frame_flags & 0x03) + 1) << 3;
@ -827,7 +832,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s->post_shift = bpp * 8 - orig_bpp + ((s->frame_flags >> 13) & 0x1f);
s->hybrid_maxclip = ((1LL << (orig_bpp - 1)) - 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)
buf += 4; // skip block size;
@ -846,11 +852,13 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
if (id & WP_IDF_ODD)
size--;
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;
}
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;
}
if (id & WP_IDF_IGNORE) {
@ -908,23 +916,31 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
t = 0;
for (i = s->terms - 1; (i >= 0) && (t < size) && buf <= buf_end; i--) {
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;
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_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;
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;
}
t += 4;
} else if (s->decorr[i].value < 0) {
s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf)); buf += 2;
s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf)); buf += 2;
s->decorr[i].samplesA[0] = wp_exp2(AV_RL16(buf));
buf += 2;
s->decorr[i].samplesB[0] = wp_exp2(AV_RL16(buf));
buf += 2;
t += 4;
} else {
for (j = 0; j < s->decorr[i].value && buf+1<buf_end; 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) {
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);
@ -934,17 +950,17 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
break;
case WP_ID_ENTROPY:
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);
av_log(avctx, AV_LOG_ERROR,
"Entropy vars size should be %i, got %i",
6 * (s->stereo_in + 1), size);
buf += ssize;
continue;
}
for (j = 0; j <= s->stereo_in; j++) {
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:
@ -973,7 +989,9 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
break;
case WP_ID_INT32INFO:
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;
continue;
}
@ -989,8 +1007,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
s->shift = buf[3];
}
/* 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) {
s->post_shift += 8;
s->shift -= 8;
@ -1001,7 +1018,8 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
break;
case WP_ID_FLOATINFO:
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;
continue;
}
@ -1035,15 +1053,24 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
break;
case WP_ID_CHANINFO:
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;
}
chan = *buf++;
switch (size - 2) {
case 0: chmask = *buf; break;
case 1: chmask = AV_RL16(buf); break;
case 2: chmask = AV_RL24(buf); break;
case 3: chmask = AV_RL32(buf); break;
case 0:
chmask = *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:
chan |= (buf[1] & 0xF) << 8;
chmask = AV_RL24(buf + 2);
@ -1055,9 +1082,10 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
chmask = avctx->channel_layout;
}
if (chan != avctx->channels) {
av_log(avctx, AV_LOG_ERROR, "Block reports total %d channels, "
"decoder believes it's %d channels\n", chan,
avctx->channels);
av_log(avctx, AV_LOG_ERROR,
"Block reports total %d channels, "
"decoder believes it's %d channels\n",
chan, avctx->channels);
return -1;
}
if (!avctx->channel_layout)
@ -1192,7 +1220,8 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
/* determine number of samples */
if (s->mkv_mode) {
s->samples = AV_RL32(buf); buf += 4;
s->samples = AV_RL32(buf);
buf += 4;
frame_flags = AV_RL32(buf);
} else {
if (s->multichannel) {
@ -1229,7 +1258,9 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
frame_size = buf_size;
} else {
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 {
if (buf_size < 12) // MKV files can have zero flags after last block
break;
@ -1237,8 +1268,9 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
}
}
if (frame_size < 0 || frame_size > buf_size) {
av_log(avctx, AV_LOG_ERROR, "Block %d has invalid size (size %d "
"vs. %d bytes left)\n", s->block, frame_size, buf_size);
av_log(avctx, AV_LOG_ERROR,
"Block %d has invalid size (size %d vs. %d bytes left)\n",
s->block, frame_size, buf_size);
wavpack_decode_flush(avctx);
return AVERROR_INVALIDDATA;
}
@ -1249,7 +1281,8 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA;
}
s->block++;
buf += frame_size; buf_size -= frame_size;
buf += frame_size;
buf_size -= frame_size;
}
return avpkt->size;

Write Preview
Loading…
Cancel
Save