diff --git a/Makefile b/Makefile index ad2ee9e203..441dea1645 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,10 @@ EXTRALIBS += -lfaad endif endif +ifeq ($(CONFIG_FAAC),yes) +EXTRALIBS+=-lfaac +endif + ifeq ($(BUILD_VHOOK),yes) VHOOK=videohook INSTALLVHOOK=install-vhook diff --git a/configure b/configure index 7bab964dd5..15a66b61d3 100755 --- a/configure +++ b/configure @@ -71,6 +71,7 @@ mp3lame="no" vorbis="no" faad="no" faadbin="no" +faac="no" a52="no" a52bin="no" pp="no" @@ -323,6 +324,8 @@ for opt do ;; --enable-faadbin) faadbin="yes" ;; + --enable-faac) faac="yes" + ;; --disable-vhook) vhook="no" ;; --disable-simple_idct) simpleidct="no" @@ -764,6 +767,7 @@ echo " --enable-mp3lame enable mp3 encoding via libmp3lame [default=no] echo " --enable-vorbis enable vorbis support via libvorbisenc [default=no]" echo " --enable-faad enable faad support via libfaad [default=no]" echo " --enable-faadbin build faad support with runtime linking [default=no]" +echo " --enable-faac enable faac support via libfaac [default=no]" echo " --enable-mingw32 enable mingw32 native/cross windows compile" echo " --enable-a52 enable GPL'ed A52 support [default=no]" echo " --enable-a52bin open liba52.so.0 at runtime [default=no]" @@ -831,6 +835,7 @@ echo "mp3lame enabled $mp3lame" echo "vorbis enabled $vorbis" echo "faad enabled $faad" echo "faadbin enabled $faadbin" +echo "faac enabled $faac" echo "a52 support $a52" echo "a52 dlopened $a52bin" echo "pp support $pp" @@ -1062,6 +1067,11 @@ if test "$faadbin" = "yes" ; then echo "CONFIG_FAADBIN=yes" >> config.mak fi +if test "$faac" = "yes" ; then + echo "#define CONFIG_FAAC 1" >> $TMPH + echo "CONFIG_FAAC=yes" >> config.mak +fi + if test "$mingw32" = "yes" ; then echo "#define CONFIG_WIN32 1" >> $TMPH echo "CONFIG_WIN32=yes" >> config.mak diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 6da467dcac..eb1bf0fb58 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -72,6 +72,11 @@ EXTRALIBS += -lfaad endif endif +ifeq ($(CONFIG_FAAC),yes) +OBJS+= faac.o +EXTRALIBS += -lfaac +endif + ifeq ($(CONFIG_PP),yes) ifeq ($(SHARED_PP),yes) EXTRALIBS += -lpostproc diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index ea4ae601d8..ca6f5002e8 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -48,6 +48,9 @@ void avcodec_register_all(void) #ifdef CONFIG_VORBIS register_avcodec(&oggvorbis_encoder); register_avcodec(&oggvorbis_decoder); +#endif +#ifdef CONFIG_FAAC + register_avcodec(&faac_encoder); #endif register_avcodec(&mpeg1video_encoder); // register_avcodec(&h264_encoder); diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 32227f4932..a1e7e4e076 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1361,6 +1361,7 @@ extern AVCodec ac3_encoder; extern AVCodec mp2_encoder; extern AVCodec mp3lame_encoder; extern AVCodec oggvorbis_encoder; +extern AVCodec faac_encoder; extern AVCodec mpeg1video_encoder; extern AVCodec mpeg2video_encoder; extern AVCodec h263_encoder; diff --git a/libavcodec/faac.c b/libavcodec/faac.c new file mode 100644 index 0000000000..9720166e42 --- /dev/null +++ b/libavcodec/faac.c @@ -0,0 +1,126 @@ +/* + * Interface to libfaac for aac encoding + * Copyright (c) 2002 Gildas Bazin + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/** + * @file faacaudio.c + * Interface to libfaac for aac encoding. + */ + +#include "avcodec.h" +#include + +typedef struct FaacAudioContext { + faacEncHandle faac_handle; +} FaacAudioContext; + +static int Faac_encode_init(AVCodecContext *avctx) +{ + FaacAudioContext *s = avctx->priv_data; + faacEncConfigurationPtr faac_cfg; + unsigned long samples_input, max_bytes_output; + + /* number of channels */ + if (avctx->channels < 1 || avctx->channels > 6) + return -1; + + s->faac_handle = faacEncOpen(avctx->sample_rate, + avctx->channels, + &samples_input, &max_bytes_output); + + /* check faac version */ + faac_cfg = faacEncGetCurrentConfiguration(s->faac_handle); + if (faac_cfg->version != FAAC_CFG_VERSION) { + fprintf(stderr, "wrong libfaac version (compiled for: %d, using %d)\n", + FAAC_CFG_VERSION, faac_cfg->version ); + faacEncClose(s->faac_handle); + return -1; + } + + /* put the options in the configuration struct */ + faac_cfg->aacObjectType = LOW; + faac_cfg->mpegVersion = MPEG4; + faac_cfg->useTns = 0; + faac_cfg->allowMidside = 1; + faac_cfg->bitRate = avctx->bit_rate; + faac_cfg->outputFormat = 0; + faac_cfg->inputFormat = FAAC_INPUT_16BIT; + + if (!faacEncSetConfiguration(s->faac_handle, faac_cfg)) { + fprintf(stderr, "libfaac doesn't support this output format!\n"); + return -1; + } + + avctx->frame_size = samples_input / avctx->channels; + + avctx->coded_frame= avcodec_alloc_frame(); + avctx->coded_frame->key_frame= 1; + + /* Set decoder specific info */ + avctx->extradata_size = 0; + if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { + + unsigned char *buffer; + unsigned long decoder_specific_info_size; + + if (!faacEncGetDecoderSpecificInfo(s->faac_handle, &buffer, + &decoder_specific_info_size)) { + avctx->extradata = buffer; + avctx->extradata_size = decoder_specific_info_size; + } + } + + return 0; +} + +int Faac_encode_frame(AVCodecContext *avctx, + unsigned char *frame, int buf_size, void *data) +{ + FaacAudioContext *s = avctx->priv_data; + int bytes_written; + + bytes_written = faacEncEncode(s->faac_handle, + data, + avctx->frame_size * avctx->channels, + frame, + buf_size); + + return bytes_written; +} + +int Faac_encode_close(AVCodecContext *avctx) +{ + FaacAudioContext *s = avctx->priv_data; + + av_freep(&avctx->coded_frame); + + //if (avctx->extradata_size) free(avctx->extradata); + + faacEncClose(s->faac_handle); + return 0; +} + +AVCodec faac_encoder = { + "aac", + CODEC_TYPE_AUDIO, + CODEC_ID_AAC, + sizeof(FaacAudioContext), + Faac_encode_init, + Faac_encode_frame, + Faac_encode_close +};