Revert t64

.gitignore

@@ -1,6 +1,7 @@
 *.o
 *.lo
 *.la
+*~
 .deps
 .libs
 .dirstamp
@@ -26,6 +27,7 @@ m4/lt~obsolete.m4
 missing
 stamp-h1
 aac-enc
+test-encode-decode
 compile
 
 CMakeCache.txt

Android.bp

@@ -94,7 +94,7 @@ cc_library_static {
 
     apex_available: [
         "//apex_available:platform",
-        "com.android.bluetooth.updatable",
+        "com.android.btservices",
         "com.android.media.swcodec",
     ],
     min_sdk_version: "29",

CMakeLists.txt

@@ -43,7 +43,7 @@ if(POLICY CMP0091)
   cmake_policy(SET CMP0091 NEW)
 endif()
 
-project(fdk-aac VERSION 2.0.2)
+project(fdk-aac VERSION 2.0.3)
 
 # Includes
 
@@ -62,7 +62,7 @@ include(CPack)
 # Options
 
 option(BUILD_SHARED_LIBS "Build shared library" ON)
-option(BUILD_PROGRAMS "Build aac-enc utility" OFF)
+option(BUILD_PROGRAMS "Build extra utilities" OFF)
 option(FDK_AAC_INSTALL_CMAKE_CONFIG_MODULE "Install CMake package configuration file" ON)
 option(FDK_AAC_INSTALL_PKGCONFIG_MODULE "Install pkg-config .pc file" ON)
 
@@ -487,10 +487,11 @@ target_link_libraries(fdk-aac PRIVATE $<$<BOOL:${HAVE_LIBM}>:m>)
 ### Set public headers and shared library version. Version info is critical for Unix-like OSes.
 set_target_properties(fdk-aac PROPERTIES
   PUBLIC_HEADER "${fdk_aacinclude_HEADERS}"
-  VERSION 2.0.2
+  VERSION 2.0.3
   SOVERSION 2
   MACHO_COMPATIBILITY_VERSION 3.0.0
-  MACHO_CURRENT_VERSION 3.2.0)
+  MACHO_CURRENT_VERSION 3.3.0
+  LINKER_LANGUAGE C)
 
 ### Some compiler options from Makefile.am
 if(MSVC)
@@ -585,4 +586,15 @@ if(BUILD_PROGRAMS)
   ## Program target installation
   install(TARGETS aac-enc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
+
+  ## Tool for testing the library
+  set(test_encode_decode_SOURCES
+    test-encode-decode.c
+    wavreader.c
+    wavreader.h
+    sha1.c
+    sha1.h)
+
+  add_executable(test-encode-decode ${test_encode_decode_SOURCES})
+  target_link_libraries(test-encode-decode PRIVATE fdk-aac)
 endif()

ChangeLog

@@ -1,3 +1,8 @@
+2.0.3
+ - Minor upstream updates
+ - Fixed one case of a failed assert in SBR encoding
+ - Added build support for s390x
+
 2.0.2
  - Minor upstream updates
  - Lots of upstream and local fuzzing fixes

METADATA

@@ -1,3 +1,7 @@
+# *** THIS PACKAGE HAS SPECIAL LICENSING CONDITIONS.  PLEASE
+#     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
+#     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
+  license_note: "Software License for The Fraunhofer FDK AAC Codec Library for Android"
   license_type: BY_EXCEPTION_ONLY
 }

Makefile.am

@@ -40,10 +40,14 @@ libfdk_aac_la_LDFLAGS = -version-info @FDK_AAC_VERSION@ -no-undefined \
 
 if EXAMPLE
 bin_PROGRAMS = aac-enc$(EXEEXT)
+noinst_PROGRAMS = test-encode-decode$(EXEEXT)
 
 aac_enc_LDADD = libfdk-aac.la
 aac_enc_SOURCES = aac-enc.c wavreader.c
 
+test_encode_decode_LDADD = libfdk-aac.la
+test_encode_decode_SOURCES = test-encode-decode.c wavreader.c sha1.c
+
 noinst_HEADERS = wavreader.h
 endif
 
