[FFmpeg-soc] [soc]: r3348 - in aacenc: aacpsy.c aacpsy.h

[kostya]

Author: kostya
Date: Sat Aug 16 13:31:31 2008
New Revision: 3348

Log:
Rename null8 model to test model

Modified:
   aacenc/aacpsy.c
   aacenc/aacpsy.h

Modified: aacenc/aacpsy.c
==============================================================================
--- aacenc/aacpsy.c	(original)
+++ aacenc/aacpsy.c	Sat Aug 16 13:31:31 2008
@@ -146,7 +146,7 @@ static void psy_create_output(AACPsyCont
     }
 }
 
-static void psy_null8_window(AACPsyContext *apc, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe)
+static void psy_test_window(AACPsyContext *apc, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe)
 {
     int ch, i;
     int chans = type == TYPE_CPE ? 2 : 1;
@@ -182,7 +182,7 @@ static void psy_null8_window(AACPsyConte
     cpe->common_window = cpe->ch[0].ics.use_kb_window[0] == cpe->ch[1].ics.use_kb_window[0];
 }
 
-static void psy_null8_process(AACPsyContext *apc, int tag, int type, ChannelElement *cpe)
+static void psy_test_process(AACPsyContext *apc, int tag, int type, ChannelElement *cpe)
 {
     int start;
     int w, ch, g, i;
@@ -773,10 +773,10 @@ static av_cold void psy_3gpp_end(AACPsyC
 static const AACPsyModel psy_models[AAC_NB_PSY_MODELS] =
 {
     {
-       "Null model - short windows",
+       "Test model",
         NULL,
-        psy_null8_window,
-        psy_null8_process,
+        psy_test_window,
+        psy_test_process,
         NULL,
     },
     {

Modified: aacenc/aacpsy.h
==============================================================================
--- aacenc/aacpsy.h	(original)
+++ aacenc/aacpsy.h	Sat Aug 16 13:31:31 2008
@@ -27,7 +27,7 @@
 #include "lowpass.h"
 
 enum AACPsyModelType{
-    AAC_PSY_NULL8,             ///< do nothing with frequencies but work with short windows
+    AAC_PSY_TEST,              ///< a sample model to exercise encoder
     AAC_PSY_3GPP,              ///< model following recommendations from 3GPP TS 26.403
 
     AAC_NB_PSY_MODELS          ///< total number of psychoacoustic models, since it's not a part of the ABI new models can be added freely