summaryrefslogtreecommitdiff
path: root/libavcodec/libfaac.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-02-15 19:06:34 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2012-02-25 11:49:42 -0500
commit7a8cbb39f6154fb091597d28deba8d3bec38df64 (patch)
tree9fd5f64e35a283dbbb924610de93d1d7d3595b51 /libavcodec/libfaac.c
parentc9bca801324f03746757aef8549ebd26599adec2 (diff)
downloadffmpeg-7a8cbb39f6154fb091597d28deba8d3bec38df64.tar.gz
libfaac: improve error checking and handling in Faac_encode_init()
Diffstat (limited to 'libavcodec/libfaac.c')
-rw-r--r--libavcodec/libfaac.c55
1 files changed, 38 insertions, 17 deletions
diff --git a/libavcodec/libfaac.c b/libavcodec/libfaac.c
index 997aa834a4..514d2a50f0 100644
--- a/libavcodec/libfaac.c
+++ b/libavcodec/libfaac.c
@@ -31,28 +31,48 @@ typedef struct FaacAudioContext {
faacEncHandle faac_handle;
} FaacAudioContext;
+
+static av_cold int Faac_encode_close(AVCodecContext *avctx)
+{
+ FaacAudioContext *s = avctx->priv_data;
+
+ av_freep(&avctx->coded_frame);
+ av_freep(&avctx->extradata);
+
+ if (s->faac_handle)
+ faacEncClose(s->faac_handle);
+ return 0;
+}
+
static av_cold int Faac_encode_init(AVCodecContext *avctx)
{
FaacAudioContext *s = avctx->priv_data;
faacEncConfigurationPtr faac_cfg;
unsigned long samples_input, max_bytes_output;
+ int ret;
/* number of channels */
if (avctx->channels < 1 || avctx->channels > 6) {
av_log(avctx, AV_LOG_ERROR, "encoding %d channel(s) is not allowed\n", avctx->channels);
- return -1;
+ ret = AVERROR(EINVAL);
+ goto error;
}
s->faac_handle = faacEncOpen(avctx->sample_rate,
avctx->channels,
&samples_input, &max_bytes_output);
+ if (!s->faac_handle) {
+ av_log(avctx, AV_LOG_ERROR, "error in faacEncOpen()\n");
+ ret = AVERROR_UNKNOWN;
+ goto error;
+ }
/* check faac version */
faac_cfg = faacEncGetCurrentConfiguration(s->faac_handle);
if (faac_cfg->version != FAAC_CFG_VERSION) {
av_log(avctx, AV_LOG_ERROR, "wrong libfaac version (compiled for: %d, using %d)\n", FAAC_CFG_VERSION, faac_cfg->version);
- faacEncClose(s->faac_handle);
- return -1;
+ ret = AVERROR(EINVAL);
+ goto error;
}
/* put the options in the configuration struct */
@@ -72,8 +92,8 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
break;
default:
av_log(avctx, AV_LOG_ERROR, "invalid AAC profile\n");
- faacEncClose(s->faac_handle);
- return -1;
+ ret = AVERROR(EINVAL);
+ goto error;
}
faac_cfg->mpegVersion = MPEG4;
faac_cfg->useTns = 0;
@@ -90,6 +110,10 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
avctx->frame_size = samples_input / avctx->channels;
avctx->coded_frame= avcodec_alloc_frame();
+ if (!avctx->coded_frame) {
+ ret = AVERROR(ENOMEM);
+ goto error;
+ }
/* Set decoder specific info */
avctx->extradata_size = 0;
@@ -101,6 +125,10 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
if (!faacEncGetDecoderSpecificInfo(s->faac_handle, &buffer,
&decoder_specific_info_size)) {
avctx->extradata = av_malloc(decoder_specific_info_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ if (!avctx->extradata) {
+ ret = AVERROR(ENOMEM);
+ goto error;
+ }
avctx->extradata_size = decoder_specific_info_size;
memcpy(avctx->extradata, buffer, avctx->extradata_size);
faac_cfg->outputFormat = 0;
@@ -112,10 +140,14 @@ static av_cold int Faac_encode_init(AVCodecContext *avctx)
if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) {
av_log(avctx, AV_LOG_ERROR, "libfaac doesn't support this output format!\n");
- return -1;
+ ret = AVERROR(EINVAL);
+ goto error;
}
return 0;
+error:
+ Faac_encode_close(avctx);
+ return ret;
}
static int Faac_encode_frame(AVCodecContext *avctx,
@@ -134,17 +166,6 @@ static int Faac_encode_frame(AVCodecContext *avctx,
return bytes_written;
}
-static av_cold int Faac_encode_close(AVCodecContext *avctx)
-{
- FaacAudioContext *s = avctx->priv_data;
-
- av_freep(&avctx->coded_frame);
- av_freep(&avctx->extradata);
-
- faacEncClose(s->faac_handle);
- return 0;
-}
-
static const AVProfile profiles[] = {
{ FF_PROFILE_AAC_MAIN, "Main" },
{ FF_PROFILE_AAC_LOW, "LC" },