shithub: aacenc

--- a/libfaac/libfaac.dsp

+++ b/libfaac/libfaac.dsp

@@ -40,8 +40,9 @@

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD CPP /nologo /G6 /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD BASE RSC /l 0x413 /d "NDEBUG"

 # ADD RSC /l 0x413 /d "NDEBUG"

 BSC32=bscmake.exe

@@ -63,6 +64,7 @@

 # PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

 # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x413 /d "_DEBUG"

--- a/libfaac/psychkni.c

+++ b/libfaac/psychkni.c

@@ -16,7 +16,7 @@

  * along with this program; if not, write to the Free Software

  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

- * $Id: psychkni.c,v 1.5 2002/12/28 09:22:46 knik Exp $

+ * $Id: psychkni.c,v 1.6 2003/02/09 20:44:16 menno Exp $

*/

 #include <stdio.h>

 #include <stdlib.h>

@@ -79,7 +79,8 @@

   int lastband;

   psydata_t *psydata = psyInfo->data;

   static const double longthr = 0.32;

-  static const double shortthr = longthr * 0.20;

+//  static const double shortthr = longthr * 0.20;

+  static const double shortthr = 0.32 * 0.20;

   static const int firstband = 1;

--- a/plugins/cooledit/FAAC.dsp

+++ b/plugins/cooledit/FAAC.dsp

@@ -25,7 +25,7 @@

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

+CPP=xicl6.exe

 MTL=midl.exe

 RSC=rc.exe

@@ -43,7 +43,7 @@

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FAAC_EXPORTS" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../../../faad2/common/faad" /I "../../include" /I "../../../faad2/include" /I "../../../faad2/common/mp4v2" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FAAC_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../faad2/common/faad" /I "../../include" /I "../../../faad2/include" /I "../../../faad2/common/mp4v2" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "FAAC_EXPORTS" /YX /FD /c

 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32

 # ADD BASE RSC /l 0x410 /d "NDEBUG"

@@ -51,7 +51,7 @@

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LINK32=link.exe

+LINK32=xilink6.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386

 # ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:yes /machine:I386 /out:"Release/FAAC.flt"

@@ -77,7 +77,7 @@

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LINK32=link.exe

+LINK32=xilink6.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept

 # ADD LINK32 ws2_32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"Debug/FAAC.flt" /pdbtype:sept

 # SUBTRACT LINK32 /nodefaultlib

--- a/plugins/cooledit/Faad.cpp

+++ b/plugins/cooledit/Faad.cpp

@@ -155,16 +155,13 @@

         unsigned char *buff = NULL;

         unsigned __int32 buff_size = 0;

-        unsigned char dummy2_8, dummy3_8, dummy4_8, dummy5_8, dummy6_8,

-            dummy7_8, dummy8_8;

-        unsigned long dummy1_32;

+        mp4AudioSpecificConfig mp4ASC;

 			MP4GetTrackESConfiguration(infile, trackId, (unsigned __int8 **)&buff, &buff_size);

             if (buff)

-                rc = AudioSpecificConfig(buff, buff_size, &dummy1_32, &dummy2_8, &dummy3_8,

-                    &dummy4_8, &dummy5_8, &dummy6_8, &dummy7_8, &dummy8_8);

+                rc = AudioSpecificConfig(buff, buff_size, &mp4ASC);

                 free(buff);

                 if (rc < 0)

@@ -480,7 +477,8 @@

 	int					track;

 	unsigned __int32	buffer_size;

 	DWORD				timeScale;

-	BYTE				sf, dummy8;

+	BYTE				sf;

+    mp4AudioSpecificConfig mp4ASC;

 		if(!(mi->mp4File=MP4Read(lpstrFilename, 0)))

 		    ERROR_OFI("Error opening file");

@@ -494,7 +492,13 @@

 		MP4GetTrackESConfiguration(mi->mp4File, track, (unsigned __int8 **)&mi->buffer, &buffer_size);

 	    if(!mi->buffer)

 			ERROR_OFI("MP4GetTrackESConfiguration");

-		AudioSpecificConfig(mi->buffer, buffer_size, &timeScale, &channels, &sf, &mi->type, &dummy8, &dummy8, &dummy8, &dummy8);

+		AudioSpecificConfig(mi->buffer, buffer_size, &mp4ASC);

+        timeScale = mp4ASC.samplingFrequency;

+        channels = mp4ASC.channelsConfiguration;

+        sf = mp4ASC.samplingFrequencyIndex;

+        mi->type = mp4ASC.objectTypeIndex;

 		if(faacDecInit2(mi->hDecoder, mi->buffer, buffer_size, &samplerate, &channels) < 0)

 			ERROR_OFI("Error initializing decoder library");

 	    FREE(mi->buffer);

--- a/plugins/cooledit/aacInfoLib.dsp

+++ b/plugins/cooledit/aacInfoLib.dsp

@@ -25,7 +25,7 @@

 # PROP AllowPerConfigDependencies 0

 # PROP Scc_ProjName ""

 # PROP Scc_LocalPath ""

-CPP=cl.exe

+CPP=xicl6.exe

 RSC=rc.exe

 !IF  "$(CFG)" == "aacInfoLib - Win32 Release"

@@ -40,14 +40,15 @@

 # PROP Output_Dir "Release"

 # PROP Intermediate_Dir "Release"

 # PROP Target_Dir ""

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

-# ADD CPP /nologo /W3 /GX /O2 /I "../../../faad2/common/faad" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../../faad2/common/faad" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c

 # ADD BASE RSC /l 0x410 /d "NDEBUG"

 # ADD RSC /l 0x410 /d "NDEBUG"

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LIB32=link.exe -lib

+LIB32=xilink6.exe -lib

 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo

@@ -63,6 +64,7 @@

 # PROP Output_Dir "Debug"

 # PROP Intermediate_Dir "Debug"

 # PROP Target_Dir ""

+MTL=midl.exe

 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

 # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I "../../../faad2/common/faad" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c

 # ADD BASE RSC /l 0x410 /d "_DEBUG"

@@ -70,7 +72,7 @@

 BSC32=bscmake.exe

 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

-LIB32=link.exe -lib

+LIB32=xilink6.exe -lib

 # ADD BASE LIB32 /nologo

 # ADD LIB32 /nologo