aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros
authorTimothy Gu <timothygu99@gmail.com>
Wed, 11 Sep 2013 03:23:32 +0000 (20:23 -0700)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 12 Sep 2013 15:22:36 +0000 (17:22 +0200)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aaccoder.c
libavcodec/aacenc.h

index 45fbc2d..50a246f 100644 (file)
@@ -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,
index cebdd18..19e442a 100644 (file)
 #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;