Merge pull request #6 from trsonic:fix-cmake-src-list

PiperOrigin-RevId: 825392326

Author: yeroro

CMakeLists.txt

@@ -19,7 +19,7 @@ include(FetchContent)
 FetchContent_Declare(
         absl
         GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
-        GIT_TAG 4447c7562e3bc702ade25105912dce503f0c4010
+        GIT_TAG d38452e1ee03523a208362186fd42248ff2609f6
 )
 FetchContent_MakeAvailable(absl)
 
@@ -69,34 +69,54 @@ set(SourceFiles
         obr/ambisonic_binaural_decoder/wav.h
         obr/ambisonic_binaural_decoder/wav_reader.cc
         obr/ambisonic_binaural_decoder/wav_reader.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_l.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_l.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_r.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_r.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_l.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_l.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_r.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_r.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_l.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_l.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_r.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_r.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_l.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_l.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_r.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_r.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_5_oa_l.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_5_oa_l.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_5_oa_r.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_5_oa_r.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_6_oa_l.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_6_oa_l.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_6_oa_r.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_6_oa_r.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_7_oa_l.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_7_oa_l.h
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_7_oa_r.cc
-        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_7_oa_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.h
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.cc
+        obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.h
         obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_wrapper.cc
         obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_wrapper.h
         obr/ambisonic_encoder/ambisonic_encoder.cc

MODULE.bazel

@@ -13,7 +13,7 @@ module(
 bazel_dep(name = "rules_cc", version = "0.1.1")
 bazel_dep(
     name = "abseil-cpp",
-    version = "20240722.0.bcr.2",
+    version = "20250814.1",
     repo_name = "com_google_absl",
 )
 bazel_dep(
@@ -23,7 +23,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "protobuf",
-    version = "28.3",
+    version = "32.1",
     repo_name = "com_google_protobuf",
 )
 bazel_dep(

README.md

@@ -1,31 +1,60 @@
 # Open Binaural Renderer (obr)
+
 The `obr` binaural rendering library is designed to render immersive audio content.
 
 ## Features
-The library is written using C++ and it utilizes [Bazel](https://bazel.build/) build system. A CMake configuration is also provided.
+
+The library is written using C++ and it utilizes [Bazel](https://bazel.build/) build system. A CMake configuration is
+also provided.
 
 The library renders the following types of Audio Elements:
 
-* Ambisonics (from 1st to 7th order).
-* Channel-based (e.g. 5.1, 7.1.4). See [Loudspeaker Layouts](docs/loudspeaker_layouts.md) for the full list of supported loudspeaker layouts.
-* Object-based. The API allows for controlling the position of the object in the 3D space. Currently only single channel, point-source objects are supported.
+* Ambisonics (from 1st to 4th order).
+* Channel-based (e.g. 5.1, 7.1.4). See [Loudspeaker Layouts](docs/loudspeaker_layouts.md) for the full list of supported
+  loudspeaker layouts.
+* Object-based. The API allows for controlling the position of the object in the 3D space. Currently only single
+  channel, point-source objects are supported.
 
 ### Encoding to Ambisonics
-* Handling of channel and object-based audio elements is done by encoding the required input channels into an intermediate Ambisonic bed and subsequently rendering the bed using a set of FIR filters matching its Ambisonic order.
-* The calculation of spherical harmonic (SH) coefficients used during the encoding process is based on the [Resonance Audio](https://github.com/resonance-audio/resonance-audio/)'s [AssociatedLegendrePolynomialsGenerator](https://github.com/resonance-audio/resonance-audio/blob/master/resonance_audio/ambisonics/associated_legendre_polynomials_generator.h) class.
+
+* Handling of channel and object-based audio elements is done by encoding the required input channels into an
+  intermediate Ambisonic bed and subsequently rendering the bed using a set of FIR filters matching its Ambisonic order.
+* The calculation of spherical harmonic (SH) coefficients used during the encoding process is based on
+  the [Resonance Audio](https://github.com/resonance-audio/resonance-audio/)'
+  s [AssociatedLegendrePolynomialsGenerator](https://github.com/resonance-audio/resonance-audio/blob/master/resonance_audio/ambisonics/associated_legendre_polynomials_generator.h)
+  class.
 
 ### Ambisonics to Binaural
-* The binaural renderer is based on the principle of using Head Related Transfer Functions (HRTFs) and Binaural Room Impulse Responses (BRIRs) decomposed using SH coefficients.
+
+* The binaural renderer is based on the principle of using Head Related Transfer Functions (HRTFs) and Binaural Room
+  Impulse Responses (BRIRs) decomposed using SH coefficients.
 * The FIR filters were designed as a combination of anechoic and reverberant filters.
-* The FIR filtering (convolution) mechanism employed in this library is based on the [Resonance Audio](https://github.com/resonance-audio/resonance-audio/)'s [AmbisonicBinauralDecoder](https://github.com/resonance-audio/resonance-audio/blob/master/resonance_audio/ambisonics/ambisonic_binaural_decoder.h) class and its dependencies.
+* The FIR filtering (convolution) mechanism employed in this library is based on
+  the [Resonance Audio](https://github.com/resonance-audio/resonance-audio/)'
+  s [AmbisonicBinauralDecoder](https://github.com/resonance-audio/resonance-audio/blob/master/resonance_audio/ambisonics/ambisonic_binaural_decoder.h)
+  class and its dependencies.
 * The library uses asymmetric binaural processing, this means it employs dedicated filters for left and right ears.
 * Binaural filter matrices are loaded from embedded assets.
-* The rendering filters are selected depending on the Ambisonic order matching the input Audio Element, e.g. 7.1.4 rendering uses the highest available order of filters (7OA).
-* The default length of the binaural filters is 8192 samples per SH channel @ 48 kHz sampling rate.
+* The rendering filters are selected depending on the Ambisonic order matching the input Audio Element. Channel- and
+  object-based Audio Elements are first encoded to 3rd Order Ambisonics and then rendered using filters of the same
+  order,
+* The following table summarizes the binaural filter lengths per each SH channel for Direct, Ambient, and Reverberant
+  types at a 48 kHz sampling rate:
+
+| Filter Type | Filter Length (samples) | Sampling Rate |
+|-------------|-------------------------|---------------|
+| Direct      | 256                     | 48 kHz        |
+| Ambient     | 8192                    | 48 kHz        |
+| Reverberant | 8192                    | 48 kHz        |
 
 ## Usage
+
 ### C++ API
-The `ObrImpl` class is the main interface for the binaural renderer. It provides methods to configure audio elements, process audio buffers, and retrieve information about the renderer. See [obr_cli.cc](src/cli/obr_cli.cc) for an example of how to use the library. Listed below are the main methods required to configure the renderer and process audio data.
+
+The `ObrImpl` class is the main interface for the binaural renderer. It provides methods to configure audio elements,
+process audio buffers, and retrieve information about the renderer. See [obr_cli_lib.cc](obr/cli/obr_cli_lib.cc) for an
+example
+of how to use the library. Listed below are the main methods required to configure the renderer and process audio data.
 
 #### Constructor
 
@@ -40,31 +69,41 @@ ObrImpl(int buffer_size_per_channel, int sampling_rate);
 
 #### Configuration
 
-In order to render immersive audio using `obr`, the renderer needs to be configured using the `AddAudioElement` method. The method accepts `AudioElementType` enums defined within the [audio_element_type.h](src/renderer/audio_element_type.h) file.
+In order to render immersive audio using `obr`, the renderer needs to be configured using the `AddAudioElement` method.
+The method accepts `AudioElementType` enums defined within the [audio_element_type.h](obr/renderer/audio_element_type.h)
+file and `BinauralFilterProfile` enums defined within
+the [audio_element_config.h](obr/renderer/audio_element_config.h) file. If the second argument is not provided, the
+filter type defaults to `kAmbient`.
 
 ```cpp
- absl::Status AddAudioElement(AudioElementType type);
+absl::Status AddAudioElement(AudioElementType type,
+                             BinauralFilterProfile filter_type);
 ```
 
 #### Audio processing callback
 
-Once the renderer is configured, the rendering of audio data can be done using the `Process` method. The method uses [`AudioBuffer`](src/audio_buffer/audio_buffer.h) class for storing input and output audio data.
+Once the renderer is configured, the rendering of audio data can be done using the `Process` method. The method uses [
+`AudioBuffer`](obr/audio_buffer/audio_buffer.h) class for storing input and output audio data.
 
 ```cpp
   void Process(const AudioBuffer& input_buffer, AudioBuffer* output_buffer);
 ```
 
 ### Command Line Interface (CLI)
-The command line interface provides a straightforward way to render audio files of certain types. The CLI is built as a standalone executable and can be run as follows:
+
+The command line interface provides a straightforward way to render audio files of certain types. The CLI is built as a
+standalone executable and can be run as follows:
 
 ```
  obr_cli
-   --input_type=<type> (3OA, 7OA, 7.1.4, OBA)
+   --input_type=<1OA|2OA|3OA|4OA|7.1.4|OBA>
    --oba_metadata_file=<full path to textproto file> (required for OBA)
    --input_file=<full path to wav file>
    --output_file=<full path to wav file>
    --buffer_size=<number of samples> (optional, default is 256)
+   --filter_type=<Direct|Ambient|Reverberant> (optional, default is Ambient)
 ```
 
 ## Testing
+
 The library is tested using Google Test framework. The tests are located in `test` subdirectories.

obr/ambisonic_binaural_decoder/BUILD

@@ -1,3 +1,5 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//obr:__subpackages__"])
 
 cc_library(

obr/ambisonic_binaural_decoder/binaural_filters/BUILD

@@ -1,39 +1,61 @@
+load("@rules_cc//cc:cc_library.bzl", "cc_library")
+
 package(default_visibility = ["//obr:__subpackages__"])
 
 cc_library(
     name = "binaural_filters_wrapper",
     srcs = [
-        "binaural_filters_1_oa_l.cc",
-        "binaural_filters_1_oa_r.cc",
-        "binaural_filters_2_oa_l.cc",
-        "binaural_filters_2_oa_r.cc",
-        "binaural_filters_3_oa_l.cc",
-        "binaural_filters_3_oa_r.cc",
-        "binaural_filters_4_oa_l.cc",
-        "binaural_filters_4_oa_r.cc",
-        "binaural_filters_5_oa_l.cc",
-        "binaural_filters_5_oa_r.cc",
-        "binaural_filters_6_oa_l.cc",
-        "binaural_filters_6_oa_r.cc",
-        "binaural_filters_7_oa_l.cc",
-        "binaural_filters_7_oa_r.cc",
+        "binaural_filters_1_oa_ambient_l.cc",
+        "binaural_filters_1_oa_ambient_r.cc",
+        "binaural_filters_1_oa_direct_l.cc",
+        "binaural_filters_1_oa_direct_r.cc",
+        "binaural_filters_1_oa_reverberant_l.cc",
+        "binaural_filters_1_oa_reverberant_r.cc",
+        "binaural_filters_2_oa_ambient_l.cc",
+        "binaural_filters_2_oa_ambient_r.cc",
+        "binaural_filters_2_oa_direct_l.cc",
+        "binaural_filters_2_oa_direct_r.cc",
+        "binaural_filters_2_oa_reverberant_l.cc",
+        "binaural_filters_2_oa_reverberant_r.cc",
+        "binaural_filters_3_oa_ambient_l.cc",
+        "binaural_filters_3_oa_ambient_r.cc",
+        "binaural_filters_3_oa_direct_l.cc",
+        "binaural_filters_3_oa_direct_r.cc",
+        "binaural_filters_3_oa_reverberant_l.cc",
+        "binaural_filters_3_oa_reverberant_r.cc",
+        "binaural_filters_4_oa_ambient_l.cc",
+        "binaural_filters_4_oa_ambient_r.cc",
+        "binaural_filters_4_oa_direct_l.cc",
+        "binaural_filters_4_oa_direct_r.cc",
+        "binaural_filters_4_oa_reverberant_l.cc",
+        "binaural_filters_4_oa_reverberant_r.cc",
         "binaural_filters_wrapper.cc",
     ],
     hdrs = [
-        "binaural_filters_1_oa_l.h",
-        "binaural_filters_1_oa_r.h",
-        "binaural_filters_2_oa_l.h",
-        "binaural_filters_2_oa_r.h",
-        "binaural_filters_3_oa_l.h",
-        "binaural_filters_3_oa_r.h",
-        "binaural_filters_4_oa_l.h",
-        "binaural_filters_4_oa_r.h",
-        "binaural_filters_5_oa_l.h",
-        "binaural_filters_5_oa_r.h",
-        "binaural_filters_6_oa_l.h",
-        "binaural_filters_6_oa_r.h",
-        "binaural_filters_7_oa_l.h",
-        "binaural_filters_7_oa_r.h",
+        "binaural_filters_1_oa_ambient_l.h",
+        "binaural_filters_1_oa_ambient_r.h",
+        "binaural_filters_1_oa_direct_l.h",
+        "binaural_filters_1_oa_direct_r.h",
+        "binaural_filters_1_oa_reverberant_l.h",
+        "binaural_filters_1_oa_reverberant_r.h",
+        "binaural_filters_2_oa_ambient_l.h",
+        "binaural_filters_2_oa_ambient_r.h",
+        "binaural_filters_2_oa_direct_l.h",
+        "binaural_filters_2_oa_direct_r.h",
+        "binaural_filters_2_oa_reverberant_l.h",
+        "binaural_filters_2_oa_reverberant_r.h",
+        "binaural_filters_3_oa_ambient_l.h",
+        "binaural_filters_3_oa_ambient_r.h",
+        "binaural_filters_3_oa_direct_l.h",
+        "binaural_filters_3_oa_direct_r.h",
+        "binaural_filters_3_oa_reverberant_l.h",
+        "binaural_filters_3_oa_reverberant_r.h",
+        "binaural_filters_4_oa_ambient_l.h",
+        "binaural_filters_4_oa_ambient_r.h",
+        "binaural_filters_4_oa_direct_l.h",
+        "binaural_filters_4_oa_direct_r.h",
+        "binaural_filters_4_oa_reverberant_l.h",
+        "binaural_filters_4_oa_reverberant_r.h",
         "binaural_filters_wrapper.h",
     ],
     deps = [],