virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

libmp3lame: improve error handling in MP3lame_encode_init()

Browse Source
This commit is contained in:
Justin Ruggles 2012-02-16 22:12:03 -05:00
parent 310c372e12
commit 8dad25ebf7
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavcodec/libmp3lame.c
View File

@ -40,15 +40,27 @@ typedef struct Mp3AudioContext {
int reservoir; int reservoir;
} Mp3AudioContext; } Mp3AudioContext;
static av_cold int MP3lame_encode_init(AVCodecContext *avctx)
static av_cold int MP3lame_encode_close(AVCodecContext *avctx)
{ {
Mp3AudioContext *s = avctx->priv_data; Mp3AudioContext *s = avctx->priv_data;
av_freep(&avctx->coded_frame);
lame_close(s->gfp);
return 0;
}
static av_cold int MP3lame_encode_init(AVCodecContext *avctx)
{
Mp3AudioContext *s = avctx->priv_data;
int ret;
if (avctx->channels > 2) if (avctx->channels > 2)
return -1; return AVERROR(EINVAL);
if ((s->gfp = lame_init()) == NULL) if ((s->gfp = lame_init()) == NULL)
goto err; return AVERROR(ENOMEM);
lame_set_in_samplerate(s->gfp, avctx->sample_rate); lame_set_in_samplerate(s->gfp, avctx->sample_rate);
lame_set_out_samplerate(s->gfp, avctx->sample_rate); lame_set_out_samplerate(s->gfp, avctx->sample_rate);
lame_set_num_channels(s->gfp, avctx->channels); lame_set_num_channels(s->gfp, avctx->channels);
@ -66,19 +78,23 @@ static av_cold int MP3lame_encode_init(AVCodecContext *avctx)
} }
lame_set_bWriteVbrTag(s->gfp,0); lame_set_bWriteVbrTag(s->gfp,0);
lame_set_disable_reservoir(s->gfp, !s->reservoir); lame_set_disable_reservoir(s->gfp, !s->reservoir);
if (lame_init_params(s->gfp) < 0) if (lame_init_params(s->gfp) < 0) {
goto err_close; ret = -1;
goto error;
}
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 = avcodec_alloc_frame();
if (!avctx->coded_frame) {
ret = AVERROR(ENOMEM);
goto error;
}
avctx->coded_frame->key_frame = 1; avctx->coded_frame->key_frame = 1;
return 0; return 0;
error:
err_close: MP3lame_encode_close(avctx);
lame_close(s->gfp); return ret;
err:
return -1;
} }
static const int sSampleRates[] = { static const int sSampleRates[] = {
@ -198,16 +214,6 @@ static int MP3lame_encode_frame(AVCodecContext *avctx, unsigned char *frame,
return 0; return 0;
} }
static av_cold int MP3lame_encode_close(AVCodecContext *avctx)
{
Mp3AudioContext *s = avctx->priv_data;
av_freep(&avctx->coded_frame);
lame_close(s->gfp);
return 0;
}
#define OFFSET(x) offsetof(Mp3AudioContext, x) #define OFFSET(x) offsetof(Mp3AudioContext, x)
#define AE AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM #define AE AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {