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

Timothy Gu committed 13 years ago

Commit 4bd910d1 parent bfe14452 files · +10 −5Browse files

Unified · Split

2 files

@@ -1113,25 +1113,25 @@ static void search_for_ms(AACEncContext s, ChannelElement cpe, · 1112 unmodified lines
1113	1113	}
1114	1114
1115	1115	AACCoefficientsEncoder ff_aac_coders[AAC_CODER_NB] = {
1116		− {
	1116	+ [AAC_CODER_FAAC] = {
1117	1117	search_for_quantizers_faac,
1118	1118	encode_window_bands_info,
1119	1119	quantize_and_encode_band,
1120	1120	search_for_ms,
1121	1121	},
1122		− {
	1122	+ [AAC_CODER_ANMR] = {
1123	1123	search_for_quantizers_anmr,
1124	1124	encode_window_bands_info,
1125	1125	quantize_and_encode_band,
1126	1126	search_for_ms,
1127	1127	},
1128		− {
	1128	+ [AAC_CODER_TWOLOOP] = {
1129	1129	search_for_quantizers_twoloop,
1130	1130	codebook_trellis_rate,
1131	1131	quantize_and_encode_band,
1132	1132	search_for_ms,
1133	1133	},
1134		− {
	1134	+ [AAC_CODER_FAST] = {
1135	1135	search_for_quantizers_fast,
1136	1136	encode_window_bands_info,
1137	1137	quantize_and_encode_band,

@@ -30,7 +30,12 @@ · 29 unmodified lines
30	30	#include "audio_frame_queue.h"
31	31	#include "psymodel.h"
32	32
33		−#define AAC_CODER_NB 4
	33	+#define AAC_CODER_FAAC 0
	34	+#define AAC_CODER_ANMR 1
	35	+#define AAC_CODER_TWOLOOP 2
	36	+#define AAC_CODER_FAST 3
	37	+
	38	+#define AAC_CODER_NB 4
34	39
35	40	typedef struct AACEncOptions {
36	41	int stereo_mode;

Keyboard shortcuts