diff options
author | Steve L'Homme <slhomme@divxcorp.com> | 2006-11-01 21:09:14 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2006-11-01 21:09:14 +0000 |
commit | e344c1ea36f228e2987e25327638771c4cedcd33 (patch) | |
tree | a455108c2e273a4791ef8cbd9b334160330121fe /libavcodec/mp3lameaudio.c | |
parent | 484267f3d3d1d47c9a0541316b33beca5a36b2d1 (diff) | |
download | ffmpeg-e344c1ea36f228e2987e25327638771c4cedcd33.tar.gz |
reindentation, patch by From: Steve Lhomme, slhomme divxcorp com
Originally committed as revision 6864 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mp3lameaudio.c')
-rw-r--r-- | libavcodec/mp3lameaudio.c | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/libavcodec/mp3lameaudio.c b/libavcodec/mp3lameaudio.c index 236d1b8622..e4806e758a 100644 --- a/libavcodec/mp3lameaudio.c +++ b/libavcodec/mp3lameaudio.c @@ -30,51 +30,51 @@ #define BUFFER_SIZE (2*MPA_FRAME_SIZE) typedef struct Mp3AudioContext { - lame_global_flags *gfp; - int stereo; - uint8_t buffer[BUFFER_SIZE]; - int buffer_index; + lame_global_flags *gfp; + int stereo; + uint8_t buffer[BUFFER_SIZE]; + int buffer_index; } Mp3AudioContext; static int MP3lame_encode_init(AVCodecContext *avctx) { - Mp3AudioContext *s = avctx->priv_data; - - if (avctx->channels > 2) - return -1; - - s->stereo = avctx->channels > 1 ? 1 : 0; - - if ((s->gfp = lame_init()) == NULL) - goto err; - lame_set_in_samplerate(s->gfp, avctx->sample_rate); - lame_set_out_samplerate(s->gfp, avctx->sample_rate); - lame_set_num_channels(s->gfp, avctx->channels); - /* lame 3.91 dies on quality != 5 */ - lame_set_quality(s->gfp, 5); - /* lame 3.91 doesn't work in mono */ - lame_set_mode(s->gfp, JOINT_STEREO); - lame_set_brate(s->gfp, avctx->bit_rate/1000); + Mp3AudioContext *s = avctx->priv_data; + + if (avctx->channels > 2) + return -1; + + s->stereo = avctx->channels > 1 ? 1 : 0; + + if ((s->gfp = lame_init()) == NULL) + goto err; + lame_set_in_samplerate(s->gfp, avctx->sample_rate); + lame_set_out_samplerate(s->gfp, avctx->sample_rate); + lame_set_num_channels(s->gfp, avctx->channels); + /* lame 3.91 dies on quality != 5 */ + lame_set_quality(s->gfp, 5); + /* lame 3.91 doesn't work in mono */ + lame_set_mode(s->gfp, JOINT_STEREO); + lame_set_brate(s->gfp, avctx->bit_rate/1000); if(avctx->flags & CODEC_FLAG_QSCALE) { lame_set_brate(s->gfp, 0); lame_set_VBR(s->gfp, vbr_default); lame_set_VBR_q(s->gfp, avctx->global_quality / (float)FF_QP2LAMBDA); } - lame_set_bWriteVbrTag(s->gfp,0); - if (lame_init_params(s->gfp) < 0) - goto err_close; + lame_set_bWriteVbrTag(s->gfp,0); + if (lame_init_params(s->gfp) < 0) + goto err_close; - avctx->frame_size = lame_get_framesize(s->gfp); + avctx->frame_size = lame_get_framesize(s->gfp); - avctx->coded_frame= avcodec_alloc_frame(); - avctx->coded_frame->key_frame= 1; + avctx->coded_frame= avcodec_alloc_frame(); + avctx->coded_frame->key_frame= 1; - return 0; + return 0; err_close: - lame_close(s->gfp); + lame_close(s->gfp); err: - return -1; + return -1; } static const int sSampleRates[3] = { @@ -138,11 +138,11 @@ static int mp3len(void *data, int *samplesPerFrame, int *sampleRate) int MP3lame_encode_frame(AVCodecContext *avctx, unsigned char *frame, int buf_size, void *data) { - Mp3AudioContext *s = avctx->priv_data; - int len; - int lame_result; + Mp3AudioContext *s = avctx->priv_data; + int len; + int lame_result; - /* lame 3.91 dies on '1-channel interleaved' data */ + /* lame 3.91 dies on '1-channel interleaved' data */ if(data){ if (s->stereo) { @@ -200,12 +200,12 @@ int MP3lame_encode_frame(AVCodecContext *avctx, int MP3lame_encode_close(AVCodecContext *avctx) { - Mp3AudioContext *s = avctx->priv_data; + Mp3AudioContext *s = avctx->priv_data; - av_freep(&avctx->coded_frame); + av_freep(&avctx->coded_frame); - lame_close(s->gfp); - return 0; + lame_close(s->gfp); + return 0; } |