@@ -278,7 +282,6 @@ EXTRA_DIST = \
     $(top_srcdir)/libSBRenc/src/*.h \
     $(top_srcdir)/libSBRenc/include/*.h \
     $(top_srcdir)/libSBRdec/src/*.h \
-    $(top_srcdir)/libSBRdec/src/arm/*.cpp \
     $(top_srcdir)/libSBRdec/include/*.h \
     $(top_srcdir)/libSYS/include/*.h \
     $(top_srcdir)/libPCMutils/include/*.h \
@@ -296,5 +299,7 @@ EXTRA_DIST = \
     $(top_srcdir)/libFDK/src/mips/*.cpp \
     $(top_srcdir)/METADATA \
     $(top_srcdir)/PREUPLOAD.cfg \
+    $(top_srcdir)/sha1.h \
+    $(top_srcdir)/test/* \
     $(top_srcdir)/win32/*.h
 

aac-enc.c

@@ -129,7 +129,7 @@ int main(int argc, char *argv[]) {
 		}
 	}
 	if (aacEncoder_SetParam(handle, AACENC_SAMPLERATE, sample_rate) != AACENC_OK) {
-		fprintf(stderr, "Unable to set the AOT\n");
+		fprintf(stderr, "Unable to set the sample rate\n");
 		return 1;
 	}
 	if (aacEncoder_SetParam(handle, AACENC_CHANNELMODE, mode) != AACENC_OK) {

configure.ac

@@ -1,7 +1,7 @@
 dnl                                               -*- Autoconf -*-
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([fdk-aac], [2.0.2], [http://sourceforge.net/projects/opencore-amr/])
+AC_INIT([fdk-aac], [2.0.3], [http://sourceforge.net/projects/opencore-amr/])
 AC_CONFIG_AUX_DIR(.)
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([tar-ustar foreign])
@@ -26,7 +26,7 @@ AC_SEARCH_LIBS([sin], [m])
 dnl soname version to use
 dnl goes by ‘current[:revision[:age]]’ with the soname ending up as
 dnl current.age.revision
-FDK_AAC_VERSION=2:2:0
+FDK_AAC_VERSION=2:3:0
 
 AS_IF([test x$enable_shared = xyes], [LIBS_PRIVATE=$LIBS], [LIBS_PUBLIC=$LIBS])
 AC_SUBST(FDK_AAC_VERSION)

debian/changelog

@@ -1,3 +1,40 @@
+fdk-aac (2.0.3-1deepin1) unstable; urgency=medium
+
+  * Revert t64
+
+ -- zhaochengyi <zhaochengyi@uniontech.com>  Mon, 09 Feb 2026 11:18:31 +0800
+
+fdk-aac (2.0.3-1) unstable; urgency=medium
+
+  [ Jeremy Bicha ]
+  * debian/watch: look for tags not "releases"
+
+  [ Debian Janitor ]
+  * Set upstream metadata fields: Bug-Submit.
+  * Update standards version to 4.6.2, no changes needed.
+  * Avoid explicitly specifying -Wl,--as-needed linker flag.
+
+  [ Fabian Greffrath ]
+  * New upstream version 2.0.3
+  * Add myself to Uploaders
+  * Bump debian/watch file standard to 4
+  * Add myself to Debian packaging copyright holders
+  * Add the FSF's stance on the FDK AAC license as a disclaimer to the
+    debian/copyright file
+  * Add patch description to d/p/add_more_arch
+  * Forward patch to upstream
+  * Bump Standards-Version to 4.7.1
+  * Upload to unstable
+
+ -- Fabian Greffrath <fabian@debian.org>  Fri, 28 Feb 2025 11:36:48 +0100
+
+fdk-aac (2.0.2-1.1~exp1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Rename libraries for 64-bit time_t transition.
+
+ -- Michael Hudson-Doyle <mwhudson@debian.org>  Thu, 01 Feb 2024 22:36:54 +0000
+
 fdk-aac (2.0.2-1) unstable; urgency=medium
 
   * Team upload

debian/control

@@ -2,9 +2,10 @@ Source: fdk-aac
 Section: non-free/libs
 Priority: optional
 Maintainer: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
-Uploaders: Romain Beauxis <toots@rastageeks.org>
+Uploaders: Romain Beauxis <toots@rastageeks.org>,
+ Fabian Greffrath <fabian@debian.org>
 Homepage: https://github.com/mstorsjo/fdk-aac
-Standards-Version: 4.6.0
+Standards-Version: 4.7.1
 Build-Depends: debhelper-compat (= 13)
 Vcs-Git: https://salsa.debian.org/multimedia-team/fdk-aac.git
 Vcs-Browser: https://salsa.debian.org/multimedia-team/fdk-aac

debian/copyright

@@ -1,6 +1,22 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: fdk-aac
 Source: https://github.com/mstorsjo/fdk-aac
+Disclaimer:
+ Fraunhofer FDK AAC license
+ .
+ This is a free software license as far as it goes. It is incompatible
+ with any version of the GNU GPL.
+ .
+ It has a special danger in the form of a term expressly stating it
+ does not grant you any patent licenses, with an invitation to buy
+ some. Because of this, and because the license author is a known
+ patent aggressor, we encourage you to be careful about using or
+ redistributing software under this license: you should first consider
+ whether the licensor might aim to lure you into patent infringement.
+ If you conclude that the program is bait for a patent trap, it would
+ be wise to avoid the program.
+ .
+ <https://www.gnu.org/licenses/license-list.html.en#fdk>
 
 Files: *
 Copyright:
@@ -18,6 +34,7 @@ License: Apache-2.0
 Files: debian/*
 Copyright:
  2013 Romain Beauxis <toots@rastageeks.org>
+ 2020-2025 Fabian Greffrath <fabian@debian.org>
 License: GPL-2+
 
 License: Fraunhofer-FDK-AAC-for-Android

debian/patches/add_more_arch

@@ -1,3 +1,7 @@
+Description: Add missing #defines for sparc and s390x.
+Author: Romain Beauxis <toots@rastageeks.org>
+Forwarded: https://github.com/mstorsjo/fdk-aac/pull/178
+
 ---
  libFDK/include/FDK_archdef.h |   16 ++++++++++++++++
  1 file changed, 16 insertions(+)

debian/rules

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--no-undefined
 
 %:
 	dh $@

debian/upstream/metadata

@@ -1,3 +1,4 @@
 Bug-Database: https://github.com/mstorsjo/fdk-aac/issues
+Bug-Submit: https://github.com/mstorsjo/fdk-aac/issues/new
 Repository: https://github.com/mstorsjo/fdk-aac.git
 Repository-Browse: https://github.com/mstorsjo/fdk-aac

debian/watch

@@ -1,3 +1,3 @@
-version=3
-https://github.com/mstorsjo/fdk-aac/releases \
+version=4
+https://github.com/mstorsjo/fdk-aac/tags \
 .*[^n]/(?:|v|r|REL_|rel-|fdk-aac(?:_|-))(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

fuzzer/Android.bp

@@ -46,6 +46,14 @@ cc_defaults {
             "android-media-fuzzing-reports@google.com",
         ],
         componentid: 155276,
+        hotlists: [
+            "4593311",
+        ],
+        description: "The fuzzer targets the APIs of libFraunhoferAAC",
+        vector: "remote",
+        service_privilege: "privileged",
+        users: "multi_user",
+        fuzzed_code_usage: "shipped",
     },
 }
 

fuzzer/aac_dec_fuzzer.cpp

@@ -118,7 +118,8 @@ void Codec::decodeFrames(UCHAR *data, UINT size) {
       INT_PCM outputBuf[kMaxOutBufferSize];
       do {
         mErrorCode =
-            aacDecoder_DecodeFrame(mAacDecoderHandle, outputBuf, sizeof(outputBuf), 0);
+            aacDecoder_DecodeFrame(mAacDecoderHandle, outputBuf,
+                    kMaxOutBufferSize /*size in number of INT_PCM, not bytes*/, 0);
       } while (mErrorCode == AAC_DEC_OK);
       UINT offset = inputSize - valid;
       data += offset;

