ref: 1a316246f5a023c955fcb6e63373d341c92d22a7
parent: 877dfb805676e0d53b8aab970327e44fc7364814
author: menno <menno>
date: Thu Feb 6 15:01:53 EST 2003
Added samplerate field to frameInfo
--- a/common/mp4av/libmp4av_st.dsp
+++ b/common/mp4av/libmp4av_st.dsp
@@ -66,7 +66,7 @@
# 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 /MTd /W3 /Gm /GX /ZI /Od /I "..\mp4v2" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\mp4v2" /I ".\\" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
--- a/common/mp4v2/libmp4v2_st60.dsp
+++ b/common/mp4v2/libmp4v2_st60.dsp
@@ -66,7 +66,7 @@
# PROP Target_Dir ""
MTL=midl.exe
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I ".\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I ".\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE RSC /l 0x409
# ADD RSC /l 0x409
BSC32=bscmake.exe
--- a/common/mp4v2/libmp4v2_st60.vcproj
+++ b/common/mp4v2/libmp4v2_st60.vcproj
@@ -33,7 +33,8 @@
ProgramDataBaseFileName=".\ST_Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- CompileAs="0">
+ CompileAs="0"
+ AdditionalOptions="">
<IntelOptions
Optimization="2"
InlineFuncExpansion="1"
@@ -42,7 +43,8 @@
RuntimeLibrary="0"
BufferSecurityCheck="1"
FunctionLevelLinking="1"
- AllOptions="/c /I ".\\" /nologo /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\ST_Release/libmp4v2_st60.pch" /Fo".\ST_Release/" /Fd".\ST_Release/" /Gd"/>
+ AllOptions="/c /I ".\\" /nologo /W3 /O2 /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\ST_Release/libmp4v2_st60.pch" /Fo".\ST_Release/" /Fd".\ST_Release/" /Gd"
+ MSOriginalAdditionalOptions=""/>
</Tool>
<Tool
Name="VCCustomBuildTool"/>
@@ -49,9 +51,11 @@
<Tool
Name="VCLibrarianTool"
OutputFile=".\ST_Release\libmp4v2_st60.lib"
- SuppressStartupBanner="TRUE">
+ SuppressStartupBanner="TRUE"
+ AdditionalOptions="">
<IntelOptions
- AllOptions="/OUT:".\ST_Release\libmp4v2_st60.lib" /NOLOGO"/>
+ AllOptions="/OUT:".\ST_Release\libmp4v2_st60.lib" /NOLOGO"
+ MSOriginalAdditionalOptions=""/>
</Tool>
<Tool
Name="VCMIDLTool"/>
@@ -67,7 +71,7 @@
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<IntelOptions
- CompilerName="1"/>
+ CompilerName="0"/>
</Configuration>
<Configuration
Name="Debug|Win32"
@@ -90,13 +94,15 @@
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
- CompileAs="0">
+ CompileAs="0"
+ AdditionalOptions="">
<IntelOptions
Optimization="0"
MinimalRebuild="1"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- AllOptions="/c /I ".\\" /Z7 /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\ST_Debug/libmp4v2_st60.pch" /Fo".\ST_Debug/" /Fd".\ST_Debug/" /Gd"/>
+ AllOptions="/c /I ".\\" /Z7 /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\ST_Debug/libmp4v2_st60.pch" /Fo".\ST_Debug/" /Fd".\ST_Debug/" /Gd"
+ MSOriginalAdditionalOptions=""/>
</Tool>
<Tool
Name="VCCustomBuildTool"/>
@@ -103,9 +109,11 @@
<Tool
Name="VCLibrarianTool"
OutputFile=".\ST_Debug\libmp4v2_st60.lib"
- SuppressStartupBanner="TRUE">
+ SuppressStartupBanner="TRUE"
+ AdditionalOptions="">
<IntelOptions
- AllOptions="/OUT:".\ST_Debug\libmp4v2_st60.lib" /NOLOGO"/>
+ AllOptions="/OUT:".\ST_Debug\libmp4v2_st60.lib" /NOLOGO"
+ MSOriginalAdditionalOptions=""/>
</Tool>
<Tool
Name="VCMIDLTool"/>
--- a/frontend/faad.dsp
+++ b/frontend/faad.dsp
@@ -66,7 +66,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "../include" /I "../common/mp4v2" /I "../common/faad" /I "../common/libsndfile/src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../include" /I "../common/mp4v2" /I "../common/faad" /I "../common/libsndfile/src" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
# ADD BASE RSC /l 0x413 /d "_DEBUG"
# ADD RSC /l 0x413 /d "_DEBUG"
BSC32=bscmake.exe
--- a/frontend/faad.vcproj
+++ b/frontend/faad.vcproj
@@ -33,13 +33,15 @@
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
- CompileAs="0">
+ CompileAs="0"
+ AdditionalOptions="">
<IntelOptions
Optimization="0"
MinimalRebuild="1"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
- AllOptions="/c /I "../include" /I "../common/mp4v2" /I "../common/faad" /ZI /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/faad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd"/>
+ AllOptions="/c /I "../include" /I "../common/mp4v2" /I "../common/faad" /ZI /nologo /W3 /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/faad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd"
+ MSOriginalAdditionalOptions=""/>
</Tool>
<Tool
Name="VCCustomBuildTool"/>
@@ -54,7 +56,8 @@
ProgramDatabaseFile=".\Debug/faad.pdb"
SubSystem="1">
<IntelOptions
- AllOptions="/NOLOGO /OUT:".\Debug/faad.exe" /INCREMENTAL ws2_32.lib odbc32.lib odbccp32.lib /DEBUG /PDB:".\Debug/faad.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.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"/>
+ AllOptions="/NOLOGO /OUT:".\Debug/faad.exe" /INCREMENTAL ws2_32.lib odbc32.lib odbccp32.lib /DEBUG /PDB:".\Debug/faad.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.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"
+ MSOriginalAdditionalOptions="/MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Debug\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Debug\libmp4v2_st60.lib""/>
</Tool>
<Tool
Name="VCMIDLTool"
@@ -103,7 +106,8 @@
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- CompileAs="0">
+ CompileAs="0"
+ AdditionalOptions="">
<IntelOptions
Optimization="2"
GlobalOptimizations="1"
@@ -113,13 +117,14 @@
RuntimeLibrary="0"
BufferSecurityCheck="1"
FunctionLevelLinking="1"
- AllOptions="/c /I "../include" /I "../common/mp4v2" /I "../common/faad" /nologo /W3 /O2 /Og /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\Release/faad.pch" /Fo".\Release/" /Fd".\Release/" /Gd"/>
+ AllOptions="/c /I "../include" /I "../common/mp4v2" /I "../common/faad" /nologo /W3 /O2 /Og /Ob1 /Oy /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\Release/faad.pch" /Fo".\Release/" /Fd".\Release/" /Gd"
+ MSOriginalAdditionalOptions=""/>
</Tool>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalOptions="/MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Release\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Release\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Release\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Release\libmp4v2_st60.lib""
+ AdditionalOptions="/MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib""
AdditionalDependencies="ws2_32.lib"
OutputFile=".\Release/faad.exe"
LinkIncremental="1"
@@ -126,7 +131,8 @@
SuppressStartupBanner="TRUE"
SubSystem="1">
<IntelOptions
- AllOptions="/NOLOGO /OUT:".\Release/faad.exe" /INCREMENTAL:NO ws2_32.lib /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 "e:\aac\cvsroot\faad2\libfaad\Release\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Release\libmp4v2_st60.lib" "e:\aac\cvsroot\faad2\libfaad\Release\libfaad.lib" "e:\aac\cvsroot\faad2\common\mp4v2\ST_Release\libmp4v2_st60.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"/>
+ AllOptions="/NOLOGO /OUT:".\Release/faad.exe" /INCREMENTAL:NO ws2_32.lib /SUBSYSTEM:CONSOLE /TLBID:1 /MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.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"
+ MSOriginalAdditionalOptions="/MACHINE:I386 "..\libfaad\Release\libfaad.lib" "..\common\mp4v2\ST_Release\libmp4v2_st60.lib""/>
</Tool>
<Tool
Name="VCMIDLTool"
@@ -146,7 +152,7 @@
<Tool
Name="VCWebDeploymentTool"/>
<IntelOptions
- CompilerName="1"/>
+ CompilerName="0"/>
</Configuration>
</Configurations>
<Files>
--- a/frontend/main.c
+++ b/frontend/main.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: main.c,v 1.25 2002/11/01 11:19:35 menno Exp $
+** $Id: main.c,v 1.26 2003/02/06 20:01:51 menno Exp $
**/
#ifdef _WIN32
@@ -251,10 +251,10 @@
{if(!to_stdout)
{- aufile = open_audio_file(sndfile, samplerate, frameInfo.channels,
+ aufile = open_audio_file(sndfile, frameInfo.samplerate, frameInfo.channels,
outputFormat, fileType);
} else {- aufile = open_audio_file("-", samplerate, frameInfo.channels,+ aufile = open_audio_file("-", frameInfo.samplerate, frameInfo.channels,outputFormat, fileType);
}
if (aufile == NULL)
@@ -435,13 +435,13 @@
{if(!to_stdout)
{- aufile = open_audio_file(sndfile, samplerate, frameInfo.channels,
+ aufile = open_audio_file(sndfile, frameInfo.samplerate, frameInfo.channels,
outputFormat, fileType);
} else {#ifdef _WIN32
setmode(fileno(stdout), O_BINARY);
#endif
- aufile = open_audio_file("-", samplerate, frameInfo.channels,+ aufile = open_audio_file("-", frameInfo.samplerate, frameInfo.channels,outputFormat, fileType);
}
if (aufile == NULL)
--- a/include/faad.h
+++ b/include/faad.h
@@ -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: faad.h,v 1.17 2002/12/10 19:45:35 menno Exp $
+** $Id: faad.h,v 1.18 2003/02/06 20:01:51 menno Exp $
**/
#ifndef __AACDEC_H__
@@ -85,6 +85,7 @@
unsigned long samples;
unsigned char channels;
unsigned char error;
+ unsigned long samplerate;
} faacDecFrameInfo;
char* FAADAPI faacDecGetErrorMessage(unsigned char errcode);
--- a/libfaad/common.h
+++ b/libfaad/common.h
@@ -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: common.h,v 1.28 2002/12/10 19:45:35 menno Exp $
+** $Id: common.h,v 1.29 2003/02/06 20:01:51 menno Exp $
**/
#ifndef __COMMON_H__
@@ -49,7 +49,7 @@
/* Allow decoding of MAIN profile AAC */
#define MAIN_DEC
/* Allow decoding of SSR profile AAC */
-#define SSR_DEC
+//#define SSR_DEC
/* Allow decoding of LTP profile AAC */
#define LTP_DEC
/* Allow decoding of LD profile AAC */
@@ -252,6 +252,9 @@
/* common functions */
uint32_t int_log2(uint32_t val);
+
+uint8_t get_sr_index(uint32_t samplerate);
+int8_t can_decode_ot(uint8_t object_type);
#ifndef M_PI
#define M_PI 3.14159265358979323846f
--- a/libfaad/decoder.c
+++ b/libfaad/decoder.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: decoder.c,v 1.48 2003/02/04 16:49:37 menno Exp $
+** $Id: decoder.c,v 1.49 2003/02/06 20:01:52 menno Exp $
**/
#include "common.h"
@@ -431,8 +431,10 @@
/* number of samples in this frame */
hInfo->samples = frame_len*channels;
- /* number of samples in this frame */
+ /* number of channels in this frame */
hInfo->channels = channels;
+ /* samplerate */
+ hInfo->samplerate = sample_rates[hDecoder->sf_index];
/* check if frame has channel elements */
if (channels == 0)
--- a/libfaad/libfaad.dsp
+++ b/libfaad/libfaad.dsp
@@ -351,6 +351,10 @@
# End Source File
# Begin Source File
+SOURCE=.\structs.h
+# End Source File
+# Begin Source File
+
SOURCE=.\syntax.h
# End Source File
# Begin Source File
--- a/libfaad/libfaad.sln
+++ b/libfaad/libfaad.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 7.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "libfaad.vcproj", "{1E88BCCA-E0F5-4AAF-8E25-AD02D6EB88DE}"+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "libfaad.vcproj", "{4274723E-6B9D-4B3E-A8BE-7566165AA169}"EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
@@ -9,10 +9,10 @@
GlobalSection(ProjectDependencies) = postSolution
EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
- {1E88BCCA-E0F5-4AAF-8E25-AD02D6EB88DE}.Debug.ActiveCfg = Debug|Win32- {1E88BCCA-E0F5-4AAF-8E25-AD02D6EB88DE}.Debug.Build.0 = Debug|Win32- {1E88BCCA-E0F5-4AAF-8E25-AD02D6EB88DE}.Release.ActiveCfg = Release|Win32- {1E88BCCA-E0F5-4AAF-8E25-AD02D6EB88DE}.Release.Build.0 = Release|Win32+ {4274723E-6B9D-4B3E-A8BE-7566165AA169}.Debug.ActiveCfg = Debug|Win32+ {4274723E-6B9D-4B3E-A8BE-7566165AA169}.Debug.Build.0 = Debug|Win32+ {4274723E-6B9D-4B3E-A8BE-7566165AA169}.Release.ActiveCfg = Release|Win32+ {4274723E-6B9D-4B3E-A8BE-7566165AA169}.Release.Build.0 = Release|Win32EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
--- a/libfaad/libfaad.vcproj
+++ b/libfaad/libfaad.vcproj
@@ -3,7 +3,6 @@
ProjectType="Visual C++"
Version="7.00"
Name="libfaad"
- ProjectGUID="{AB39547E-6CAC-4E25-8BC4-C97EFC144800}"SccProjectName=""
SccLocalPath="">
<Platforms>
@@ -25,7 +24,7 @@
AdditionalIncludeDirectories="fftw"
PreprocessorDefinitions="_DEBUG,WIN32,_LIB,FFTW_ENABLE_FLOAT"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\Debug/libfaad.pch"
AssemblerListingLocation=".\Debug/"
@@ -34,15 +33,13 @@
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="4"
- CompileAs="0"
- AdditionalOptions="">
+ CompileAs="0">
<IntelOptions
Optimization="0"
MinimalRebuild="1"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
- AllOptions="/c /I "fftw" /ZI /nologo /W3 /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "FFTW_ENABLE_FLOAT" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/libfaad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd <?ICLPrjArgs?> /Qvc7 /Qlocation,link,"E:\Program Files\Microsoft Visual Studio .NET\Vc7\Bin" /c /I "fftw" /ZI /nologo /W3 /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "FFTW_ENABLE_FLOAT" /D "_MBCS" /Gm /EHsc /RTC1 /MTd /YX"StdAfx.h" /Fp".\Debug/libfaad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd <?/ICLPrjArgs?> <?IVCSpawnPrjArgs?> #$UseNonIntelTool #$BinPath:"E:\Program Files\Intel\Compiler70\IA32\Bin;E:\Program Files\Common Files\Intel\Shared Files\IA32\Bin;E:\Program Files\Microsoft Visual Studio .NET\Common7\IDE" #$LibPath:"E:\Program Files\Intel\Compiler70\IA32\Lib;E:\Program Files\Common Files\Intel\Shared Files\IA32\Lib" #$IncPath:"E:\Program Files\Intel\Compiler70\IA32\Include" <?/IVCSpawnPrjArgs?>"
- MSOriginalAdditionalOptions=""/>
+ RuntimeLibrary="3"
+ AllOptions="/c /I "fftw" /ZI /nologo /W3 /Od /D "_DEBUG" /D "WIN32" /D "_LIB" /D "FFTW_ENABLE_FLOAT" /D "_MBCS" /Gm /EHsc /RTC1 /MDd /YX"StdAfx.h" /Fp".\Debug/libfaad.pch" /Fo".\Debug/" /Fd".\Debug/" /Gd"/>
</Tool>
<Tool
Name="VCCustomBuildTool"/>
@@ -49,11 +46,9 @@
<Tool
Name="VCLibrarianTool"
OutputFile=".\Debug\libfaad.lib"
- SuppressStartupBanner="TRUE"
- AdditionalOptions="">
+ SuppressStartupBanner="TRUE">
<IntelOptions
- AllOptions="/OUT:".\Debug\libfaad.lib" /NOLOGO <?ICLPrjArgs?> /OUT:".\Debug\libfaad.lib" /NOLOGO <?/ICLPrjArgs?> <?IVCSpawnPrjArgs?> #$UseNonIntelTool #$BinPath:"E:\Program Files\Intel\Compiler70\IA32\Bin;E:\Program Files\Common Files\Intel\Shared Files\IA32\Bin;E:\Program Files\Microsoft Visual Studio .NET\Common7\IDE" #$LibPath:"E:\Program Files\Intel\Compiler70\IA32\Lib;E:\Program Files\Common Files\Intel\Shared Files\IA32\Lib" #$IncPath:"E:\Program Files\Intel\Compiler70\IA32\Include" <?/IVCSpawnPrjArgs?>"
- MSOriginalAdditionalOptions=""/>
+ AllOptions="/OUT:".\Debug\libfaad.lib" /NOLOGO"/>
</Tool>
<Tool
Name="VCMIDLTool"/>
@@ -69,8 +64,6 @@
Culture="1043"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
- <IntelOptions
- CompilerName="1"/>
</Configuration>
<Configuration
Name="Release|Win32"
@@ -82,12 +75,9 @@
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
- GlobalOptimizations="FALSE"
InlineFunctionExpansion="1"
- EnableIntrinsicFunctions="TRUE"
- FavorSizeOrSpeed="1"
- OptimizeForProcessor="2"
- AdditionalIncludeDirectories=""
+ OptimizeForProcessor="0"
+ AdditionalIncludeDirectories="fftw"
PreprocessorDefinitions="NDEBUG,WIN32,_LIB,FFTW_ENABLE_FLOAT"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -99,20 +89,19 @@
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="FALSE"
- CompileAs="0"
- AdditionalOptions="">
+ CompileAs="0">
<IntelOptions
Optimization="2"
- GlobalOptimizations="0"
InlineFuncExpansion="1"
OmitFramePtrs="1"
+ OptimProc="0"
+ UseProcExt="0"
+ RequireProcExt="0"
StringPooling="1"
RuntimeLibrary="0"
BufferSecurityCheck="1"
FunctionLevelLinking="1"
- AllOptions="/c /nologo /W3 /O2 /Ob1 /Oy /D "NDEBUG" /D "WIN32" /D "_LIB" /D "FFTW_ENABLE_FLOAT" /D "_MBCS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\Release/libfaad.pch" /Fo".\Release/" /Fd".\Release/" /Gd"
- MSOriginalAdditionalOptions=""/>
+ AllOptions="/c /I "fftw" /nologo /W3 /O2 /Ob1 /Oy /D "NDEBUG" /D "WIN32" /D "_LIB" /D "FFTW_ENABLE_FLOAT" /D "_MBCS" /GF /FD /EHsc /MT /GS /Gy /YX"StdAfx.h" /Fp".\Release/libfaad.pch" /Fo".\Release/" /Fd".\Release/" /Gd"/>
</Tool>
<Tool
Name="VCCustomBuildTool"/>
@@ -119,11 +108,9 @@
<Tool
Name="VCLibrarianTool"
OutputFile=".\Release\libfaad.lib"
- SuppressStartupBanner="TRUE"
- AdditionalOptions="">
+ SuppressStartupBanner="TRUE">
<IntelOptions
- AllOptions="/OUT:".\Release\libfaad.lib" /NOLOGO"
- MSOriginalAdditionalOptions=""/>
+ AllOptions="/OUT:".\Release\libfaad.lib" /NOLOGO"/>
</Tool>
<Tool
Name="VCMIDLTool"/>
@@ -139,8 +126,6 @@
Culture="1043"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
- <IntelOptions
- CompilerName="0"/>
</Configuration>
</Configurations>
<Files>
@@ -166,7 +151,7 @@
<File
RelativePath=".\filtbank.c"/>
<File
- RelativePath="hcr.c"/>
+ RelativePath=".\hcr.c"/>
<File
RelativePath=".\ic_predict.c"/>
<File
@@ -186,15 +171,15 @@
<File
RelativePath=".\pulse.c"/>
<File
- RelativePath="rvlc.c"/>
+ RelativePath=".\rvlc.c"/>
<File
RelativePath=".\specrec.c"/>
<File
- RelativePath="ssr.c"/>
+ RelativePath=".\ssr.c"/>
<File
- RelativePath="ssr_fb.c"/>
+ RelativePath=".\ssr_fb.c"/>
<File
- RelativePath="ssr_ipqf.c"/>
+ RelativePath=".\ssr_ipqf.c"/>
<File
RelativePath=".\syntax.c"/>
<File
@@ -254,8 +239,6 @@
<File
RelativePath=".\filtbank.h"/>
<File
- RelativePath="fixed.h"/>
- <File
RelativePath=".\codebook\hcb.h"/>
<File
RelativePath=".\huffman.h"/>
@@ -280,21 +263,11 @@
<File
RelativePath=".\pulse.h"/>
<File
- RelativePath="rvlc.h"/>
+ RelativePath=".\rvlc.h"/>
<File
- RelativePath="sine_win.h"/>
- <File
RelativePath=".\specrec.h"/>
<File
- RelativePath="ssr.h"/>
- <File
- RelativePath="ssr_fb.h"/>
- <File
- RelativePath="ssr_ipqf.h"/>
- <File
- RelativePath="ssr_win.h"/>
- <File
- RelativePath="structs.h"/>
+ RelativePath=".\ssr.h"/>
<File
RelativePath=".\syntax.h"/>
<File
--- a/libfaad/structs.h
+++ b/libfaad/structs.h
@@ -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: structs.h,v 1.3 2002/12/10 14:53:15 menno Exp $
+** $Id: structs.h,v 1.4 2003/02/06 20:01:53 menno Exp $
**/
#ifndef __STRUCTS_H__
@@ -293,6 +293,7 @@
uint32_t samples;
uint8_t channels;
uint8_t error;
+ uint32_t samplerate;
} faacDecFrameInfo;
typedef struct
--- a/plugins/in_mp4/in_mp4.dsp
+++ b/plugins/in_mp4/in_mp4.dsp
@@ -69,7 +69,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\common\mp4v2" /I "..\..\common\mp4av" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "..\..\include" /I "..\..\common\mp4v2" /I "..\..\common\mp4av" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x413 /d "_DEBUG"