Browse Source

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

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Timothy Gu Michael Niedermayer 12 years ago
parent
commit
4bd910d83d
2 changed files with 10 additions and 5 deletions
  1. +4
    -4
      libavcodec/aaccoder.c
  2. +6
    -1
      libavcodec/aacenc.h

+ 4
- 4
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] = {
{
[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,


+ 6
- 1
libavcodec/aacenc.h View File

@@ -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;


Loading…
Cancel
Save