diff --git a/Changelog b/Changelog index 994ce0b59d..d56780b9c2 100644 --- a/Changelog +++ b/Changelog @@ -91,6 +91,8 @@ version : - MicroDVD subtitle file muxer and demuxer - Playstation Portable PMP format demuxer - fieldorder video filter added +- AAC encoding via libvo-aacenc +- AMR-WB encoding via libvo-amrwbenc version 0.6: diff --git a/configure b/configure index e2f805eab8..0a953bae5e 100755 --- a/configure +++ b/configure @@ -179,6 +179,8 @@ External library support: --enable-libschroedinger enable Dirac support via libschroedinger [no] --enable-libspeex enable Speex decoding via libspeex [no] --enable-libtheora enable Theora encoding via libtheora [no] + --enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no] + --enable-libvo-amrwbenc enable AMR-WB encoding via libvo-amrwbenc [no] --enable-libvorbis enable Vorbis encoding via libvorbis, native implementation exists [no] --enable-libvpx enable VP8 support via libvpx [no] @@ -942,6 +944,8 @@ CONFIG_LIST=" libschroedinger libspeex libtheora + libvo_aacenc + libvo_amrwbenc libvorbis libvpx libx264 @@ -1405,6 +1409,8 @@ libschroedinger_decoder_deps="libschroedinger" libschroedinger_encoder_deps="libschroedinger" libspeex_decoder_deps="libspeex" libtheora_encoder_deps="libtheora" +libvo_aacenc_encoder_deps="libvo_aacenc" +libvo_amrwbenc_encoder_deps="libvo_amrwbenc" libvorbis_encoder_deps="libvorbis" libvpx_decoder_deps="libvpx" libvpx_encoder_deps="libvpx" @@ -2553,6 +2559,8 @@ die_license_disabled nonfree libfaac die_license_disabled version3 libopencore_amrnb die_license_disabled version3 libopencore_amrwb +die_license_disabled version3 libvo_aacenc +die_license_disabled version3 libvo_amrwbenc enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; } @@ -2896,6 +2904,8 @@ enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg +enabled libvo_aacenc && require libvo_aacenc vo-aacenc/voAAC.h voGetAACEncAPI -lvo-aacenc +enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg enabled libvpx && { enabled libvpx_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx || @@ -3172,6 +3182,8 @@ echo "libschroedinger enabled ${libschroedinger-no}" echo "libspeex enabled ${libspeex-no}" echo "libtheora enabled ${libtheora-no}" echo "libva enabled ${vaapi-no}" +echo "libvo-aacenc support ${libvo_aacenc-no}" +echo "libvo-amrwbenc support ${libvo_amrwbenc-no}" echo "libvorbis enabled ${libvorbis-no}" echo "libvpx enabled ${libvpx-no}" echo "libx264 enabled ${libx264-no}" diff --git a/doc/general.texi b/doc/general.texi index 932e575fb6..5f75cef99c 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -540,7 +540,7 @@ following image formats are supported: @item Name @tab Encoding @tab Decoding @tab Comments @item 8SVX audio @tab @tab X @item AAC @tab E @tab X - @tab encoding supported through external library libfaac + @tab encoding supported through external library libfaac and libvo-aacenc @item AC-3 @tab IX @tab X @item ADPCM 4X Movie @tab @tab X @item ADPCM CDROM XA @tab @tab X @@ -588,7 +588,8 @@ following image formats are supported: @item ADPCM Yamaha @tab X @tab X @item AMR-NB @tab E @tab X @tab encoding supported through external library libopencore-amrnb -@item AMR-WB @tab @tab X +@item AMR-WB @tab E @tab X + @tab encoding supported through external library libvo-amrwbenc @item Apple lossless audio @tab X @tab X @tab QuickTime fourcc 'alac' @item Atrac 1 @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1cb8ee5264..3cb582d4c5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -573,6 +573,8 @@ OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o \ libdirac_libschro.o OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o +OBJS-$(CONFIG_LIBVO_AACENC_ENCODER) += libvo-aacenc.o mpeg4audio.o +OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o vorbis_data.o OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o OBJS-$(CONFIG_LIBVPX_ENCODER) += libvpxenc.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 78bb540657..8f53e257b4 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -375,6 +375,8 @@ void avcodec_register_all(void) REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger); REGISTER_DECODER (LIBSPEEX, libspeex); REGISTER_ENCODER (LIBTHEORA, libtheora); + REGISTER_ENCODER (LIBVO_AACENC, libvo_aacenc); + REGISTER_ENCODER (LIBVO_AMRWBENC, libvo_amrwbenc); REGISTER_ENCODER (LIBVORBIS, libvorbis); REGISTER_ENCDEC (LIBVPX, libvpx); REGISTER_ENCODER (LIBX264, libx264); diff --git a/libavcodec/libvo-aacenc.c b/libavcodec/libvo-aacenc.c new file mode 100644 index 0000000000..65c2745695 --- /dev/null +++ b/libavcodec/libvo-aacenc.c @@ -0,0 +1,128 @@ +/* + * AAC encoder wrapper + * Copyright (c) 2010 Martin Storsjo + * + * This file is part of Libav. + * + * Libav 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.1 of the License, or (at your option) any later version. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include "avcodec.h" +#include "mpeg4audio.h" + +typedef struct AACContext { + VO_AUDIO_CODECAPI codec_api; + VO_HANDLE handle; + VO_MEM_OPERATOR mem_operator; + VO_CODEC_INIT_USERDATA user_data; +} AACContext; + +static av_cold int aac_encode_init(AVCodecContext *avctx) +{ + AACContext *s = avctx->priv_data; + AACENC_PARAM params = { 0 }; + int index; + + avctx->coded_frame = avcodec_alloc_frame(); + avctx->frame_size = 1024; + + voGetAACEncAPI(&s->codec_api); + + s->mem_operator.Alloc = cmnMemAlloc; + s->mem_operator.Copy = cmnMemCopy; + s->mem_operator.Free = cmnMemFree; + s->mem_operator.Set = cmnMemSet; + s->mem_operator.Check = cmnMemCheck; + s->user_data.memflag = VO_IMF_USERMEMOPERATOR; + s->user_data.memData = &s->mem_operator; + s->codec_api.Init(&s->handle, VO_AUDIO_CodingAAC, &s->user_data); + + params.sampleRate = avctx->sample_rate; + params.bitRate = avctx->bit_rate; + params.nChannels = avctx->channels; + params.adtsUsed = !(avctx->flags & CODEC_FLAG_GLOBAL_HEADER); + if (s->codec_api.SetParam(s->handle, VO_PID_AAC_ENCPARAM, ¶ms) + != VO_ERR_NONE) { + av_log(avctx, AV_LOG_ERROR, "Unable to set encoding parameters\n"); + return AVERROR_UNKNOWN; + } + + avctx->extradata_size = 2; + avctx->extradata = av_mallocz(avctx->extradata_size + + FF_INPUT_BUFFER_PADDING_SIZE); + if (!avctx->extradata) + return AVERROR(ENOMEM); + + for (index = 0; index < 16; index++) + if (avctx->sample_rate == ff_mpeg4audio_sample_rates[index]) + break; + if (index == 16) { + av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate %d\n", + avctx->sample_rate); + return AVERROR_NOTSUPP; + } + avctx->extradata[0] = 0x02 << 3 | index >> 1; + avctx->extradata[1] = (index & 0x01) << 7 | avctx->channels << 3; + return 0; +} + +static int aac_encode_close(AVCodecContext *avctx) +{ + AACContext *s = avctx->priv_data; + + s->codec_api.Uninit(s->handle); + av_freep(&avctx->coded_frame); + + return 0; +} + +static int aac_encode_frame(AVCodecContext *avctx, + unsigned char *frame/*out*/, + int buf_size, void *data/*in*/) +{ + AACContext *s = avctx->priv_data; + VO_CODECBUFFER input = { 0 }, output = { 0 }; + VO_AUDIO_OUTPUTINFO output_info = { { 0 } }; + + input.Buffer = data; + input.Length = 2 * avctx->channels * avctx->frame_size; + output.Buffer = frame; + output.Length = buf_size; + + s->codec_api.SetInputData(s->handle, &input); + if (s->codec_api.GetOutputData(s->handle, &output, &output_info) + != VO_ERR_NONE) { + av_log(avctx, AV_LOG_ERROR, "Unable to encode frame\n"); + return AVERROR_UNKNOWN; + } + return output.Length; +} + +AVCodec ff_libvo_aacenc_encoder = { + "libvo_aacenc", + CODEC_TYPE_AUDIO, + CODEC_ID_AAC, + sizeof(AACContext), + aac_encode_init, + aac_encode_frame, + aac_encode_close, + NULL, + .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("libvo-aacenc AAC"), +}; + diff --git a/libavcodec/libvo-amrwbenc.c b/libavcodec/libvo-amrwbenc.c new file mode 100644 index 0000000000..6f26d9b8af --- /dev/null +++ b/libavcodec/libvo-amrwbenc.c @@ -0,0 +1,127 @@ +/* + * AMR Audio encoder stub + * Copyright (c) 2003 the ffmpeg project + * + * This file is part of Libav. + * + * Libav 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.1 of the License, or (at your option) any later version. + * + * Libav 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 Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include + +#include "avcodec.h" + +static const char wb_bitrate_unsupported[] = + "bitrate not supported: use one of 6.6k, 8.85k, 12.65k, 14.25k, 15.85k, " + "18.25k, 19.85k, 23.05k, or 23.85k\n"; + +typedef struct AMRWB_bitrates { + int rate; + int mode; +} AMRWB_bitrates; + +typedef struct AMRWBContext { + void *state; + int mode; + int allow_dtx; +} AMRWBContext; + +static int getWBBitrateMode(int bitrate) +{ + /* make the correspondance between bitrate and mode */ + AMRWB_bitrates rates[] = { { 6600, 0}, + { 8850, 1}, + {12650, 2}, + {14250, 3}, + {15850, 4}, + {18250, 5}, + {19850, 6}, + {23050, 7}, + {23850, 8}, }; + int i; + + for (i = 0; i < 9; i++) + if (rates[i].rate == bitrate) + return rates[i].mode; + /* no bitrate matching, return an error */ + return -1; +} + +static av_cold int amr_wb_encode_init(AVCodecContext *avctx) +{ + AMRWBContext *s = avctx->priv_data; + + if (avctx->sample_rate != 16000) { + av_log(avctx, AV_LOG_ERROR, "Only 16000Hz sample rate supported\n"); + return -1; + } + + if (avctx->channels != 1) { + av_log(avctx, AV_LOG_ERROR, "Only mono supported\n"); + return -1; + } + + if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) { + av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported); + return -1; + } + + avctx->frame_size = 320; + avctx->coded_frame = avcodec_alloc_frame(); + + s->state = E_IF_init(); + s->allow_dtx = 0; + + return 0; +} + +static int amr_wb_encode_close(AVCodecContext *avctx) +{ + AMRWBContext *s = avctx->priv_data; + + E_IF_exit(s->state); + av_freep(&avctx->coded_frame); + return 0; +} + +static int amr_wb_encode_frame(AVCodecContext *avctx, + unsigned char *frame/*out*/, + int buf_size, void *data/*in*/) +{ + AMRWBContext *s = avctx->priv_data; + int size; + + if ((s->mode = getWBBitrateMode(avctx->bit_rate)) < 0) { + av_log(avctx, AV_LOG_ERROR, wb_bitrate_unsupported); + return -1; + } + size = E_IF_encode(s->state, s->mode, data, frame, s->allow_dtx); + return size; +} + +AVCodec ff_libvo_amrwbenc_encoder = { + "libvo_amrwbenc", + CODEC_TYPE_AUDIO, + CODEC_ID_AMR_WB, + sizeof(AMRWBContext), + amr_wb_encode_init, + amr_wb_encode_frame, + amr_wb_encode_close, + NULL, + .sample_fmts = (enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, + .long_name = NULL_IF_CONFIG_SMALL("libvo-amrwbenc Adaptive Multi-Rate " + "(AMR) Wide-Band"), +}; + diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bd5bdfd383..a6fb871ade 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1165,6 +1165,7 @@ int av_get_bits_per_sample(enum CodecID codec_id){ case CODEC_ID_ADPCM_MS: case CODEC_ID_ADPCM_YAMAHA: return 4; + case CODEC_ID_ADPCM_G722: case CODEC_ID_PCM_ALAW: case CODEC_ID_PCM_MULAW: case CODEC_ID_PCM_S8: diff --git a/libavcodec/version.h b/libavcodec/version.h index e40d4e5531..78c0f7808d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -21,8 +21,8 @@ #define AVCODEC_VERSION_H #define LIBAVCODEC_VERSION_MAJOR 52 -#define LIBAVCODEC_VERSION_MINOR 117 -#define LIBAVCODEC_VERSION_MICRO 1 +#define LIBAVCODEC_VERSION_MINOR 119 +#define LIBAVCODEC_VERSION_MICRO 0 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ diff --git a/libavformat/timefilter.c b/libavformat/timefilter.c index 4a582242ec..5c780c8d90 100644 --- a/libavformat/timefilter.c +++ b/libavformat/timefilter.c @@ -79,6 +79,8 @@ double ff_timefilter_update(TimeFilter *self, double system_time, double period) #include "libavutil/lfg.h" #define LFG_MAX ((1LL << 32) - 1) +#undef printf + int main(void) { AVLFG prng;