1
0
mirror of https://github.com/nu774/fdkaac.git synced 2025-06-05 23:29:14 +02:00

25 Commits

Author SHA1 Message Date
f67cfe227e fix mp4 duration & version calcuration 2013-01-13 00:58:38 +09:00
e476728e77 add support for xid 2013-01-11 22:17:28 +09:00
dac71de305 support for i686-pc-mingw32 (missing _vscprintf) 2013-01-11 17:33:54 +09:00
61b6a9e383 bump version 2013-01-10 12:18:56 +09:00
5888fddccf rename basename() -> aacenc_basename() and move to compat layer 2013-01-10 11:14:16 +09:00
c5c459082a add --tag and --long-tag 2013-01-10 10:58:19 +09:00
00799c5e44 fix corner case of progress display 2013-01-09 16:39:39 +09:00
6887939854 calculate length from file size 2013-01-09 11:37:25 +09:00
6854317606 raw input support 2013-01-09 00:12:55 +09:00
8960a17764 insert a white space in progress message 2013-01-08 22:11:10 +09:00
34b319e08b fix typo of bitrate-mode option 2013-01-07 20:11:52 +09:00
158dc13cc8 more static inlining (missed on the previous commit) 2013-01-07 13:24:09 +09:00
5e1168a4dd check error of fread() and fwrite() 2013-01-07 13:14:46 +09:00
01993d6774 change inline->static inline to follow C99 semantics (for Clang) 2013-01-07 12:54:50 +09:00
9ad6264b3c explicitly add -lfdk-aac to LDADD in Makefile.am 2013-01-07 11:36:41 +09:00
7db9e2768d add some files to EXTRA_DIST in Makefile.am 2013-01-07 11:25:22 +09:00
097ef9a838 fixed a typo in usage message 2013-01-07 10:58:09 +09:00
e901466335 add MSVC projects 2013-01-06 18:37:55 +09:00
eba9a5841e add .gitattributes 2013-01-06 18:25:49 +09:00
d5a9697e47 more tweak on configure.ac and Makefile.am (take care of getopt_long) 2013-01-06 15:39:48 +09:00
7222b0b5ac use fstat() to test seekability of input file 2013-01-06 13:41:31 +09:00
112fdaf461 retrieve bitrate for tool tag with aacEncoder_GetParam() 2013-01-06 13:26:19 +09:00
af8fa38d33 output to current working directory by default 2013-01-06 13:19:07 +09:00
d1ce25369b zero clear LIB_INFO before calling aacEncGetLibInfo() 2013-01-05 23:56:15 +09:00
bae3489b91 tweak configure.ac and Makefile.am 2013-01-05 14:20:23 +09:00
20 changed files with 1642 additions and 146 deletions

3
.gitattributes vendored Normal file
View File

@ -0,0 +1,3 @@
* text=auto
*.sln text eol=crlf
*.lib binary

264
MSVC/fdk-aac.vcxproj Normal file
View File

@ -0,0 +1,264 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{D7D4B982-8B16-4A10-8B1C-9527BD789709}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>fdkaac</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(Configuration)Lib\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(Configuration)Lib\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../fdk-aac/libaacenc/include;../fdk-aac/libFDK/include;../fdk-aac/libMpegTPEnc/include;../fdk-aac/libPCMutils/include;../fdk-aac/libSBRenc/include;../fdk-aac/libSYS/include</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../fdk-aac/libaacenc/include;../fdk-aac/libFDK/include;../fdk-aac/libMpegTPEnc/include;../fdk-aac/libPCMutils/include;../fdk-aac/libSBRenc/include;../fdk-aac/libSYS/include</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_hcr.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_lib.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_pns.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\aacEnc_ram.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\aacEnc_rom.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_tns.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\adj_thr.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\bandwidth.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\band_nrg.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\bitenc.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\bit_cnt.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\block_switch.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\channel_map.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\chaosmeasure.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\dyn_bits.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\grp_data.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\intensity.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\line_pe.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\metadata_compressor.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\metadata_main.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\ms_stereo.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\noisedet.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\pnsparam.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\pre_echo_control.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\psy_configuration.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\psy_main.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\qc_main.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\quantize.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\sf_estim.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\spreading.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\tonality.cpp" />
<ClCompile Include="..\fdk-aac\libAACenc\src\transform.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\autocorr2nd.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\dct.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_bitbuffer.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_core.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_crc.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_hybrid.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_tools_rom.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_trigFcts.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\fft.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\fft_rad2.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\fixpoint_math.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\mdct.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\qmf.cpp" />
<ClCompile Include="..\fdk-aac\libFDK\src\scale.cpp" />
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adif.cpp" />
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adts.cpp" />
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_asc.cpp" />
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_latm.cpp" />
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_lib.cpp" />
<ClCompile Include="..\fdk-aac\libPCMutils\src\pcmutils_lib.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\bit_sbr.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\code_env.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\env_bit.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\env_est.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\fram_gen.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\invf_est.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\mh_det.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\nf_est.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_bitenc.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_encode.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_main.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\resampler.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbrenc_freq_sca.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_encoder.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_misc.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_ram.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_rom.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\ton_corr.cpp" />
<ClCompile Include="..\fdk-aac\libSBRenc\src\tran_det.cpp" />
<ClCompile Include="..\fdk-aac\libSYS\src\conv_string.cpp" />
<ClCompile Include="..\fdk-aac\libSYS\src\genericStds.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\fdk-aac\libAACenc\include\aacenc_lib.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_hcr.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_pns.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\aacEnc_ram.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\aacEnc_rom.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_tns.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\adj_thr.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\adj_thr_data.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\bandwidth.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\band_nrg.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\bitenc.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\bit_cnt.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\block_switch.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\channel_map.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\chaosmeasure.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\dyn_bits.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\grp_data.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\intensity.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\interface.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\line_pe.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\metadata_compressor.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\metadata_main.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\ms_stereo.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\noisedet.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\pnsparam.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\pns_func.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\pre_echo_control.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_configuration.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_const.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_data.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_main.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\qc_data.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\qc_main.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\quantize.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\sf_estim.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\spreading.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\tns_func.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\tonality.h" />
<ClInclude Include="..\fdk-aac\libAACenc\src\transform.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\abs.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\autocorr2nd.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\clz.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\common_fix.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\cplx_mul.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\dct.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_archdef.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_bitbuffer.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_bitstream.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_core.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_crc.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_hybrid.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_tools_rom.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_trigFcts.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\fft.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\fft_rad2.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\fixmadd.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\fixminmax.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\fixmul.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\fixpoint_math.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\mdct.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\qmf.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\scale.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\scramble.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\x86\abs_x86.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\x86\clz_x86.h" />
<ClInclude Include="..\fdk-aac\libFDK\include\x86\fixmul_x86.h" />
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\mpegFileWrite.h" />
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\tpenc_lib.h" />
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\tp_data.h" />
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adif.h" />
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adts.h" />
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_asc.h" />
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_latm.h" />
<ClInclude Include="..\fdk-aac\libPCMutils\include\pcmutils_lib.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\include\sbr_encoder.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\bit_sbr.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\cmondata.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\code_env.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\env_bit.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\env_est.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\fram_gen.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\invf_est.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\mh_det.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\nf_est.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_bitenc.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_const.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_encode.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_main.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\resampler.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbrenc_freq_sca.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_def.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_misc.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_ram.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_rom.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\ton_corr.h" />
<ClInclude Include="..\fdk-aac\libSBRenc\src\tran_det.h" />
<ClInclude Include="..\fdk-aac\libSYS\include\audio.h" />
<ClInclude Include="..\fdk-aac\libSYS\include\cmdl_parser.h" />
<ClInclude Include="..\fdk-aac\libSYS\include\conv_string.h" />
<ClInclude Include="..\fdk-aac\libSYS\include\FDK_audio.h" />
<ClInclude Include="..\fdk-aac\libSYS\include\genericStds.h" />
<ClInclude Include="..\fdk-aac\libSYS\include\machine_type.h" />
<ClInclude Include="..\fdk-aac\libSYS\include\wav_file.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -0,0 +1,558 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_hcr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_lib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_pns.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\aacEnc_ram.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\aacEnc_rom.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\aacenc_tns.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\adj_thr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\bandwidth.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\band_nrg.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\bitenc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\bit_cnt.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\block_switch.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\channel_map.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\chaosmeasure.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\dyn_bits.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\grp_data.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\intensity.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\line_pe.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\metadata_compressor.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\metadata_main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\ms_stereo.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\noisedet.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\pnsparam.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\pre_echo_control.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\psy_configuration.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\psy_main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\qc_main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\quantize.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\sf_estim.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\spreading.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\tonality.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libAACenc\src\transform.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\autocorr2nd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\dct.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_bitbuffer.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_core.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_crc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_hybrid.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_tools_rom.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\FDK_trigFcts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\fft.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\fft_rad2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\fixpoint_math.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\mdct.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\qmf.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libFDK\src\scale.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adif.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adts.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_asc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_latm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libMpegTPEnc\src\tpenc_lib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libPCMutils\src\pcmutils_lib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\bit_sbr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\code_env.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\env_bit.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\env_est.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\fram_gen.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\invf_est.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\mh_det.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\nf_est.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_bitenc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_encode.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\ps_main.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\resampler.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbrenc_freq_sca.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_encoder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_misc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_ram.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_rom.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\ton_corr.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSBRenc\src\tran_det.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSYS\src\conv_string.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\fdk-aac\libSYS\src\genericStds.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\fdk-aac\libAACenc\include\aacenc_lib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_hcr.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_pns.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\aacEnc_ram.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\aacEnc_rom.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\aacenc_tns.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\adj_thr.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\adj_thr_data.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\bandwidth.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\band_nrg.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\bitenc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\bit_cnt.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\block_switch.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\channel_map.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\chaosmeasure.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\dyn_bits.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\grp_data.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\intensity.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\interface.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\line_pe.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\metadata_compressor.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\metadata_main.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\ms_stereo.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\noisedet.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\pnsparam.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\pns_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\pre_echo_control.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_configuration.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_const.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_data.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\psy_main.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\qc_data.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\qc_main.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\quantize.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\sf_estim.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\spreading.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\tns_func.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\tonality.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libAACenc\src\transform.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\abs.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\autocorr2nd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\clz.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\common_fix.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\cplx_mul.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\dct.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_archdef.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_bitbuffer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_bitstream.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_core.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_crc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_hybrid.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_tools_rom.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\FDK_trigFcts.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\fft.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\fft_rad2.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\fixmadd.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\fixminmax.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\fixmul.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\fixpoint_math.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\mdct.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\qmf.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\scale.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\scramble.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\x86\abs_x86.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\x86\clz_x86.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libFDK\include\x86\fixmul_x86.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\mpegFileWrite.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\tpenc_lib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libMpegTPEnc\include\tp_data.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adif.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_adts.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_asc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libMpegTPEnc\src\tpenc_latm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libPCMutils\include\pcmutils_lib.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\include\sbr_encoder.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\bit_sbr.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\cmondata.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\code_env.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\env_bit.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\env_est.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\fram_gen.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\invf_est.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\mh_det.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\nf_est.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_bitenc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_const.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_encode.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\ps_main.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\resampler.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbrenc_freq_sca.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_def.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_misc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_ram.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\sbr_rom.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\ton_corr.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSBRenc\src\tran_det.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSYS\include\audio.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSYS\include\cmdl_parser.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSYS\include\conv_string.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSYS\include\FDK_audio.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSYS\include\genericStds.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSYS\include\machine_type.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\fdk-aac\libSYS\include\wav_file.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

