diff options
author | Vladimir Voroshilov <voroshil@gmail.com> | 2009-06-06 17:40:33 +0000 |
---|---|---|
committer | Vladimir Voroshilov <voroshil@gmail.com> | 2009-06-06 17:40:33 +0000 |
commit | d4a9255699f210a0fc718d9eb27a04ef8a223469 (patch) | |
tree | c59e3ae1ca1b9ae4aa147c91f7dcfe79e2ec0e56 /libavcodec/g729dec.c | |
parent | a52dc730cf935dc9f9e68c483f9230c36bc41e73 (diff) | |
download | ffmpeg-streaming-d4a9255699f210a0fc718d9eb27a04ef8a223469.zip ffmpeg-streaming-d4a9255699f210a0fc718d9eb27a04ef8a223469.tar.gz |
K&R formatting of already submitted G.729 code
Originally committed as revision 19127 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/g729dec.c')
-rw-r--r-- | libavcodec/g729dec.c | 56 |
1 files changed, 21 insertions, 35 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index b92ca1d..4988297 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -71,8 +71,7 @@ */ #define SHARP_MAX 13017 -typedef struct -{ +typedef struct { int sample_rate; uint8_t packed_frame_size; ///< input frame size(in bytes) uint8_t unpacked_frame_size;///< output frame size (in bytes) @@ -98,53 +97,40 @@ static inline int get_parity(uint8_t value) return (0x6996966996696996ULL >> (value >> 2)) & 1; } - if(avctx->channels != 1) - { + if (avctx->channels != 1) { av_log(avctx, AV_LOG_ERROR, "Only mono sound is supported (requested channels: %d).\n", avctx->channels); return AVERROR_NOFMT; } - ff_acelp_weighted_vector_sum( - fc + pitch_delay_int[i], - fc + pitch_delay_int[i], - fc, - 1 << 14, - av_clip(ctx->gain_pitch, SHARP_MIN, SHARP_MAX), - 0, - 14, - ctx->subframe_size - pitch_delay_int[i]); - - if(ctx->frame_erasure) - { - ctx->gain_pitch = (29491 * ctx->gain_pitch) >> 15; // 0.9 (0.15) - ctx->gain_code = (2007 * ctx->gain_code) >> 11; // 0.98 in (0.11) + ff_acelp_weighted_vector_sum(fc + pitch_delay_int[i], + fc + pitch_delay_int[i], + fc, 1 << 14, + av_clip(ctx->gain_pitch, SHARP_MIN, SHARP_MAX), + 0, 14, + ctx->subframe_size - pitch_delay_int[i]); + + if (ctx->frame_erasure) { + ctx->gain_pitch = (29491 * ctx->gain_pitch) >> 15; // 0.90 (0.15) + ctx->gain_code = ( 2007 * ctx->gain_code ) >> 11; // 0.98 (0.11) gain_corr_factor = 0; - } - else - { + } else { ctx->gain_pitch = cb_gain_1st_8k[parm->gc_1st_index[i]][0] + cb_gain_2nd_8k[parm->gc_2nd_index[i]][0]; gain_corr_factor = cb_gain_1st_8k[parm->gc_1st_index[i]][1] + cb_gain_2nd_8k[parm->gc_2nd_index[i]][1]; - ff_acelp_weighted_vector_sum( - ctx->exc + i * ctx->subframe_size, - ctx->exc + i * ctx->subframe_size, - fc, - (!voicing && ctx->frame_erasure) ? 0 : ctx->gain_pitch, - ( voicing && ctx->frame_erasure) ? 0 : ctx->gain_code, - 1<<13, - 14, - ctx->subframe_size); - - if (buf_size<packed_frame_size) - { + ff_acelp_weighted_vector_sum(ctx->exc + i * ctx->subframe_size, + ctx->exc + i * ctx->subframe_size, fc, + (!voicing && ctx->frame_erasure) ? 0 : ctx->gain_pitch, + ( voicing && ctx->frame_erasure) ? 0 : ctx->gain_code, + 1<<13, 14, ctx->subframe_size); + + if (buf_size < packed_frame_size) { av_log(avctx, AV_LOG_ERROR, "Error processing packet: packet size too small\n"); return AVERROR(EIO); } - if (*data_size<unpacked_frame_size) - { + if (*data_size < unpacked_frame_size) { av_log(avctx, AV_LOG_ERROR, "Error processing packet: output buffer too small\n"); return AVERROR(EIO); } |