Control: tags 955248 + patch
Control: tags 955248 + pending
Dear maintainer,
I've prepared an NMU for fdkaac (versioned as 1.0.0-0.1) and uploaded it
to mentors. Please feel free to tell me if I should delete it.
Regards,
Håvard
diff -Nru fdkaac-0.6.3/ChangeLog fdkaac-1.0.0/ChangeLog
--- fdkaac-0.6.3/ChangeLog 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/ChangeLog 2018-09-03 19:04:36.000000000 +0200
@@ -1,6 +1,44 @@
+2016-08-26 nu774 <honeycom...@gmail.com>
+
+ * update ChangeLog [HEAD -> master]
+
+ * bump [origin/master]
+
+ * Ticket #23: quit supporting MPEG-2 AOT
+
+2016-08-25 nu774 <honeycom...@gmail.com>
+
+ * fix libfdkaac encoder version check for SBR_RATIO availability
+
+ * Use our SBR signaling implementation on old libfdkaac
+
+2015-10-10 nu774 <honeycom...@gmail.com>
+
+ * improve MSVC project
+
+2015-09-21 nu774 <honeycom...@gmail.com>
+
+ * fix indents
+
+ * update compat layer, mainly for MSVC14 issue
+
+2015-07-22 nu774 <honeycom...@gmail.com>
+
+ * add platformtoolset in vcxproj
+
+ * fix build issue on MSVC14
+
+2015-06-12 nu774 <honeycom...@gmail.com>
+
+ * remove an unused variable decl
+
+ * remove an unused variable decl
+
+ * m4af: move internal struct m4af_itmf_entry_t from header
+
2015-02-14 nu774 <honeycom...@gmail.com>
- * update ChangeLog [HEAD]
+ * update ChangeLog
* bump version [v0.6.2]
@@ -10,9 +48,9 @@
2014-09-13 nu774 <honeycom...@gmail.com>
- * update ChangeLog [origin/master]
+ * update ChangeLog
- * bump version
+ * bump version [v0.6.1]
2014-09-12 nu774 <honeycom...@gmail.com>
diff -Nru fdkaac-0.6.3/configure.ac fdkaac-1.0.0/configure.ac
--- fdkaac-0.6.3/configure.ac 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/configure.ac 2018-09-03 19:04:36.000000000 +0200
@@ -13,7 +13,7 @@
AM_PROG_CC_C_O
AC_CHECK_HEADERS([sys/time.h])
-AC_CHECK_HEADERS([localcharset.h langinfo.h endian.h byteswap.h])
+AC_CHECK_HEADERS([libcharset.h langinfo.h endian.h byteswap.h])
AC_CHECK_HEADERS([fdk-aac/aacenc_lib.h], ,
AC_MSG_ERROR([libfdk-aac is required]))
@@ -38,6 +38,12 @@
AM_CONDITIONAL([FDK_NO_GETOPT_LONG],[test "$ac_cv_func_getopt_long" != "yes"])
AC_SEARCH_LIBS([aacEncOpen],[fdk-aac],[],[],[])
+CHARSET_LIB=
+AC_CHECK_LIB([iconv], [locale_charset],
+ [CHARSET_LIB=-liconv],
+ [AC_CHECK_LIB([charset], [locale_charset], [CHARSET_LIB=-lcharset])])
+AC_SUBST([CHARSET_LIB])
+
AC_CANONICAL_HOST
X_PLATFORM=posix
diff -Nru fdkaac-0.6.3/debian/changelog fdkaac-1.0.0/debian/changelog
--- fdkaac-0.6.3/debian/changelog 2017-01-23 01:39:23.000000000 +0100
+++ fdkaac-1.0.0/debian/changelog 2020-04-14 13:04:58.000000000 +0200
@@ -1,3 +1,10 @@
+fdkaac (1.0.0-0.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * New upstream release closes: #955248
+
+ -- Håvard Flaget Aasen <haavard_aa...@yahoo.no> Tue, 14 Apr 2020 13:04:58 +0200
+
fdkaac (0.6.3-1) unstable; urgency=medium
* New upstream version
diff -Nru fdkaac-0.6.3/Makefile.am fdkaac-1.0.0/Makefile.am
--- fdkaac-0.6.3/Makefile.am 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/Makefile.am 2018-09-03 19:04:36.000000000 +0200
@@ -23,7 +23,7 @@
dist_man_MANS = man/fdkaac.1
fdkaac_LDADD = \
- @LIBICONV@ -lfdk-aac -lm
+ @LIBICONV@ @CHARSET_LIB@ -lfdk-aac -lm
if FDK_PLATFORM_POSIX
fdkaac_SOURCES += \
diff -Nru fdkaac-0.6.3/MSVC/fdk-aac.vcxproj fdkaac-1.0.0/MSVC/fdk-aac.vcxproj
--- fdkaac-0.6.3/MSVC/fdk-aac.vcxproj 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/MSVC/fdk-aac.vcxproj 2018-09-03 19:04:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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">
@@ -24,10 +24,13 @@
<RootNamespace>fdk-aac</RootNamespace>
</PropertyGroup>
<PropertyGroup>
- <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140_xp</PlatformToolset>
- <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120_xp</PlatformToolset>
- <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath11)' != ''">v110_xp</PlatformToolset>
- <PlatformToolset Condition="'$(PlatformToolset)' == ''">v100</PlatformToolset>
+ <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(MSBuildToolsVersion)' == '15.0'">v141_xp</PlatformToolset>
+ <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(MSBuildToolsVersion)' == '14.0'">v140_xp</PlatformToolset>
+ <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(MSBuildToolsVersion)' == '12.0'">v120_xp</PlatformToolset>
+ <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(MSBuildToolsVersion)' == '11.0'">v110_xp</PlatformToolset>
+ </PropertyGroup>
+ <PropertyGroup>
+ <IntDir>fdk-aac\$(Platform)\$(Configuration)</IntDir>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
@@ -50,7 +53,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions>WIN32;_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>
+ <AdditionalIncludeDirectories>../fdk-aac/libaacenc/include;../fdk-aac/libFDK/include;../fdk-aac/libMpegTPEnc/include;../fdk-aac/libPCMutils/include;../fdk-aac/libSACenc/include;../fdk-aac/libSBRenc/include;../fdk-aac/libSYS/include</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
@@ -71,7 +74,6 @@
</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" />
@@ -91,6 +93,7 @@
<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\mps_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" />
@@ -109,6 +112,8 @@
<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_lpc.cpp" />
+ <ClCompile Include="..\fdk-aac\libFDK\src\FDK_matrixCalloc.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" />
@@ -122,7 +127,20 @@
<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\libPCMutils\src\pcm_utils.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_bitstream.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_delay.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_dmx_tdom_enh.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_filter.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_framewindowing.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_huff_tab.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_lib.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_nlc_enc.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_onsetdetect.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_paramextract.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_staticgain.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_tree.cpp" />
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_vectorfunctions.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" />
@@ -136,19 +154,18 @@
<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\sbrenc_ram.cpp" />
+ <ClCompile Include="..\fdk-aac\libSBRenc\src\sbrenc_rom.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" />
+ <ClCompile Include="..\fdk-aac\libSYS\src\syslib_channelMapDescr.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" />
diff -Nru fdkaac-0.6.3/MSVC/fdkaac.vcxproj fdkaac-1.0.0/MSVC/fdkaac.vcxproj
--- fdkaac-0.6.3/MSVC/fdkaac.vcxproj 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/MSVC/fdkaac.vcxproj 2018-09-03 19:04:36.000000000 +0200
@@ -24,10 +24,10 @@
<RootNamespace>fdkaac</RootNamespace>
</PropertyGroup>
<PropertyGroup>
- <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140_xp</PlatformToolset>
- <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120_xp</PlatformToolset>
- <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(VCTargetsPath11)' != ''">v110_xp</PlatformToolset>
- <PlatformToolset Condition="'$(PlatformToolset)' == ''">v100</PlatformToolset>
+ <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(MSBuildToolsVersion)' == '15.0'">v141_xp</PlatformToolset>
+ <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(MSBuildToolsVersion)' == '14.0'">v140_xp</PlatformToolset>
+ <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(MSBuildToolsVersion)' == '12.0'">v120_xp</PlatformToolset>
+ <PlatformToolset Condition="'$(PlatformToolset)' == '' and '$(MSBuildToolsVersion)' == '11.0'">v110_xp</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
@@ -55,11 +55,13 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
<PreBuildEvent>
- <Command>copy ..\fdk-aac\libAACdec\include\aacdecoder_lib.h include\fdk-aac\
-copy ..\fdk-aac\libAACenc\include\aacenc_lib.h include\fdk-aac\
+ <Command>copy ..\fdk-aac\libAACdec\include\aacdecoder_lib.h include\fdk-aac\
+copy ..\fdk-aac\libAACenc\include\aacenc_lib.h include\fdk-aac\
copy ..\fdk-aac\libSYS\include\FDK_Audio.h include\fdk-aac\
-copy ..\fdk-aac\libSYS\include\genericStds.h include\fdk-aac\
-copy ..\fdk-aac\libSYS\include\machine_type.h include\fdk-aac\ </Command>
+copy ..\fdk-aac\libSYS\include\genericStds.h include\fdk-aac\
+copy ..\fdk-aac\libSYS\include\machine_type.h include\fdk-aac\
+copy ..\fdk-aac\libSYS\include\syslib_channelMapDescr.h include\fdk-aac\
+ </Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
diff -Nru fdkaac-0.6.3/MSVC/fdk-aac.vcxproj.filters fdkaac-1.0.0/MSVC/fdk-aac.vcxproj.filters
--- fdkaac-0.6.3/MSVC/fdk-aac.vcxproj.filters 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/MSVC/fdk-aac.vcxproj.filters 2018-09-03 19:04:36.000000000 +0200
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup>
<Filter Include="Source Files">
@@ -18,9 +18,6 @@
<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>
@@ -171,9 +168,6 @@
<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>
@@ -219,22 +213,73 @@
<ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_misc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\fdk-aac\libSBRenc\src\sbr_ram.cpp">
+ <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\libSBRenc\src\sbr_rom.cpp">
+ <ClCompile Include="..\fdk-aac\libSYS\src\genericStds.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\fdk-aac\libSBRenc\src\ton_corr.cpp">
+ <ClCompile Include="..\fdk-aac\libPCMutils\src\pcm_utils.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\fdk-aac\libSBRenc\src\tran_det.cpp">
+ <ClCompile Include="..\fdk-aac\libSBRenc\src\sbrenc_ram.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\fdk-aac\libSYS\src\conv_string.cpp">
+ <ClCompile Include="..\fdk-aac\libSBRenc\src\sbrenc_rom.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\fdk-aac\libSYS\src\genericStds.cpp">
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_bitstream.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_delay.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_dmx_tdom_enh.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_filter.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_framewindowing.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_huff_tab.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_lib.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_nlc_enc.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_onsetdetect.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_paramextract.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_staticgain.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_tree.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSACenc\src\sacenc_vectorfunctions.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libAACenc\src\mps_main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libSYS\src\syslib_channelMapDescr.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libFDK\src\FDK_matrixCalloc.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\fdk-aac\libFDK\src\FDK_lpc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -245,9 +290,6 @@
<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>
diff -Nru fdkaac-0.6.3/src/compat_posix.c fdkaac-1.0.0/src/compat_posix.c
--- fdkaac-0.6.3/src/compat_posix.c 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/src/compat_posix.c 2018-09-03 19:04:36.000000000 +0200
@@ -59,8 +59,8 @@
#include <errno.h>
#include <iconv.h>
-#if HAVE_LOCALCHARSET_H
-#include <localcharset.h>
+#if HAVE_LIBCHARSET_H
+#include <libcharset.h>
#elif HAVE_LANGINFO_H
#include <langinfo.h>
static const char *locale_charset(void)
diff -Nru fdkaac-0.6.3/src/main.c fdkaac-1.0.0/src/main.c
--- fdkaac-0.6.3/src/main.c 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/src/main.c 2018-09-03 19:04:36.000000000 +0200
@@ -289,7 +289,7 @@
params->afterburner = 1;
aacenc_getmainargs(&argc, &argv);
- while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:Ls:f:CP:G:Io:SR",
+ while ((ch = getopt_long(argc, argv, "hp:b:m:w:a:L:s:f:CP:G:Io:SR",
long_options, 0)) != EOF) {
switch (ch) {
case 'h':
@@ -503,6 +503,11 @@
return 0;
}
+static int do_smart_padding(int profile)
+{
+ return profile == 2 || profile == 5 || profile == 29;
+}
+
static
int encode(aacenc_param_ex_t *params, pcm_reader_t *reader,
HANDLE_AACENCODER encoder, uint32_t frame_length,
@@ -517,15 +522,12 @@
int frames_written = 0, encoded = 0;
aacenc_progress_t progress = { 0 };
const pcm_sample_description_t *fmt = pcm_get_format(reader);
+ const int is_padding = do_smart_padding(params->profile);
ibuf = malloc(frame_length * fmt->bytes_per_frame);
aacenc_progress_init(&progress, pcm_get_length(reader), fmt->sample_rate);
for (;;) {
- /*
- * Since we delay the write, we cannot just exit loop when interrupted.
- * Instead, we regard it as EOF.
- */
if (g_interrupted)
nread = 0;
if (nread > 0) {
@@ -548,7 +550,7 @@
remaining -= consumed;
ip += consumed * fmt->channels_per_frame;
- flip ^= 1;
+ if (is_padding) {
/*
* As we pad 1 frame at beginning and ending by our extrapolator,
* we want to drop them.
@@ -557,25 +559,26 @@
* Since sbr_header is included in the first frame (in case of
* SBR), we cannot discard first frame. So we pick second instead.
*/
- ++encoded;
- if (encoded == 1 || encoded == 3)
- continue;
-
+ flip ^= 1;
+ ++encoded;
+ if (encoded == 1 || encoded == 3)
+ continue;
+ }
if (write_sample(params->output_fp, m4af, &obuf[flip]) < 0)
goto END;
++frames_written;
} while (remaining > 0);
- /*
- * When interrupted, we haven't pulled out last extrapolated frames
- * from the reader. Therefore, we have to write the final outcome.
- */
- if (g_interrupted) {
- if (write_sample(params->output_fp, m4af, &obp[flip^1]) < 0)
- goto END;
- ++frames_written;
- }
}
DONE:
+ /*
+ * When interrupted, we haven't pulled out last extrapolated frames
+ * from the reader. Therefore, we have to write the final outcome.
+ */
+ if (g_interrupted) {
+ if (write_sample(params->output_fp, m4af, &obp[flip^1]) < 0)
+ goto END;
+ ++frames_written;
+ }
if (!params->silent)
aacenc_progress_finish(&progress, pcm_get_position(reader));
rc = frames_written;
@@ -755,8 +758,10 @@
reader = pcm_open_native_converter(reader);
if (reader && PCM_IS_FLOAT(pcm_get_format(reader)))
reader = limiter_open(reader);
- if (reader && (reader = pcm_open_sint16_converter(reader)) != 0)
- reader = extrapolater_open(reader);
+ if (reader && (reader = pcm_open_sint16_converter(reader)) != 0) {
+ if (do_smart_padding(params->profile))
+ reader = extrapolater_open(reader);
+ }
return reader;
FAIL:
return 0;
@@ -846,29 +851,22 @@
m4af_set_priming_mode(m4af, params.gapless_mode + 1);
m4af_begin_write(m4af);
}
- if (scale_shift && (aacinfo.encoderDelay & 1)) {
- /*
- * Since odd delay cannot be exactly expressed in downsampled scale,
- * we push one zero frame to the encoder here, to make delay even
- */
- int16_t zero[8] = { 0 };
- aacenc_frame_t frame = { 0 };
- aac_encode_frame(encoder, sample_format, zero, 1, &frame);
- free(frame.data);
- }
frame_count = encode(¶ms, reader, encoder, aacinfo.frameLength, m4af);
if (frame_count < 0)
goto END;
if (m4af) {
- uint32_t delay = aacinfo.encoderDelay;
uint32_t padding;
+#if AACENCODER_LIB_VL0 < 4
+ uint32_t delay = aacinfo.encoderDelay;
+ if (sbr_mode && params.profile != AOT_ER_AAC_ELD
+ && !params.include_sbr_delay)
+ delay -= 481 << scale_shift;
+#else
+ uint32_t delay = params.include_sbr_delay ? aacinfo.nDelay
+ : aacinfo.nDelayCore;
+#endif
int64_t frames_read = pcm_get_position(reader);
- if (sbr_mode && params.profile != AOT_ER_AAC_ELD &&
- !params.include_sbr_delay)
- delay -= 481 << scale_shift;
- if (scale_shift && (delay & 1))
- ++delay;
padding = frame_count * aacinfo.frameLength - frames_read - delay;
m4af_set_priming(m4af, 0, delay >> scale_shift, padding >> scale_shift);
if (finalize_m4a(m4af, ¶ms, encoder) < 0)
diff -Nru fdkaac-0.6.3/version.h fdkaac-1.0.0/version.h
--- fdkaac-0.6.3/version.h 2016-08-26 14:45:05.000000000 +0200
+++ fdkaac-1.0.0/version.h 2018-09-03 19:04:36.000000000 +0200
@@ -1,4 +1,4 @@
#ifndef VERSION_H
#define VERSION_H
-const char *fdkaac_version = "0.6.3";
+const char *fdkaac_version = "1.0.0";
#endif