26
MSVC/fdkaac.sln Normal file
View File

@ -0,0 +1,26 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdkaac", "fdkaac.vcxproj", "{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fdk-aac", "fdk-aac.vcxproj", "{D7D4B982-8B16-4A10-8B1C-9527BD789709}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}.Debug|Win32.ActiveCfg = Debug|Win32
{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}.Debug|Win32.Build.0 = Debug|Win32
{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}.Release|Win32.ActiveCfg = Release|Win32
{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}.Release|Win32.Build.0 = Release|Win32
{D7D4B982-8B16-4A10-8B1C-9527BD789709}.Debug|Win32.ActiveCfg = Debug|Win32
{D7D4B982-8B16-4A10-8B1C-9527BD789709}.Debug|Win32.Build.0 = Debug|Win32
{D7D4B982-8B16-4A10-8B1C-9527BD789709}.Release|Win32.ActiveCfg = Release|Win32
{D7D4B982-8B16-4A10-8B1C-9527BD789709}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

110
MSVC/fdkaac.vcxproj Normal file
View File

@ -0,0 +1,110 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{E62D32CF-E308-40BD-9FF0-8266C6CAA9AA}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>fdkaac</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IntDir>cli_$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(Configuration)Cli\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>HAVE_STDINT_H;inline=__inline;_CRT_SECURE_NO_WARNINGS;WIN32;_CONSOLE;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../fdk-aac/libSYS/include;../fdk-aac/libAACenc/include;../missings;.;..</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<PrecompiledHeader>
</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>HAVE_STDINT_H;inline=__inline;_CRT_SECURE_NO_WARNINGS;WIN32;_CONSOLE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>../fdk-aac/libSYS/include;../fdk-aac/libAACenc/include;../missings;.;..</AdditionalIncludeDirectories>
<StringPooling>true</StringPooling>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\missings\getopt.c" />
<ClCompile Include="..\src\aacenc.c" />
<ClCompile Include="..\src\compat_win32.c" />
<ClCompile Include="..\src\lpcm.c" />
<ClCompile Include="..\src\m4af.c" />
<ClCompile Include="..\src\main.c" />
<ClCompile Include="..\src\progress.c" />
<ClCompile Include="..\src\wav_reader.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\missings\getopt.h" />
<ClInclude Include="..\src\aacenc.h" />
<ClInclude Include="..\src\compat.h" />
<ClInclude Include="..\src\lpcm.h" />
<ClInclude Include="..\src\m4af.h" />
<ClInclude Include="..\src\m4af_endian.h" />
<ClInclude Include="..\src\progress.h" />
<ClInclude Include="..\src\wav_reader.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="fdk-aac.vcxproj">
<Project>{d7d4b982-8b16-4a10-8b1c-9527bd789709}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

View File

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\src\aacenc.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\compat_win32.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\lpcm.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\m4af.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\main.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\progress.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\src\wav_reader.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\missings\getopt.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\src\aacenc.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\compat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\lpcm.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\m4af.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\m4af_endian.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\progress.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\src\wav_reader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\missings\getopt.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

View File

