From 4c1c2f0280f968f8b3e5f5ad8cf5e3c143e809db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= Date: Tue, 4 Mar 2025 21:52:39 +0100 Subject: [PATCH] Audaspace: update to version 1.6 for blender 4.4. Pull Request: https://projects.blender.org/blender/blender/pulls/135475 --- extern/audaspace/AUTHORS | 9 +++-- extern/audaspace/CHANGES | 33 +++++++++++++++++++ extern/audaspace/CMakeLists.txt | 2 +- extern/audaspace/README.blender | 6 ++-- extern/audaspace/README.md | 2 +- extern/audaspace/bindings/C/AUD_Types.h | 2 +- extern/audaspace/bindings/python/setup.py.in | 2 +- .../plugins/pipewire/PipeWireLibrary.cpp | 2 +- 8 files changed, 48 insertions(+), 10 deletions(-) diff --git a/extern/audaspace/AUTHORS b/extern/audaspace/AUTHORS index edf107f835d..627911654e4 100644 --- a/extern/audaspace/AUTHORS +++ b/extern/audaspace/AUTHORS @@ -19,15 +19,20 @@ The Equalizer sound effect has been added by - Marcos Perez -Some performance improvements, especially to the JOSResampler have been made by: +Some performance improvements, especially to the JOSResampler have been made by - Aras Pranckevičius +The pipewire backend and many fixes have been provided by + +- Sebastian Parborg + Several people provided fixes: - Aaron Carlisle -- Sebastian Parborg - Leon Zandman - Richard Antalik - Robert-André Mauchin - Lalit Shankar Chowdhury +- Nathan Burnham +- Weizhen Huang diff --git a/extern/audaspace/CHANGES b/extern/audaspace/CHANGES index 4218d4f52ce..ff75d0b3574 100644 --- a/extern/audaspace/CHANGES +++ b/extern/audaspace/CHANGES @@ -1,3 +1,36 @@ +Audaspace 1.6 + +- Pipewire support (thanks Sebastian Parborg!) +- AAC container (ADTS stream). +- Update to C++17. +- Improvements for PulseAudio backend. +- Many (bug) fixes. + +Detailed list of changes: + +70b18a5 Port fix by Weizhen Huang from Blender. +ecaa71c CoreAudio: closing issue fixed from Apple for newer MacOS versions. +0035101 Port Blender changes to upstream. +dd419af Blender bug fix #129162: High idle CPU usage with PulseAudio in Linux +9220ab5 Set C++ version python plugin bulid to 17. +9db9578 Add AAC container You could already use Matroska container with AAC codec, but if someone wants raw .aac file ("ADTS stream"), there was no container option to pick. +d3b7471 Fix whitespace +d1f1704 Fix rendering audio to Matroska container +5aabc89 Pipewire support (#43) +f5e8ccc Audaspace: Update PulseAudio sync functions to be more accurate (#42) +f4611c0 Porting ffmpeg compatibility back from Blender. +6afeab2 Update to C++17. +81b0d76 PulseAudio: try to play as much as possible of buffered data on playback stop. +426dab5 Fix Sound.filter a argument default not a sequence +d701d0b loadRight documented as duplicate of loadLeft +4326b24 Fix for building python module without fftw. +901f14e Bugfix for MacOS from Blender. +ee59832 Fix a typo +27bc641 Update AUTHORS. +689d645 Windows: Use COM smart pointers in WASAPI plugin +5efc5c4 Update FFmpeg code to avoid direct assignation of ch_layout +56edbe4 Making the OpenCloseDevice thread safe. + Audaspace 1.5 - Performance improvements and two more quality presets for the JOS resampler. diff --git a/extern/audaspace/CMakeLists.txt b/extern/audaspace/CMakeLists.txt index 98ec816f52c..c8370f03d76 100644 --- a/extern/audaspace/CMakeLists.txt +++ b/extern/audaspace/CMakeLists.txt @@ -23,7 +23,7 @@ endif() project(audaspace) -set(AUDASPACE_VERSION 1.5) +set(AUDASPACE_VERSION 1.6) set(AUDASPACE_LONG_VERSION ${AUDASPACE_VERSION}.0) if(DEFINED AUDASPACE_CMAKE_CFG) diff --git a/extern/audaspace/README.blender b/extern/audaspace/README.blender index 1bfa3004d8c..109d050aaef 100644 --- a/extern/audaspace/README.blender +++ b/extern/audaspace/README.blender @@ -1,6 +1,6 @@ Project: Audaspace URL: https://audaspace.github.io/ License: SPDX:Apache-2.0 -Upstream version: 1.4+ (ae29ce2, 2024 Feb 26) -Copyright: "Copyright © 2009-2015 Jörg Müller. All rights reserved." -Local modifications: none \ No newline at end of file +Upstream version: 1.6.0 (cb493a1, 2025 Mar 3) +Copyright: "Copyright © 2009-2025 Jörg Müller. All rights reserved." +Local modifications: none diff --git a/extern/audaspace/README.md b/extern/audaspace/README.md index d78e82253fd..5a360ea757b 100644 --- a/extern/audaspace/README.md +++ b/extern/audaspace/README.md @@ -32,7 +32,7 @@ The following (probably incomplete) features are supported by audaspace: License ------- -> Copyright © 2009-2024 Jörg Müller. All rights reserved. +> Copyright © 2009-2025 Jörg Müller. All rights reserved. > > Licensed under the Apache License, Version 2.0 (the "License"); > you may not use this file except in compliance with the License. diff --git a/extern/audaspace/bindings/C/AUD_Types.h b/extern/audaspace/bindings/C/AUD_Types.h index 2a6e5d516eb..8384273e9ae 100644 --- a/extern/audaspace/bindings/C/AUD_Types.h +++ b/extern/audaspace/bindings/C/AUD_Types.h @@ -74,7 +74,7 @@ typedef enum AUD_CONTAINER_MP3, AUD_CONTAINER_OGG, AUD_CONTAINER_WAV, - AUD_CONTAINER_AAC, + AUD_CONTAINER_AAC } AUD_Container; /// Audio codecs for writers. diff --git a/extern/audaspace/bindings/python/setup.py.in b/extern/audaspace/bindings/python/setup.py.in index 7618f896ecc..0feb54503f3 100644 --- a/extern/audaspace/bindings/python/setup.py.in +++ b/extern/audaspace/bindings/python/setup.py.in @@ -34,7 +34,7 @@ if sys.platform == 'win32': extra_args.append('/EHsc') extra_args.append('/DAUD_BUILD_SHARED_LIBRARY') else: - extra_args.append('-std=c++11') + extra_args.append('-std=c++17') audaspace = Extension( 'aud', diff --git a/extern/audaspace/plugins/pipewire/PipeWireLibrary.cpp b/extern/audaspace/plugins/pipewire/PipeWireLibrary.cpp index 9c32fc7e842..de9d8ebb4ae 100644 --- a/extern/audaspace/plugins/pipewire/PipeWireLibrary.cpp +++ b/extern/audaspace/plugins/pipewire/PipeWireLibrary.cpp @@ -53,7 +53,7 @@ bool loadPipeWire() #undef PIPEWIRE_SYMBOL - return AUD_pw_check_library_version != nullptr && AUD_pw_check_library_version(1,1,0); + return AUD_pw_check_library_version != nullptr && AUD_pw_check_library_version(1, 1, 0); } AUD_NAMESPACE_END