mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-29 16:23:10 +02:00
Add an AAC encoder by using the libvo-aacenc library
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
029f966c3a
commit
d89e738a0c
@ -83,6 +83,7 @@ version <next>:
|
|||||||
- Linux framebuffer input device added
|
- Linux framebuffer input device added
|
||||||
- Chronomaster DFA decoder
|
- Chronomaster DFA decoder
|
||||||
- Mobotix MxPEG decoder
|
- Mobotix MxPEG decoder
|
||||||
|
- AAC encoding via libvo-aacenc
|
||||||
|
|
||||||
|
|
||||||
version 0.6:
|
version 0.6:
|
||||||
|
6
configure
vendored
6
configure
vendored
@ -178,6 +178,7 @@ External library support:
|
|||||||
--enable-libschroedinger enable Dirac support via libschroedinger [no]
|
--enable-libschroedinger enable Dirac support via libschroedinger [no]
|
||||||
--enable-libspeex enable Speex decoding via libspeex [no]
|
--enable-libspeex enable Speex decoding via libspeex [no]
|
||||||
--enable-libtheora enable Theora encoding via libtheora [no]
|
--enable-libtheora enable Theora encoding via libtheora [no]
|
||||||
|
--enable-libvo-aacenc enable AAC encoding via libvo-aacenc [no]
|
||||||
--enable-libvorbis enable Vorbis encoding via libvorbis,
|
--enable-libvorbis enable Vorbis encoding via libvorbis,
|
||||||
native implementation exists [no]
|
native implementation exists [no]
|
||||||
--enable-libvpx enable VP8 support via libvpx [no]
|
--enable-libvpx enable VP8 support via libvpx [no]
|
||||||
@ -937,6 +938,7 @@ CONFIG_LIST="
|
|||||||
libschroedinger
|
libschroedinger
|
||||||
libspeex
|
libspeex
|
||||||
libtheora
|
libtheora
|
||||||
|
libvo_aacenc
|
||||||
libvorbis
|
libvorbis
|
||||||
libvpx
|
libvpx
|
||||||
libx264
|
libx264
|
||||||
@ -1384,6 +1386,7 @@ libschroedinger_decoder_deps="libschroedinger"
|
|||||||
libschroedinger_encoder_deps="libschroedinger"
|
libschroedinger_encoder_deps="libschroedinger"
|
||||||
libspeex_decoder_deps="libspeex"
|
libspeex_decoder_deps="libspeex"
|
||||||
libtheora_encoder_deps="libtheora"
|
libtheora_encoder_deps="libtheora"
|
||||||
|
libvo_aacenc_encoder_deps="libvo_aacenc"
|
||||||
libvorbis_encoder_deps="libvorbis"
|
libvorbis_encoder_deps="libvorbis"
|
||||||
libvpx_decoder_deps="libvpx"
|
libvpx_decoder_deps="libvpx"
|
||||||
libvpx_encoder_deps="libvpx"
|
libvpx_encoder_deps="libvpx"
|
||||||
@ -2525,6 +2528,7 @@ die_license_disabled nonfree libfaac
|
|||||||
|
|
||||||
die_license_disabled version3 libopencore_amrnb
|
die_license_disabled version3 libopencore_amrnb
|
||||||
die_license_disabled version3 libopencore_amrwb
|
die_license_disabled version3 libopencore_amrwb
|
||||||
|
die_license_disabled version3 libvo_aacenc
|
||||||
|
|
||||||
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
|
enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
|
||||||
|
|
||||||
@ -2864,6 +2868,7 @@ 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 libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
|
||||||
enabled libspeex && require libspeex speex/speex.h speex_decoder_init -lspeex
|
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 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 libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
|
enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg
|
||||||
enabled libvpx && {
|
enabled libvpx && {
|
||||||
enabled libvpx_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||
|
enabled libvpx_decoder && { check_lib2 "vpx/vpx_decoder.h vpx/vp8dx.h" vpx_codec_dec_init_ver -lvpx ||
|
||||||
@ -3132,6 +3137,7 @@ echo "libschroedinger enabled ${libschroedinger-no}"
|
|||||||
echo "libspeex enabled ${libspeex-no}"
|
echo "libspeex enabled ${libspeex-no}"
|
||||||
echo "libtheora enabled ${libtheora-no}"
|
echo "libtheora enabled ${libtheora-no}"
|
||||||
echo "libva enabled ${vaapi-no}"
|
echo "libva enabled ${vaapi-no}"
|
||||||
|
echo "libvo-aacenc support ${libvo_aacenc-no}"
|
||||||
echo "libvorbis enabled ${libvorbis-no}"
|
echo "libvorbis enabled ${libvorbis-no}"
|
||||||
echo "libvpx enabled ${libvpx-no}"
|
echo "libvpx enabled ${libvpx-no}"
|
||||||
echo "libx264 enabled ${libx264-no}"
|
echo "libx264 enabled ${libx264-no}"
|
||||||
|
@ -540,7 +540,7 @@ following image formats are supported:
|
|||||||
@item Name @tab Encoding @tab Decoding @tab Comments
|
@item Name @tab Encoding @tab Decoding @tab Comments
|
||||||
@item 8SVX audio @tab @tab X
|
@item 8SVX audio @tab @tab X
|
||||||
@item AAC @tab E @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 AC-3 @tab IX @tab X
|
||||||
@item ADPCM 4X Movie @tab @tab X
|
@item ADPCM 4X Movie @tab @tab X
|
||||||
@item ADPCM CDROM XA @tab @tab X
|
@item ADPCM CDROM XA @tab @tab X
|
||||||
|
@ -568,6 +568,7 @@ OBJS-$(CONFIG_LIBSCHROEDINGER_ENCODER) += libschroedingerenc.o \
|
|||||||
libdirac_libschro.o
|
libdirac_libschro.o
|
||||||
OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
|
OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o
|
||||||
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
|
OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o
|
||||||
|
OBJS-$(CONFIG_LIBVO_AACENC_ENCODER) += libvo-aacenc.o mpeg4audio.o
|
||||||
OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o vorbis_data.o
|
OBJS-$(CONFIG_LIBVORBIS_ENCODER) += libvorbis.o vorbis_data.o
|
||||||
OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o
|
OBJS-$(CONFIG_LIBVPX_DECODER) += libvpxdec.o
|
||||||
OBJS-$(CONFIG_LIBVPX_ENCODER) += libvpxenc.o
|
OBJS-$(CONFIG_LIBVPX_ENCODER) += libvpxenc.o
|
||||||
|
@ -366,6 +366,7 @@ void avcodec_register_all(void)
|
|||||||
REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger);
|
REGISTER_ENCDEC (LIBSCHROEDINGER, libschroedinger);
|
||||||
REGISTER_DECODER (LIBSPEEX, libspeex);
|
REGISTER_DECODER (LIBSPEEX, libspeex);
|
||||||
REGISTER_ENCODER (LIBTHEORA, libtheora);
|
REGISTER_ENCODER (LIBTHEORA, libtheora);
|
||||||
|
REGISTER_ENCODER (LIBVO_AACENC, libvo_aacenc);
|
||||||
REGISTER_ENCODER (LIBVORBIS, libvorbis);
|
REGISTER_ENCODER (LIBVORBIS, libvorbis);
|
||||||
REGISTER_ENCDEC (LIBVPX, libvpx);
|
REGISTER_ENCDEC (LIBVPX, libvpx);
|
||||||
REGISTER_ENCODER (LIBX264, libx264);
|
REGISTER_ENCODER (LIBX264, libx264);
|
||||||
|
128
libavcodec/libvo-aacenc.c
Normal file
128
libavcodec/libvo-aacenc.c
Normal file
@ -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 <vo-aacenc/voAAC.h>
|
||||||
|
#include <vo-aacenc/cmnMemory.h>
|
||||||
|
|
||||||
|
#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"),
|
||||||
|
};
|
||||||
|
|
@ -21,8 +21,8 @@
|
|||||||
#define AVCODEC_VERSION_H
|
#define AVCODEC_VERSION_H
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_MAJOR 52
|
#define LIBAVCODEC_VERSION_MAJOR 52
|
||||||
#define LIBAVCODEC_VERSION_MINOR 117
|
#define LIBAVCODEC_VERSION_MINOR 118
|
||||||
#define LIBAVCODEC_VERSION_MICRO 1
|
#define LIBAVCODEC_VERSION_MICRO 0
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||||
LIBAVCODEC_VERSION_MINOR, \
|
LIBAVCODEC_VERSION_MINOR, \
|
||||||
|
Loading…
Reference in New Issue
Block a user