@ -1,18 +1,18 @@
ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = COPYING
AUTOMAKE_OPTIONS = subdir-objects
bin_PROGRAMS = fdkaac
fdkaac_SOURCES = \
src/aacenc.c \
src/lpcm.c \
src/m4af.c \
src/main.c \
src/progress.c \
src/wav_reader.c
src/aacenc.c \
src/lpcm.c \
src/m4af.c \
src/main.c \
src/progress.c \
src/wav_reader.c
fdkaac_LDADD = \
@LIBICONV@ -lm
@LIBICONV@ -lfdk-aac -lm
if FDK_PLATFORM_POSIX
fdkaac_SOURCES += \
@ -23,3 +23,18 @@ if FDK_PLATFORM_WIN32
fdkaac_SOURCES += \
src/compat_win32.c
endif
if FDK_NO_GETOPT_LONG
fdkaac_SOURCES += \
missings/getopt.c
AM_CPPFLAGS = -Imissings
endif
EXTRA_DIST = \
m4/.gitkeep \
src/*.h \
missings/*.c \
missings/*.h \
MSVC/*.vcxproj \
MSVC/*.vcxproj.filters \
MSVC/*.sln

31
README
View File

@ -4,11 +4,30 @@ fdkaac - command line frontend encoder for libfdk-aac
Prerequisites
-------------
You need libfdk-aac, GNU autoconf and automake, and C compiler.
On Posix environment, you will also need GNU gettext (for iconv.m4).
You need libfdk-aac.
On Posix environment, you will also need GNU gettext (for iconv.m4) and
GNU autoconf/automake.
How to build on Posix environment
---------------------------------
First, you need to build libfdk-aac and install on your system.
Once you have done it, the following will do the task.
(MinGW build can be done the same way, and doesn't require gettext/iconv)
How to build
------------
$ autoreconf -i
$ ./configure
$ make
$ ./configure && make && make install
How to build on MSVC
--------------------
First you have to extract libfdk-aac source here, so that directory tree will
look like the following:
+- fdk-aac ---+-documentation
| +-libAACdec
| +-libAACenc
| :
+- m4
+- missings
+- MSVC
+- src
MSVC solution for Visual Studio 2010 is under MSVC directory.

View File

@ -10,8 +10,9 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE
AC_PROG_CC
AM_PROG_CC_C_O
AC_CHECK_HEADERS([getopt.h sys/time.h])
AC_CHECK_HEADERS([sys/time.h])
AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
AC_CHECK_HEADERS([fdk-aac/aacenc_lib.h], ,
AC_MSG_ERROR([libfdk-aac is required]))
@ -31,8 +32,10 @@ AC_CHECK_TYPES([ptrdiff_t])
AC_SYS_LARGEFILE
AC_FUNC_FSEEKO
AC_CHECK_FUNCS([gettimeofday nl_langinfo strdup])
AC_SEARCH_LIBS([aacEncOpen],[fdk-aac])
AC_CHECK_FUNCS([gettimeofday nl_langinfo strdup _vscprintf])
AC_CHECK_FUNC(getopt_long)
AM_CONDITIONAL([FDK_NO_GETOPT_LONG],[test "$ac_cv_func_getopt_long" != "yes"])
AC_SEARCH_LIBS([aacEncOpen],[fdk-aac],[],[],[])
AC_CANONICAL_HOST

View File

@ -20,5 +20,6 @@ FILE *aacenc_fopen(const char *name, const char *mode);
void aacenc_getmainargs(int *argc, char ***argv);
char *aacenc_to_utf8(const char *s);
int aacenc_fprintf(FILE *fp, const char *fmt, ...);
const char *aacenc_basename(const char *path);
#endif

View File

@ -48,6 +48,16 @@ int aacenc_fprintf(FILE *fp, const char *fmt, ...)
return cnt;
}
/*
* Different from POSIX basename() when path ends with /.
* Since we use this only for a regular file, the difference doesn't matter.
*/
const char *aacenc_basename(const char *path)
{
const char *p = strrchr(path, '/');
return p ? p + 1: path;
}
#ifndef HAVE_ICONV
char *aacenc_to_utf8(const char *s)
{

View File

@ -12,6 +12,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
#include <assert.h>
#include <io.h>
#include <fcntl.h>
#include <sys/timeb.h>
@ -92,6 +93,20 @@ char *aacenc_to_utf8(const char *s)
return _strdup(s);
}
#if defined(__MINGW32__) && !defined(HAVE__VSCPRINTF)
int _vscprintf(const char *fmt, va_list ap)
{
static int (*fp_vscprintf)(const char *, va_list) = 0;
if (!fp_vscprintf) {
HANDLE h = GetModuleHandleA("msvcrt.dll");
FARPROC fp = GetProcAddress(h, "_vscprintf");
InterlockedCompareExchangePointer(&fp_vscprintf, fp, 0);
}
assert(fp_vscprintf);
return fp_vscprintf(fmt, ap);
}
#endif
int aacenc_fprintf(FILE *fp, const char *fmt, ...)
{
va_list ap;
@ -126,3 +141,15 @@ int aacenc_fprintf(FILE *fp, const char *fmt, ...)
return cnt;
}
const char *aacenc_basename(const char *path)
{
/*
* Since path is encoded with UTF-8, naive usage of strrchr() shoule be safe.
*/
const char *p = strrchr(path, '/');
const char *q = strrchr(path, '\\');
const char *r = strrchr(path, ':');
if (q > p) p = q;
if (r > p) p = r;
return p ? p + 1 : path;
}

View File

@ -34,6 +34,7 @@ inline int lrint(double x)
# endif
#endif
static
inline double pcm_clip(double n, double min_value, double max_value)
{
if (n < min_value)
@ -42,6 +43,7 @@ inline double pcm_clip(double n, double min_value, double max_value)
return max_value;
return n;
}
static
inline float pcm_i2f(int32_t n)
{
union {
@ -51,6 +53,7 @@ inline float pcm_i2f(int32_t n)
u.ivalue = n;
return u.fvalue;
}
static
inline double pcm_i2d(int64_t n)
{
union {
@ -60,99 +63,123 @@ inline double pcm_i2d(int64_t n)
u.ivalue = n;
return u.fvalue;
}
static
inline int16_t pcm_quantize_s32(int32_t n)
{
n = ((n >> 15) + 1) >> 1;
return (n == 0x8000) ? 0x7fff : n;
}
static
inline int16_t pcm_quantize_f64(double v)
{
return (int16_t)lrint(pcm_clip(v * 32768.0, -32768.0, 32767.0));
}
static
inline int16_t pcm_s8_to_s16(int8_t n)
{
return n << 8;
}
static
inline int16_t pcm_u8_to_s16(uint8_t n)
{
return (n << 8) ^ 0x8000;
}
static
inline int16_t pcm_s16le_to_s16(int16_t n)
{
return m4af_ltoh16(n);
}
static
inline int16_t pcm_s16be_to_s16(int16_t n)
{
return m4af_btoh16(n);
}
static
inline int16_t pcm_u16le_to_s16(uint16_t n)
{
return m4af_ltoh16(n) ^ 0x8000;
}
static
inline int16_t pcm_u16be_to_s16(uint16_t n)
{
return m4af_btoh16(n) ^ 0x8000;
}
static
inline int32_t pcm_s24le_to_s32(uint8_t *p)
{
return p[0]<<8 | p[1]<<16 | p[2]<<24;
}
static
inline int32_t pcm_s24be_to_s32(uint8_t *p)
{
return p[0]<<24 | p[1]<<16 | p[2]<<8;
}
static
inline int32_t pcm_u24le_to_s32(uint8_t *p)
{
return pcm_s24le_to_s32(p) ^ 0x80000000;
}
static
inline int32_t pcm_u24be_to_s32(uint8_t *p)
{
return pcm_s24be_to_s32(p) ^ 0x80000000;
}
static
inline int16_t pcm_s24le_to_s16(uint8_t *p)
{
return pcm_quantize_s32(pcm_s24le_to_s32(p));
}
static
inline int16_t pcm_s24be_to_s16(uint8_t *p)
{
return pcm_quantize_s32(pcm_s24be_to_s32(p));
}
static
inline int16_t pcm_u24le_to_s16(uint8_t *p)
{
return pcm_quantize_s32(pcm_u24le_to_s32(p));
}
static
inline int16_t pcm_u24be_to_s16(uint8_t *p)
{
return pcm_quantize_s32(pcm_u24be_to_s32(p));
}
static
inline int16_t pcm_s32le_to_s16(int32_t n)
{
return pcm_quantize_s32(m4af_ltoh32(n));
}
static
inline int16_t pcm_s32be_to_s16(int32_t n)
{
return pcm_quantize_s32(m4af_btoh32(n));
}
static
inline int16_t pcm_u32le_to_s16(int32_t n)
{
return pcm_quantize_s32(m4af_ltoh32(n) ^ 0x80000000);
}
static
inline int16_t pcm_u32be_to_s16(int32_t n)
{
return pcm_quantize_s32(m4af_btoh32(n) ^ 0x80000000);
}
static
inline int16_t pcm_f32le_to_s16(int32_t n)
{
return pcm_quantize_f64(pcm_i2f(m4af_ltoh32(n)));
}
static
inline int16_t pcm_f32be_to_s16(int32_t n)
{
return pcm_quantize_f64(pcm_i2f(m4af_btoh32(n)));
}
static
inline int16_t pcm_f64le_to_s16(int64_t n)
{
return pcm_quantize_f64(pcm_i2d(m4af_ltoh64(n)));
}
static
inline int16_t pcm_f64be_to_s16(int64_t n)
{
return pcm_quantize_f64(pcm_i2d(m4af_btoh64(n)));

View File

@ -456,12 +456,18 @@ int m4af_add_itmf_int16_tag(m4af_writer_t *ctx, uint32_t type, int value)
return m4af_add_itmf_short_tag(ctx, type, M4AF_INTEGER, &data, 2);
}
int m4af_add_itmf_int32_tag(m4af_writer_t *ctx, uint32_t type, int value)
int m4af_add_itmf_int32_tag(m4af_writer_t *ctx, uint32_t type, uint32_t value)
{
uint32_t data = m4af_htob32(value);
return m4af_add_itmf_short_tag(ctx, type, M4AF_INTEGER, &data, 4);
}
int m4af_add_itmf_int64_tag(m4af_writer_t *ctx, uint32_t type, uint64_t value)
{
uint64_t data = m4af_htob64(value);
return m4af_add_itmf_short_tag(ctx, type, M4AF_INTEGER, &data, 8);
}
int m4af_add_itmf_track_tag(m4af_writer_t *ctx, int track, int total)
{
uint16_t data[4] = { 0 };
@ -509,15 +515,6 @@ void m4af_update_size(m4af_writer_t *ctx, int64_t pos)
m4af_set_pos(ctx, current_pos);
}
static
int m4af_head_version(m4af_writer_t *ctx, int track_idx)
{
m4af_track_t *track = &ctx->track[track_idx];
return track->duration > UINT32_MAX
|| track->creation_time > UINT32_MAX
|| track->modification_time > UINT32_MAX;
}
static
void m4af_descriptor(m4af_writer_t *ctx, uint32_t tag, uint32_t size)
{
@ -829,7 +826,9 @@ void m4af_mdhd_box(m4af_writer_t *ctx, int track_idx)
{
m4af_track_t *track = &ctx->track[track_idx];
int64_t pos = m4af_tell(ctx);
uint8_t version = m4af_head_version(ctx, track_idx);
uint8_t version = (track->creation_time > UINT32_MAX ||
track->modification_time > UINT32_MAX ||
track->duration > UINT32_MAX);
m4af_write(ctx, "\0\0\0\0mdhd", 8);
m4af_write(ctx, &version, 1);
@ -892,7 +891,11 @@ void m4af_tkhd_box(m4af_writer_t *ctx, int track_idx)
{
m4af_track_t *track = &ctx->track[track_idx];
int64_t pos = m4af_tell(ctx);
uint8_t version = m4af_head_version(ctx, track_idx);
int64_t duration =
(double)track->duration / track->timescale * ctx->timescale + .5;
uint8_t version = (track->creation_time > UINT32_MAX ||
track->modification_time > UINT32_MAX ||
duration > UINT32_MAX);
m4af_write(ctx, "\0\0\0\0tkhd", 8);
m4af_write(ctx, &version, 1);
m4af_write(ctx, "\0\0\007", 3); /* flags */
@ -902,14 +905,14 @@ void m4af_tkhd_box(m4af_writer_t *ctx, int track_idx)
m4af_write32(ctx, track_idx + 1);
m4af_write(ctx, "\0\0\0\0" /* reserved */
, 4);
m4af_write64(ctx, track->duration);
m4af_write64(ctx, duration);
} else {
m4af_write32(ctx, track->creation_time);
m4af_write32(ctx, track->modification_time);
m4af_write32(ctx, track_idx + 1);
m4af_write(ctx, "\0\0\0\0" /* reserved */
, 4);
m4af_write32(ctx, track->duration);
m4af_write32(ctx, duration);
}
m4af_write(ctx,
"\0\0\0\0" /* reserved[0] */
@ -950,7 +953,7 @@ int64_t m4af_movie_duration(m4af_writer_t *ctx)
unsigned i;
for (i = 0; i < ctx->num_tracks; ++i) {
double x = ctx->track[i].duration;
int64_t duration = x * ctx->track[i].timescale / ctx->timescale + .5;
int64_t duration = x / ctx->track[i].timescale * ctx->timescale + .5;
if (duration > movie_duration)
movie_duration = duration;
}
@ -961,8 +964,10 @@ static
void m4af_mvhd_box(m4af_writer_t *ctx)
{
int64_t pos = m4af_tell(ctx);
uint8_t version = m4af_head_version(ctx, 0);
int64_t movie_duration = m4af_movie_duration(ctx);
uint8_t version = (ctx->creation_time > UINT32_MAX ||
ctx->modification_time > UINT32_MAX ||
movie_duration > UINT32_MAX);
m4af_write(ctx, "\0\0\0\0mvhd", 8);
m4af_write(ctx, &version, 1);

View File

@ -103,7 +103,9 @@ int m4af_add_itmf_int8_tag(m4af_writer_t *ctx, uint32_t type, int value);
int m4af_add_itmf_int16_tag(m4af_writer_t *ctx, uint32_t type, int value);
int m4af_add_itmf_int32_tag(m4af_writer_t *ctx, uint32_t type, int value);
int m4af_add_itmf_int32_tag(m4af_writer_t *ctx, uint32_t type, uint32_t value);
int m4af_add_itmf_int64_tag(m4af_writer_t *ctx, uint32_t type, uint64_t value);
int m4af_add_itmf_track_tag(m4af_writer_t *ctx, int track, int total);

View File

@ -8,12 +8,25 @@
#if HAVE_STDINT_H
# include <stdint.h>
#endif
#if HAVE_INTTYPES_H
# include <inttypes.h>
#elif defined(_MSC_VER)
# define SCNd64 "I64d"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <locale.h>
#include <errno.h>
#include <sys/stat.h>
#include <getopt.h>
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef _WIN32
#include <io.h>
#endif
#include "compat.h"
#include "wav_reader.h"
#include "aacenc.h"
@ -26,13 +39,15 @@
static
int read_callback(void *cookie, void *data, uint32_t size)
{
return fread(data, 1, size, (FILE*)cookie);
size_t rc = fread(data, 1, size, (FILE*)cookie);
return ferror((FILE*)cookie) ? -1 : (int)rc;
}
static
int write_callback(void *cookie, const void *data, uint32_t size)
{
return fwrite(data, 1, size, (FILE*)cookie);
size_t rc = fwrite(data, 1, size, (FILE*)cookie);
return ferror((FILE*)cookie) ? -1 : (int)rc;
}
static
@ -73,7 +88,7 @@ PROGNAME " %s\n"
" parameter settings, sample rate, and\n"
" channel configuration)\n"
" -w, --bandwidth <n> Frequency bandwidth in Hz (AAC LC only)\n"
" -a, --afterurner <n> Afterburner\n"
" -a, --afterburner <n> Afterburner\n"
" 0: Off\n"
" 1: On(default)\n"
" -L, --lowdelay-sbr Enable ELD-SBR (AAC ELD only)\n"
@ -88,13 +103,27 @@ PROGNAME " %s\n"
" 6: LATM MCP=1\n"
" 7: LATM MCP=0\n"
" 10: LOAS/LATM (LATM within LOAS)\n"
" -c, --adts-crc-check Add CRC protection on ADTS header\n"
" -C, --adts-crc-check Add CRC protection on ADTS header\n"
" -h, --header-period <n> StreamMuxConfig/PCE repetition period in\n"
" transport layer\n"
"\n"
" -o <filename> Output filename\n"
" --ignore-length Ignore length of WAV header\n"
"\n"
"Options for raw (headerless) input:\n"
" -R, --raw Treat input as raw (by default WAV is\n"
" assumed)\n"
" --raw-channels <n> Number of channels (default: 2)\n"
" --raw-rate <n> Sample rate (default: 44100)\n"
" --raw-format <spec> Sample format, default is \"S16L\".\n"
" Spec is as follows:\n"
" 1st char: S(igned)|U(nsigned)|F(loat)\n"
" 2nd part: bits per channel\n"
" Last char: L(ittle)|B(ig)\n"
" Last char can be omitted, in which case L is\n"
" assumed. Spec is case insensitive, therefore\n"
" \"u16b\" is same as \"U16B\".\n"
"\n"
"Tagging options:\n"
" --title <string>\n"
" --artist <string>\n"
@ -108,12 +137,16 @@ PROGNAME " %s\n"
" --track <number[/total]>\n"
" --disk <number[/total]>\n"
" --tempo <n>\n"
" --tag <fcc>:<value> Set iTunes predefined tag with four char code.\n"
" --long-tag <name>:<value> Set arbitrary tag as iTunes custom metadata.\n"
, fdkaac_version);
}
typedef struct aacenc_tag_entry_t {
uint32_t tag;
const char *name;
const char *data;
uint32_t data_size;
} aacenc_tag_entry_t;
typedef struct aacenc_param_ex_t {
@ -123,50 +156,88 @@ typedef struct aacenc_param_ex_t {
char *output_filename;
unsigned ignore_length;
int is_raw;
unsigned raw_channels;
unsigned raw_rate;
const char *raw_format;
aacenc_tag_entry_t *tag_table;
unsigned tag_count;
unsigned tag_table_capacity;
} aacenc_param_ex_t;
static
void param_add_itmf_entry(aacenc_param_ex_t *params, uint32_t tag,
const char *key, const char *value, uint32_t size)
{
aacenc_tag_entry_t *entry;
if (params->tag_count == params->tag_table_capacity) {
unsigned newsize = params->tag_table_capacity;
newsize = newsize ? newsize * 2 : 1;
params->tag_table =
realloc(params->tag_table, newsize * sizeof(aacenc_tag_entry_t));
params->tag_table_capacity = newsize;
}
entry = params->tag_table + params->tag_count;
entry->tag = tag;
if (tag == M4AF_FOURCC('-','-','-','-'))
entry->name = key;
entry->data = value;
entry->data_size = size;
params->tag_count++;
}
static
int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
{
int ch;
unsigned n;
aacenc_tag_entry_t *tag;
#define OPT_RAW_CHANNELS M4AF_FOURCC('r','c','h','n')
#define OPT_RAW_RATE M4AF_FOURCC('r','r','a','t')
#define OPT_RAW_FORMAT M4AF_FOURCC('r','f','m','t')
#define OPT_SHORT_TAG M4AF_FOURCC('s','t','a','g')
#define OPT_LONG_TAG M4AF_FOURCC('l','t','a','g')
static struct option long_options[] = {
{ "help", no_argument, 0, 'h' },
{ "profile", required_argument, 0, 'p' },
{ "bitrate", required_argument, 0, 'b' },
{ "biterate-mode", required_argument, 0, 'm' },
{ "bitrate-mode", required_argument, 0, 'm' },
{ "bandwidth", required_argument, 0, 'w' },
{ "afterburner", required_argument, 0, 'a' },
{ "lowdelay-sbr", no_argument, 0, 'L' },
{ "sbr-signaling", required_argument, 0, 's' },
{ "transport-format", required_argument, 0, 'f' },
{ "adts-crc-check", no_argument, 0, 'c' },
{ "adts-crc-check", no_argument, 0, 'C' },
{ "header-period", required_argument, 0, 'P' },
{ "ignore-length", no_argument, 0, 'I' },
{ "title", required_argument, 0, M4AF_TAG_TITLE },
{ "artist", required_argument, 0, M4AF_TAG_ARTIST },
{ "album", required_argument, 0, M4AF_TAG_ALBUM },
{ "genre", required_argument, 0, M4AF_TAG_GENRE },
{ "date", required_argument, 0, M4AF_TAG_DATE },
{ "composer", required_argument, 0, M4AF_TAG_COMPOSER },
{ "grouping", required_argument, 0, M4AF_TAG_GROUPING },
{ "comment", required_argument, 0, M4AF_TAG_COMMENT },
{ "album-artist", required_argument, 0, M4AF_TAG_ALBUM_ARTIST },
{ "track", required_argument, 0, M4AF_TAG_TRACK },
{ "disk", required_argument, 0, M4AF_TAG_DISK },
{ "tempo", required_argument, 0, M4AF_TAG_TEMPO },
{ "raw", no_argument, 0, 'R' },
{ "raw-channels", required_argument, 0, OPT_RAW_CHANNELS },
{ "raw-rate", required_argument, 0, OPT_RAW_RATE },
{ "raw-format", required_argument, 0, OPT_RAW_FORMAT },
{ "title", required_argument, 0, M4AF_TAG_TITLE },
{ "artist", required_argument, 0, M4AF_TAG_ARTIST },
{ "album", required_argument, 0, M4AF_TAG_ALBUM },
{ "genre", required_argument, 0, M4AF_TAG_GENRE },
{ "date", required_argument, 0, M4AF_TAG_DATE },
{ "composer", required_argument, 0, M4AF_TAG_COMPOSER },
{ "grouping", required_argument, 0, M4AF_TAG_GROUPING },
{ "comment", required_argument, 0, M4AF_TAG_COMMENT },
{ "album-artist", required_argument, 0, M4AF_TAG_ALBUM_ARTIST },
{ "track", required_argument, 0, M4AF_TAG_TRACK },
{ "disk", required_argument, 0, M4AF_TAG_DISK },
{ "tempo", required_argument, 0, M4AF_TAG_TEMPO },
{ "tag", required_argument, 0, OPT_SHORT_TAG },
{ "long-tag", required_argument, 0, OPT_LONG_TAG },
};
params->afterburner = 1;
aacenc_getmainargs(&argc, &argv);
while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:Ls:f:cP:Io:",
while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:Ls:f:CP:Io:R",
long_options, 0)) != EOF) {
switch (ch) {
case 'h':
@ -239,6 +310,26 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
case 'I':
params->ignore_length = 1;
break;
case 'R':
params->is_raw = 1;
break;
case OPT_RAW_CHANNELS:
if (sscanf(optarg, "%u", &n) != 1) {
fprintf(stderr, "invalid arg for raw-channels\n");
return -1;
}
params->raw_channels = n;
break;
case OPT_RAW_RATE:
if (sscanf(optarg, "%u", &n) != 1) {
fprintf(stderr, "invalid arg for raw-rate\n");
return -1;
}
params->raw_rate = n;
break;
case OPT_RAW_FORMAT:
params->raw_format = optarg;
break;
case M4AF_TAG_TITLE:
case M4AF_TAG_ARTIST:
case M4AF_TAG_ALBUM:
@ -251,18 +342,32 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
case M4AF_TAG_TRACK:
case M4AF_TAG_DISK:
case M4AF_TAG_TEMPO:
if (params->tag_count == params->tag_table_capacity) {
unsigned newsize = params->tag_table_capacity;
newsize = newsize ? newsize * 2 : 1;
params->tag_table =
realloc(params->tag_table,
newsize * sizeof(aacenc_tag_entry_t));
params->tag_table_capacity = newsize;
param_add_itmf_entry(params, ch, 0, optarg, strlen(optarg));
break;
case OPT_SHORT_TAG:
case OPT_LONG_TAG:
{
char *val;
size_t klen;
unsigned fcc = M4AF_FOURCC('-','-','-','-');
if ((val = strchr(optarg, ':')) == 0) {
fprintf(stderr, "invalid arg for tag\n");
return -1;
}
*val++ = '\0';
if (ch == OPT_SHORT_TAG) {
if ((klen = strlen(optarg))== 3)
fcc = 0xa9;
else if (klen != 4) {
fprintf(stderr, "invalid arg for tag\n");
return -1;
}
for (; *optarg; ++optarg)
fcc = ((fcc << 8) | (*optarg & 0xff));
}
param_add_itmf_entry(params, fcc, optarg, val, strlen(val));
}
tag = params->tag_table + params->tag_count;
tag->tag = ch;
tag->data = optarg;
params->tag_count++;
break;
default:
return usage(), -1;
@ -270,6 +375,7 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
}
if (argc == optind)
return usage(), -1;
if (!params->bitrate && !params->bitrate_mode) {
fprintf(stderr, "bitrate or bitrate-mode is mandatory\n");
return -1;
@ -281,6 +387,15 @@ int parse_options(int argc, char **argv, aacenc_param_ex_t *params)
}
if (params->bitrate && params->bitrate < 10000)
params->bitrate *= 1000;
if (params->is_raw) {
if (!params->raw_channels)
params->raw_channels = 2;
if (!params->raw_rate)
params->raw_rate = 44100;
if (!params->raw_format)
params->raw_format = "S16L";
}
params->input_filename = argv[optind];
return 0;
};
@ -290,7 +405,8 @@ int write_sample(FILE *ofp, m4af_writer_t *m4af,
const void *data, uint32_t size, uint32_t duration)
{
if (!m4af) {
if (fwrite(data, 1, size, ofp) < 0) {
fwrite(data, 1, size, ofp);
if (ferror(ofp)) {
fprintf(stderr, "ERROR: fwrite(): %s\n", strerror(errno));
return -1;
}
@ -353,67 +469,159 @@ END:
return rc;
}
static
int put_tag_entry(m4af_writer_t *m4af, const aacenc_tag_entry_t *tag)
{
unsigned m, n = 0;
switch (tag->tag) {
case M4AF_TAG_TRACK:
if (sscanf(tag->data, "%u/%u", &m, &n) >= 1)
m4af_add_itmf_track_tag(m4af, m, n);
break;
case M4AF_TAG_DISK:
if (sscanf(tag->data, "%u/%u", &m, &n) >= 1)
m4af_add_itmf_disk_tag(m4af, m, n);
break;
case M4AF_TAG_GENRE_ID3:
if (sscanf(tag->data, "%u", &n) == 1)
m4af_add_itmf_genre_tag(m4af, n);
break;
case M4AF_TAG_TEMPO:
if (sscanf(tag->data, "%u", &n) == 1)
m4af_add_itmf_int16_tag(m4af, tag->tag, n);
break;
case M4AF_TAG_COMPILATION:
case M4AF_FOURCC('a','k','I','D'):
case M4AF_FOURCC('h','d','v','d'):
case M4AF_FOURCC('p','c','s','t'):
case M4AF_FOURCC('p','g','a','p'):
case M4AF_FOURCC('r','t','n','g'):
case M4AF_FOURCC('s','t','i','k'):
if (sscanf(tag->data, "%u", &n) == 1)
m4af_add_itmf_int8_tag(m4af, tag->tag, n);
break;
case M4AF_FOURCC('a','t','I','D'):
case M4AF_FOURCC('c','m','I','D'):
case M4AF_FOURCC('c','n','I','D'):
case M4AF_FOURCC('g','e','I','D'):
case M4AF_FOURCC('s','f','I','D'):
case M4AF_FOURCC('t','v','s','n'):
case M4AF_FOURCC('t','v','s','s'):
if (sscanf(tag->data, "%u", &n) == 1)
m4af_add_itmf_int32_tag(m4af, tag->tag, n);
break;
case M4AF_FOURCC('p','l','I','D'):
{
int64_t qn;
if (sscanf(tag->data, "%" SCNd64, &qn) == 1)
m4af_add_itmf_int64_tag(m4af, tag->tag, qn);
break;
}
case M4AF_TAG_ARTWORK:
{
int data_type = 0;
if (!memcmp(tag->data, "GIF", 3))
data_type = M4AF_GIF;
else if (!memcmp(tag->data, "\xff\xd8\xff", 3))
data_type = M4AF_JPEG;
else if (!memcmp(tag->data, "\x89PNG", 4))
data_type = M4AF_PNG;
if (data_type)
m4af_add_itmf_short_tag(m4af, tag->tag, data_type,
tag->data, tag->data_size);
break;
}
case M4AF_FOURCC('-','-','-','-'):
{
char *u8 = aacenc_to_utf8(tag->data);
m4af_add_itmf_long_tag(m4af, tag->name, u8);
free(u8);
break;
}
case M4AF_TAG_TITLE:
case M4AF_TAG_ARTIST:
case M4AF_TAG_ALBUM:
case M4AF_TAG_GENRE:
case M4AF_TAG_DATE:
case M4AF_TAG_COMPOSER:
case M4AF_TAG_GROUPING:
case M4AF_TAG_COMMENT:
case M4AF_TAG_LYRICS:
case M4AF_TAG_TOOL:
case M4AF_TAG_ALBUM_ARTIST:
case M4AF_TAG_DESCRIPTION:
case M4AF_TAG_LONG_DESCRIPTION:
case M4AF_TAG_COPYRIGHT:
case M4AF_FOURCC('a','p','I','D'):
case M4AF_FOURCC('c','a','t','g'):
case M4AF_FOURCC('k','e','y','w'):
case M4AF_FOURCC('p','u','r','d'):
case M4AF_FOURCC('p','u','r','l'):
case M4AF_FOURCC('s','o','a','a'):
case M4AF_FOURCC('s','o','a','l'):
case M4AF_FOURCC('s','o','a','r'):
case M4AF_FOURCC('s','o','c','o'):
case M4AF_FOURCC('s','o','n','m'):
case M4AF_FOURCC('s','o','s','n'):
case M4AF_FOURCC('t','v','e','n'):
case M4AF_FOURCC('t','v','n','n'):
case M4AF_FOURCC('t','v','s','h'):
case M4AF_FOURCC('x','i','d',' '):
case M4AF_FOURCC('\xa9','e','n','c'):
case M4AF_FOURCC('\xa9','s','t','3'):
{
char *u8 = aacenc_to_utf8(tag->data);
m4af_add_itmf_string_tag(m4af, tag->tag, u8);
free(u8);
break;
}
default:
fprintf(stderr, "WARNING: unknown/unsupported tag: %c%c%c%c\n",
tag->tag >> 24, (tag->tag >> 16) & 0xff,
(tag->tag >> 8) & 0xff, tag->tag & 0xff);
}
}
static
void put_tool_tag(m4af_writer_t *m4af, const aacenc_param_ex_t *params,
HANDLE_AACENCODER encoder)
{
char tool_info[256];
char *p = tool_info;
LIB_INFO *lib_info = 0;
p += sprintf(p, PROGNAME " %s, ", fdkaac_version);
lib_info = calloc(FDK_MODULE_LAST, sizeof(LIB_INFO));
if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
int i;
for (i = 0; i < FDK_MODULE_LAST; ++i)
if (lib_info[i].module_id == FDK_AACENC)
break;
p += sprintf(p, "libfdk-aac %s, ", lib_info[i].versionStr);
}
free(lib_info);
if (params->bitrate_mode)
sprintf(p, "VBR mode %d", params->bitrate_mode);
else
sprintf(p, "CBR %dkbps",
aacEncoder_GetParam(encoder, AACENC_BITRATE) / 1000);
m4af_add_itmf_string_tag(m4af, M4AF_TAG_TOOL, tool_info);
}
static
int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params,
HANDLE_AACENCODER encoder)
{
unsigned i;
aacenc_tag_entry_t *tag = params->tag_table;
for (i = 0; i < params->tag_count; ++i, ++tag)
put_tag_entry(m4af, tag);
for (i = 0; i < params->tag_count; ++i, ++tag) {
switch (tag->tag) {
case M4AF_TAG_TRACK:
{
unsigned m, n = 0;
if (sscanf(tag->data, "%u/%u", &m, &n) >= 1)
m4af_add_itmf_track_tag(m4af, m, n);
break;
}
case M4AF_TAG_DISK:
{
unsigned m, n = 0;
if (sscanf(tag->data, "%u/%u", &m, &n) >= 1)
m4af_add_itmf_disk_tag(m4af, m, n);
break;
}
case M4AF_TAG_TEMPO:
{
unsigned n;
if (sscanf(tag->data, "%u", &n) == 1)
m4af_add_itmf_int16_tag(m4af, tag->tag, n);
break;
}
default:
{
char *u8 = aacenc_to_utf8(tag->data);
m4af_add_itmf_string_tag(m4af, tag->tag, u8);
free(u8);
}
}
}
{
char tool_info[256];
char *p = tool_info;
LIB_INFO *lib_info = 0;
put_tool_tag(m4af, params, encoder);
p += sprintf(p, PROGNAME " %s, ", fdkaac_version);
lib_info = malloc(FDK_MODULE_LAST * sizeof(LIB_INFO));
/* XXX: aacEncGetLibInfo() seems buggy and sometimes fails */
if (aacEncGetLibInfo(lib_info) == AACENC_OK) {
for (i = 0; i < FDK_MODULE_LAST; ++i)
if (lib_info[i].module_id == FDK_AACENC)
break;
p += sprintf(p, "libfdk-aac %s, ", lib_info[i].versionStr);
}
free(lib_info);
if (params->bitrate_mode)
sprintf(p, "VBR mode %d", params->bitrate_mode);
else
sprintf(p, "CBR %dkbps", params->bitrate / 1000);
m4af_add_itmf_string_tag(m4af, M4AF_TAG_TOOL, tool_info);
}
if (m4af_finalize(m4af) < 0) {
fprintf(stderr, "ERROR: failed to finalize m4a\n");
return -1;
@ -421,9 +629,65 @@ int finalize_m4a(m4af_writer_t *m4af, const aacenc_param_ex_t *params,
return 0;
}
static
char *generate_output_filename(const char *filename, const char *ext)
{
char *p = 0;
size_t ext_len = strlen(ext);
if (strcmp(filename, "-") == 0) {
p = malloc(ext_len + 6);
sprintf(p, "stdin%s", ext);
} else {
const char *base = aacenc_basename(filename);
size_t ilen = strlen(base);
const char *ext_org = strrchr(base, '.');
if (ext_org) ilen = ext_org - base;
p = malloc(ilen + ext_len + 1);
sprintf(p, "%.*s%s", ilen, base, ext);
}
return p;
}
static
int parse_raw_spec(const char *spec, pcm_sample_description_t *desc)
{
unsigned bits;
unsigned char c_type, c_endian = 'L';
int type;
if (sscanf(spec, "%c%u%c", &c_type, &bits, &c_endian) < 2)
return -1;
c_type = toupper(c_type);
c_endian = toupper(c_endian);
if (c_type == 'S')
type = 1;
else if (c_type == 'U')
type = 2;
else if (c_type == 'F')
type = 4;
else
return -1;
if (c_endian == 'B')
type |= 8;
else if (c_endian != 'L')
return -1;
if (c_type == 'F' && bits != 32 && bits != 64)
return -1;
if (c_type != 'F' && (bits < 8 || bits > 32))
return -1;
desc->sample_type = type;
desc->bits_per_channel = bits;
return 0;
}
int main(int argc, char **argv)
{
wav_io_context_t wav_io = { read_callback, seek_callback };
wav_io_context_t wav_io = { read_callback, seek_callback, tell_callback };
m4af_io_callbacks_t m4af_io = {
write_callback, seek_callback, tell_callback };
aacenc_param_ex_t params = { 0 };
@ -439,6 +703,7 @@ int main(int argc, char **argv)
const pcm_sample_description_t *sample_format;
int downsampled_timescale = 0;
int frame_count = 0;
struct stat stb = { 0 };
setlocale(LC_CTYPE, "");
setbuf(stderr, 0);
@ -451,13 +716,30 @@ int main(int argc, char **argv)
strerror(errno));
goto END;
}
if (ifp == stdin)
if (fstat(fileno(ifp), &stb) == 0 && (stb.st_mode & S_IFMT) != S_IFREG) {
wav_io.seek = 0;
if ((wavf = wav_open(&wav_io, ifp, params.ignore_length)) == 0) {
fprintf(stderr, "ERROR: broken / unsupported input file\n");
goto END;
wav_io.tell = 0;
}
if (!params.is_raw) {
if ((wavf = wav_open(&wav_io, ifp, params.ignore_length)) == 0) {
fprintf(stderr, "ERROR: broken / unsupported input file\n");
goto END;
}
} else {
int bytes_per_channel;
pcm_sample_description_t desc = { 0 };
if (parse_raw_spec(params.raw_format, &desc) < 0) {
fprintf(stderr, "ERROR: invalid raw-format spec\n");
goto END;
}
desc.sample_rate = params.raw_rate;
desc.channels_per_frame = params.raw_channels;
bytes_per_channel = (desc.bits_per_channel + 7) / 8;
desc.bytes_per_frame = params.raw_channels * bytes_per_channel;
if ((wavf = raw_open(&wav_io, ifp, &desc)) == 0) {
fprintf(stderr, "ERROR: failed to open raw input\n");
goto END;
}
}
sample_format = wav_get_format(wavf);
@ -466,12 +748,8 @@ int main(int argc, char **argv)
goto END;
if (!params.output_filename) {
size_t ilen = strlen(params.input_filename);
const char *ext = strrchr(params.input_filename, '.');
if (ext) ilen = ext - params.input_filename;
output_filename = malloc(ilen + 5);
sprintf(output_filename, "%.*s%s", ilen, params.input_filename,
params.transport_format ? ".aac" : ".m4a");
const char *ext = params.transport_format ? ".aac" : ".m4a";
output_filename = generate_output_filename(params.input_filename, ext);
params.output_filename = output_filename;
}

View File

@ -6,6 +6,8 @@
# include "config.h"
#endif
#include <stdio.h>
#include <limits.h>
#include <float.h>
#include <time.h>
#if HAVE_STDINT_H
# include <stdint.h>
@ -51,11 +53,14 @@ void aacenc_progress_init(aacenc_progress_t *progress, int64_t total,
void aacenc_progress_update(aacenc_progress_t *progress, int64_t current,
int period)
{
int percent = 100.0 * current / progress->total + .5;
double seconds = current / progress->timescale;
double ellapsed = (aacenc_timer() - progress->start) / 1000.0;
double eta = ellapsed * (progress->total / (double)current - 1.0);
double speed = ellapsed ? seconds / ellapsed : 0.0;
double speed = ellapsed ? seconds / ellapsed : 1.0;
int percent = progress->total ? 100.0 * current / progress->total + .5
: 100;
double eta = current ? ellapsed * (progress->total / (double)current - 1.0)
: progress->total ? DBL_MAX : 0;
if (current < progress->processed + period)
return;
@ -80,7 +85,7 @@ void aacenc_progress_finish(aacenc_progress_t *progress, int64_t current)
double ellapsed = (aacenc_timer() - progress->start) / 1000.0;
aacenc_progress_update(progress, current, 0);
if (progress->total == INT64_MAX)
fprintf(stderr, "\n%" PRId64 "samples processed in ", current);
fprintf(stderr, "\n%" PRId64 " samples processed in ", current);
else
fprintf(stderr, "\n%" PRId64 "/%" PRId64 " samples processed in ",
current, progress->total);

View File

@ -38,6 +38,7 @@ struct wav_reader_t {
pcm_sample_description_t sample_format;
int64_t length;
int64_t position;
int32_t data_offset;
int ignore_length;
int last_error;
wav_io_context_t io;
@ -91,7 +92,7 @@ int riff_read(wav_reader_t *reader, void *buffer, uint32_t size)
}
static
int riff_skip(wav_reader_t *reader, uint32_t count)
int riff_skip(wav_reader_t *reader, int64_t count)
{
char buff[8192];
int rc;
@ -114,6 +115,37 @@ int riff_skip(wav_reader_t *reader, uint32_t count)
return reader->last_error ? -1 : 0;
}
static
int riff_seek(wav_reader_t *reader, int64_t off, int whence)
{
int rc;
if (reader->last_error)
return -1;
if (!reader->io.seek)
goto FAIL;
if ((rc = reader->io.seek(reader->io_cookie, off, whence)) < 0)
goto FAIL;
return 0;
FAIL:
reader->last_error = WAV_IO_ERROR;
return -1;
}
static
int64_t riff_tell(wav_reader_t *reader)
{
int64_t off;
if (reader->last_error || !reader->io.tell)
return -1;
off = reader->io.tell(reader->io_cookie);
if (off < 0) {
reader->last_error = WAV_IO_ERROR;
return -1;
}
return off;
}
static
int riff_read16(wav_reader_t *reader, uint16_t *value)
{
@ -209,9 +241,8 @@ int riff_ds64(wav_reader_t *reader, int64_t *length)
fcc == RIFF_FOURCC('d','s','6','4') && chunk_size >= 28);
TRY_IO(riff_scan(reader, "QQQL",
&riff_size, length, &sample_count, &table_size) != 4);
if (table_size == 0)
return 0;
reader->last_error = WAV_UNSUPPORTED_FORMAT;
TRY_IO(riff_skip(reader, (chunk_size - 27) & ~1));
reader->data_offset += (chunk_size + 9) & ~1;
FAIL:
return -1;
}
@ -290,6 +321,8 @@ int wav_parse(wav_reader_t *reader, int64_t *data_length)
TRY_IO(riff_read32(reader, &fcc));
if (fcc != RIFF_FOURCC('W','A','V','E'))
goto FAIL;
reader->data_offset = 12;
if (container == RIFF_FOURCC('R','F','6','4'))
riff_ds64(reader, data_length);
while ((fcc = riff_next_chunk(reader, &chunk_size)) != 0) {
@ -299,9 +332,12 @@ int wav_parse(wav_reader_t *reader, int64_t *data_length)
} else if (fcc == RIFF_FOURCC('d','a','t','a')) {
if (container == RIFF_FOURCC('R','I','F','F'))
*data_length = chunk_size;
reader->data_offset += 8;
break;
} else
} else {
TRY_IO(riff_skip(reader, (chunk_size + 1) & ~1));
}
reader->data_offset += (chunk_size + 9) & ~1;
}
if (fcc == RIFF_FOURCC('d','a','t','a'))
return 0;
@ -312,8 +348,9 @@ FAIL:
wav_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
int ignore_length)
{
wav_reader_t *reader;
wav_reader_t *reader = 0;
int64_t data_length;
unsigned bpf;
if ((reader = calloc(1, sizeof(wav_reader_t))) == 0)
return 0;
@ -324,10 +361,43 @@ wav_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
free(reader);
return 0;
}
if (ignore_length || !data_length ||
data_length % reader->sample_format.bytes_per_frame != 0)
bpf = reader->sample_format.bytes_per_frame;
if (ignore_length || !data_length || data_length % bpf)
reader->length = INT64_MAX;
else
reader->length = data_length / reader->sample_format.bytes_per_frame;
reader->length = data_length / bpf;
if (reader->length == INT64_MAX && reader->io.seek && reader->io.tell) {
if (reader->io.seek(reader->io_cookie, 0, SEEK_END) >= 0) {
int64_t size = reader->io.tell(reader->io_cookie);
if (size > 0)
reader->length = (size - reader->data_offset) / bpf;
reader->io.seek(reader->io_cookie, reader->data_offset, SEEK_SET);
}
}
return reader;
}
wav_reader_t *raw_open(wav_io_context_t *io_ctx, void *io_cookie,
const pcm_sample_description_t *desc)
{
wav_reader_t *reader = 0;
if ((reader = calloc(1, sizeof(wav_reader_t))) == 0)
return 0;
memcpy(&reader->io, io_ctx, sizeof(wav_io_context_t));
memcpy(&reader->sample_format, desc, sizeof(pcm_sample_description_t));
reader->io_cookie = io_cookie;
if (io_ctx->seek && io_ctx->tell) {
if (reader->io.seek(reader->io_cookie, 0, SEEK_END) >= 0) {
int64_t size = reader->io.tell(reader->io_cookie);
if (size > 0)
reader->length = size / desc->bytes_per_frame;
reader->io.seek(reader->io_cookie, reader->data_offset, SEEK_SET);
}
} else
reader->length = INT64_MAX;
return reader;
}

View File

@ -16,16 +16,20 @@ enum wav_error_code {
typedef int (*wav_read_callback)(void *cookie, void *data, uint32_t size);
typedef int (*wav_seek_callback)(void *cookie, int64_t off, int whence);
typedef int64_t (*wav_tell_callback)(void *cookie);
typedef struct wav_io_context_t {
wav_read_callback read;
wav_seek_callback seek;
wav_tell_callback tell;
} wav_io_context_t;
typedef struct wav_reader_t wav_reader_t;
wav_reader_t *wav_open(wav_io_context_t *io_ctx, void *io_cookie,
int ignore_length);
wav_reader_t *raw_open(wav_io_context_t *io_ctx, void *io_cookie,
const pcm_sample_description_t *desc);
const pcm_sample_description_t *wav_get_format(wav_reader_t *reader);
int wav_read_frames(wav_reader_t *reader, void *buffer, unsigned nframes);
int64_t wav_get_length(wav_reader_t *reader);

View File

@ -1,4 +1,4 @@
#ifndef VERSION_H
#define VERSION_H
const char *fdkaac_version = "0.0.2";
const char *fdkaac_version = "0.1.0";
#endif