mirror of https://github.com/FFmpeg/FFmpeg.git
* qatar/master: Not pulled due to wrong author, according to carl: Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX(). Fix compilation of timefilter test program. Add support for AMR-WB encoding via libvo-amrwbenc Add an AAC encoder by using the libvo-aacenc library g722: Return 8 bits per sample for g722 in av_get_bits_per_sample Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>oldabi
Michael Niedermayer
14 years ago
commit
4727ec3c0e
10 changed files with 281 additions and 4 deletions
@ -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"), |
||||
}; |
||||
|
||||
@ -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 <vo-amrwbenc/enc_if.h> |
||||
|
||||
#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"), |
||||
}; |
||||
|
||||
Loading…
Reference in new issue