RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros

Browse Source 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Timothy Gu 2013-09-10 20:23:32 -07:00 committed by Michael Niedermayer
parent bfe1445871
commit 4bd910d83d
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/aaccoder.c
View File

@ -1113,25 +1113,25 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe,
} }
AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = { AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
{ [AAC_CODER_FAAC] = {
search_for_quantizers_faac, search_for_quantizers_faac,
encode_window_bands_info, encode_window_bands_info,
quantize_and_encode_band, quantize_and_encode_band,
search_for_ms, search_for_ms,
}, },
{ [AAC_CODER_ANMR] = {
search_for_quantizers_anmr, search_for_quantizers_anmr,
encode_window_bands_info, encode_window_bands_info,
quantize_and_encode_band, quantize_and_encode_band,
search_for_ms, search_for_ms,
}, },
{ [AAC_CODER_TWOLOOP] = {
search_for_quantizers_twoloop, search_for_quantizers_twoloop,
codebook_trellis_rate, codebook_trellis_rate,
quantize_and_encode_band, quantize_and_encode_band,
search_for_ms, search_for_ms,
}, },
{ [AAC_CODER_FAST] = {
search_for_quantizers_fast, search_for_quantizers_fast,
encode_window_bands_info, encode_window_bands_info,
quantize_and_encode_band, quantize_and_encode_band,

7
libavcodec/aacenc.h
View File

@ -30,7 +30,12 @@
#include "audio_frame_queue.h" #include "audio_frame_queue.h"
#include "psymodel.h" #include "psymodel.h"
#define AAC_CODER_NB 4 #define AAC_CODER_FAAC 0
#define AAC_CODER_ANMR 1
#define AAC_CODER_TWOLOOP 2
#define AAC_CODER_FAST 3
#define AAC_CODER_NB 4
typedef struct AACEncOptions { typedef struct AACEncOptions {
int stereo_mode; int stereo_mode;