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

als: consistent messages 

"." for warnings, "!" for errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Thilo Borgmann 2012-03-26 15:24:45 +02:00 committed by Michael Niedermayer
parent 3f26a87488
commit 5afd9a80db
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/alsdec.c
View File

@ -700,7 +700,7 @@ static int read_var_block_data(ALSDecContext *ctx, ALSBlockData *bd)
int offset = parcor_rice_table[sconf->coef_table][k][0]; int offset = parcor_rice_table[sconf->coef_table][k][0];
quant_cof[k] = decode_rice(gb, rice_param) + offset; quant_cof[k] = decode_rice(gb, rice_param) + offset;
if (quant_cof[k] < -64 || quant_cof[k] > 63) { if (quant_cof[k] < -64 || quant_cof[k] > 63) {
av_log(avctx, AV_LOG_ERROR, "Quantization coefficient %d is out of range.\n", quant_cof[k]); av_log(avctx, AV_LOG_ERROR, "Quantization coefficient %d is out of range!\n", quant_cof[k]);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
} }
@ -1130,7 +1130,7 @@ static int decode_blocks(ALSDecContext *ctx, unsigned int ra_frame,
// reconstruct joint-stereo blocks // reconstruct joint-stereo blocks
if (bd[0].js_blocks) { if (bd[0].js_blocks) {
if (bd[1].js_blocks) if (bd[1].js_blocks)
av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel pair!\n"); av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel pair.\n");
for (s = 0; s < div_blocks[b]; s++) for (s = 0; s < div_blocks[b]; s++)
bd[0].raw_samples[s] = bd[1].raw_samples[s] - bd[0].raw_samples[s]; bd[0].raw_samples[s] = bd[1].raw_samples[s] - bd[0].raw_samples[s];
@ -1224,7 +1224,7 @@ static int revert_channel_correlation(ALSDecContext *ctx, ALSBlockData *bd,
} }
if (dep == channels) { if (dep == channels) {
av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel correlation!\n"); av_log(ctx->avctx, AV_LOG_WARNING, "Invalid channel correlation.\n");
return -1; return -1;
} }
@ -1530,7 +1530,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
// check CRC sums if this is the last frame // check CRC sums if this is the last frame
if (ctx->cur_frame_length != sconf->frame_length && if (ctx->cur_frame_length != sconf->frame_length &&
ctx->crc_org != ctx->crc) { ctx->crc_org != ctx->crc) {
av_log(avctx, AV_LOG_ERROR, "CRC error.\n"); av_log(avctx, AV_LOG_ERROR, "CRC error!\n");
} }
} }
@ -1592,12 +1592,12 @@ static av_cold int decode_init(AVCodecContext *avctx)
ctx->avctx = avctx; ctx->avctx = avctx;
if (!avctx->extradata) { if (!avctx->extradata) {
av_log(avctx, AV_LOG_ERROR, "Missing required ALS extradata.\n"); av_log(avctx, AV_LOG_ERROR, "Missing required ALS extradata!\n");
return -1; return -1;
} }
if (read_specific_config(ctx)) { if (read_specific_config(ctx)) {
av_log(avctx, AV_LOG_ERROR, "Reading ALSSpecificConfig failed.\n"); av_log(avctx, AV_LOG_ERROR, "Reading ALSSpecificConfig failed!\n");
decode_end(avctx); decode_end(avctx);
return -1; return -1;
} }
@ -1643,7 +1643,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (!ctx->quant_cof || !ctx->lpc_cof || if (!ctx->quant_cof || !ctx->lpc_cof ||
!ctx->quant_cof_buffer || !ctx->lpc_cof_buffer || !ctx->quant_cof_buffer || !ctx->lpc_cof_buffer ||
!ctx->lpc_cof_reversed_buffer) { !ctx->lpc_cof_reversed_buffer) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed!\n");
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -1668,7 +1668,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
!ctx->opt_order || !ctx->store_prev_samples || !ctx->opt_order || !ctx->store_prev_samples ||
!ctx->use_ltp || !ctx->ltp_lag || !ctx->use_ltp || !ctx->ltp_lag ||
!ctx->ltp_gain || !ctx->ltp_gain_buffer) { !ctx->ltp_gain || !ctx->ltp_gain_buffer) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed!\n");
decode_end(avctx); decode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -1686,7 +1686,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
num_buffers); num_buffers);
if (!ctx->chan_data_buffer || !ctx->chan_data || !ctx->reverted_channels) { if (!ctx->chan_data_buffer || !ctx->chan_data || !ctx->reverted_channels) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed!\n");
decode_end(avctx); decode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -1707,7 +1707,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
// allocate previous raw sample buffer // allocate previous raw sample buffer
if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) { if (!ctx->prev_raw_samples || !ctx->raw_buffer|| !ctx->raw_samples) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed!\n");
decode_end(avctx); decode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
@ -1725,7 +1725,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->channels * avctx->channels *
av_get_bytes_per_sample(avctx->sample_fmt)); av_get_bytes_per_sample(avctx->sample_fmt));
if (!ctx->crc_buffer) { if (!ctx->crc_buffer) {
av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed!\n");
decode_end(avctx); decode_end(avctx);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }