diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2013-09-10 20:23:32 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-12 17:22:36 +0200 |
| commit | 4bd910d83d18eef89b57483e056a68f730d4e8b7 (patch) | |
| tree | 1b12671fa3f5677b42adbe3a45a5109c4a2d67ed /libavcodec | |
| parent | bfe1445871771493d97cfd75489b4231177ebc84 (diff) | |
aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aaccoder.c | 8 | ||||
| -rw-r--r-- | libavcodec/aacenc.h | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index 45fbc2dedf..50a246fb55 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -1113,25 +1113,25 @@ static void search_for_ms(AACEncContext *s, ChannelElement *cpe, } AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = { - { + [AAC_CODER_FAAC] = { search_for_quantizers_faac, encode_window_bands_info, quantize_and_encode_band, search_for_ms, }, - { + [AAC_CODER_ANMR] = { search_for_quantizers_anmr, encode_window_bands_info, quantize_and_encode_band, search_for_ms, }, - { + [AAC_CODER_TWOLOOP] = { search_for_quantizers_twoloop, codebook_trellis_rate, quantize_and_encode_band, search_for_ms, }, - { + [AAC_CODER_FAST] = { search_for_quantizers_fast, encode_window_bands_info, quantize_and_encode_band, diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index cebdd181be..19e442a24b 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -30,7 +30,12 @@ #include "audio_frame_queue.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 { int stereo_mode; |