RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '78f75b6fa421dd39a715588e9487579f1ce5bada' 

* commit '78f75b6fa421dd39a715588e9487579f1ce5bada':
  wavpack: extract sample rate from the bitstream
  configure: support gcc-4.8 instrumentation

Conflicts:
	libavcodec/wavpack.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-29 04:33:27 +02:00
parent 1f5e5d2205 78f75b6fa4
commit 8543575cc4
2 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -2518,6 +2518,16 @@ case "$toolchain" in
add_cflags -fsanitize=thread -pie
add_ldflags -fsanitize=thread -pie
;;
gcc-asan)
cc_default="gcc"
add_cflags -fsanitize=address
add_ldflags -fsanitize=address
;;
gcc-tsan)
cc_default="gcc"
add_cflags -fsanitize=thread -pie -fPIC
add_ldflags -fsanitize=thread -pie -fPIC
;;
valgrind-massif)
target_exec_default=${valgrind:-"valgrind"}
target_exec_args="--tool=massif --alloc-fn=av_malloc --alloc-fn=av_mallocz --alloc-fn=av_calloc --alloc-fn=av_fast_padded_malloc --alloc-fn=av_fast_malloc --alloc-fn=av_realloc_f --alloc-fn=av_fast_realloc --alloc-fn=av_realloc"

66
libavcodec/wavpack.c
View File

@ -53,7 +53,7 @@
#define WV_MAX_SAMPLES 131072
enum WP_ID_Flags {
WP_IDF_MASK = 0x1F,
WP_IDF_MASK = 0x3F,
WP_IDF_IGNORE = 0x20,
WP_IDF_ODD = 0x40,
WP_IDF_LONG = 0x80
@ -73,7 +73,8 @@ enum WP_ID {
WP_ID_DATA,
WP_ID_CORR,
WP_ID_EXTRABITS,
WP_ID_CHANINFO
WP_ID_CHANINFO,
WP_ID_SAMPLE_RATE = 0x27,
};
typedef struct SavedContext {
@ -142,6 +143,11 @@ typedef struct WavpackContext {
int ch_offset;
} WavpackContext;
static const int wv_rates[16] = {
6000, 8000, 9600, 11025, 12000, 16000, 22050, 24000,
32000, 44100, 48000, 64000, 88200, 96000, 192000, 0
};
// exponent table copied from WavPack source
static const uint8_t wp_exp2_table[256] = {
0x00, 0x01, 0x01, 0x02, 0x03, 0x03, 0x04, 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x0a, 0x0b,
@ -748,7 +754,7 @@ static av_cold int wavpack_decode_end(AVCodecContext *avctx)
}
static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
uint8_t **data, const uint8_t *buf, int buf_size)
AVFrame *frame, const uint8_t *buf, int buf_size)
{
WavpackContext *wc = avctx->priv_data;
WavpackFrameContext *s;
@ -758,7 +764,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
int got_terms = 0, got_weights = 0, got_samples = 0,
got_entropy = 0, got_bs = 0, got_float = 0, got_hybrid = 0;
int i, j, id, size, ssize, weights, t;
int bpp, chan, chmask, orig_bpp;
int bpp, chan, chmask, orig_bpp, sample_rate = 0;
if (block_no >= wc->fdec_num && wv_alloc_frame_context(wc) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error creating frame decode context\n");
@ -805,12 +811,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
return -1;
}
samples_l = data[wc->ch_offset];
if (s->stereo)
samples_r = data[wc->ch_offset + 1];
wc->ch_offset += 1 + s->stereo;
// parse metadata blocks
while (bytestream2_get_bytes_left(&gb)) {
id = bytestream2_get_byte(&gb);
@ -833,10 +833,6 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
"Block size %i is out of bounds\n", size);
break;
}
if (id & WP_IDF_IGNORE) {
bytestream2_skip(&gb, ssize);
continue;
}
switch (id & WP_IDF_MASK) {
case WP_ID_DECTERMS:
if (size > MAX_TERMS) {
@ -1064,6 +1060,13 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
if (!avctx->channel_layout)
avctx->channel_layout = chmask;
break;
case WP_ID_SAMPLE_RATE:
if (size != 3) {
av_log(avctx, AV_LOG_ERROR, "Invalid custom sample rate.\n");
return AVERROR_INVALIDDATA;
}
sample_rate = bytestream2_get_le24(&gb);
break;
default:
bytestream2_skip(&gb, size);
}
@ -1108,6 +1111,32 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
}
}
if (!wc->ch_offset) {
int sr = (s->frame_flags >> 23) & 0xf;
if (sr == 0xf) {
if (!sample_rate) {
av_log(avctx, AV_LOG_ERROR, "Custom sample rate missing.\n");
return AVERROR_INVALIDDATA;
}
avctx->sample_rate = sample_rate;
} else
avctx->sample_rate = wv_rates[sr];
/* get output buffer */
frame->nb_samples = s->samples + 1;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
frame->nb_samples = s->samples;
}
samples_l = frame->extended_data[wc->ch_offset];
if (s->stereo)
samples_r = frame->extended_data[wc->ch_offset + 1];
wc->ch_offset += 1 + s->stereo;
if (s->stereo_in) {
ret = wv_unpack_stereo(s, &s->gb, samples_l, samples_r, avctx->sample_fmt);
if (ret < 0)
@ -1166,12 +1195,6 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
avctx->bits_per_raw_sample = ((frame_flags & 0x03) + 1) << 3;
}
/* get output buffer */
frame->nb_samples = s->samples + 1;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
frame->nb_samples = s->samples;
while (buf_size > 0) {
if (buf_size <= WV_HEADER_SIZE)
break;
@ -1186,8 +1209,7 @@ static int wavpack_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA;
}
if ((ret = wavpack_decode_block(avctx, s->block,
frame->extended_data,
buf, frame_size)) < 0) {
frame, buf, frame_size)) < 0) {
wavpack_decode_flush(avctx);
return ret;
}