libAACdec/include/aacdecoder_lib.h

@@ -431,12 +431,11 @@ Where N equals to CStreamInfo::frameSize .
 #include "machine_type.h"
 #include "FDK_audio.h"
 
-#include "genericStds.h"
-
 #define AACDECODER_LIB_VL0 3
 #define AACDECODER_LIB_VL1 2
 #define AACDECODER_LIB_VL2 0
 
+#include "genericStds.h"
 /**
  * \brief  AAC decoder error codes.
  */
@@ -1037,7 +1036,7 @@ LINKSPEC_H AAC_DECODER_ERROR aacDecoder_Fill(HANDLE_AACDECODER self,
  * \param self          AAC decoder handle.
  * \param pTimeData     Pointer to external output buffer where the decoded PCM
  * samples will be stored into.
- * \param timeDataSize  Size of external output buffer.
+ * \param timeDataSize  Size of external output buffer in PCM samples.
  * \param flags         Bit field with flags for the decoder: \n
  *                      (flags & AACDEC_CONCEAL) == 1: Do concealment. \n
  *                      (flags & AACDEC_FLUSH) == 2: Discard input data. Flush

libAACdec/src/aac_ram.cpp

@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
 Software License for The Fraunhofer FDK AAC Codec Library for Android
 
-© Copyright  1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright  1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten
 Forschung e.V. All rights reserved.
 
  1.    INTRODUCTION
@@ -148,7 +148,7 @@ C_ALLOC_MEM(CplxPredictionData, CCplxPredictionData, 1)
 /*! The buffer holds time samples for the crossfade in case of an USAC DASH IPF
    config change Dimension: (8)
  */
-C_ALLOC_MEM2(TimeDataFlush, INT_PCM, TIME_DATA_FLUSH_SIZE, (8))
+C_ALLOC_MEM2(TimeDataFlush, PCM_DEC, TIME_DATA_FLUSH_SIZE, (8))
 
 /* @} */
 

libAACdec/src/aac_ram.h

@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------------
 Software License for The Fraunhofer FDK AAC Codec Library for Android
 
-© Copyright  1995 - 2019 Fraunhofer-Gesellschaft zur Förderung der angewandten
+© Copyright  1995 - 2020 Fraunhofer-Gesellschaft zur Förderung der angewandten
 Forschung e.V. All rights reserved.
 
  1.    INTRODUCTION
@@ -132,7 +132,7 @@ H_ALLOC_MEM(CplxPredictionData, CCplxPredictionData)
 H_ALLOC_MEM(SpectralCoeffs, FIXP_DBL)
 H_ALLOC_MEM(SpecScale, SHORT)
 
-H_ALLOC_MEM(TimeDataFlush, INT_PCM)
+H_ALLOC_MEM(TimeDataFlush, PCM_DEC)
 
 H_ALLOC_MEM_OVERLAY(WorkBufferCore1, CWorkBufferCore1)
 H_ALLOC_MEM_OVERLAY(WorkBufferCore2, FIXP_DBL)