From 4bd910d83d18eef89b57483e056a68f730d4e8b7 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 10 Sep 2013 20:23:32 -0700
Subject: [PATCH] aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/aaccoder.c | 8 ++++----
libavcodec/aacenc.h | 7 ++++++-
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c
index 45fbc2dedf9..50a246fb55f 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 cebdd181bea..19e442a24bd 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;
--
GitLab