Skip to content

Embeds the filter data and improves compatibility #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yeroro merged 3 commits into from
Dec 2, 2025
Merged

Embeds the filter data and improves compatibility #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cae29dd
Embeds the filter data into the library to avoid allocations on stack
yeroro Dec 2, 2025
f50d91a
Fixes the build flag for windows's c++ version
yeroro Dec 2, 2025
6e9cdb7
Adds the `--host_cxxopt` flag for windows build
yeroro Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ build:macos --linkopt=-lm
build:macos --cxxopt=-std=c++20
build:macos --cxxopt=-Wno-sign-compare

build:windows --cxxopt=-std:c++20
build:windows --cxxopt=/std:c++20
build:windows --host_cxxopt=/std:c++20
build:windows --linkopt=/STACK:8388608
startup --windows_enable_symlinks
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ include(FetchContent)
FetchContent_Declare(
absl
GIT_REPOSITORY https://github.com/abseil/abseil-cpp.git
GIT_TAG d38452e1ee03523a208362186fd42248ff2609f6
GIT_TAG 20250512.1
)
FetchContent_MakeAvailable(absl)

Expand Down
3 changes: 1 addition & 2 deletions MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ module(
bazel_dep(name = "rules_cc", version = "0.1.1")
bazel_dep(
name = "abseil-cpp",
version = "20250814.1",
repo_name = "com_google_absl",
version = "20250512.1",
)
bazel_dep(
name = "googletest",
Expand Down
24 changes: 12 additions & 12 deletions obr/ambisonic_binaural_decoder/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ cc_library(
":partitioned_fft_filter",
"//obr/audio_buffer",
"//obr/common",
"@com_google_absl//absl/log:check",
"@abseil-cpp//absl/log:check",
],
)

Expand All @@ -24,7 +24,7 @@ cc_library(
deps = [
"//obr/audio_buffer",
"//obr/common",
"@com_google_absl//absl/log:check",
"@abseil-cpp//absl/log:check",
],
)

Expand All @@ -36,7 +36,7 @@ cc_library(
"//obr/audio_buffer",
"//obr/audio_buffer:simd_utils",
"//obr/common",
"@com_google_absl//absl/log:check",
"@abseil-cpp//absl/log:check",
"@pffft",
],
)
Expand All @@ -51,7 +51,7 @@ cc_library(
"//obr/audio_buffer",
"//obr/audio_buffer:simd_utils",
"//obr/common",
"@com_google_absl//absl/log:check",
"@abseil-cpp//absl/log:check",
],
)

Expand All @@ -64,7 +64,7 @@ cc_library(
"//obr/audio_buffer",
"//obr/audio_buffer:simd_utils",
"//obr/common",
"@com_google_absl//absl/log:check",
"@abseil-cpp//absl/log:check",
],
)

Expand All @@ -77,7 +77,7 @@ cc_library(
"//obr/audio_buffer",
"//obr/audio_buffer:simd_utils",
"//obr/common",
"@com_google_absl//absl/log:check",
"@abseil-cpp//absl/log:check",
],
)

Expand All @@ -87,7 +87,7 @@ cc_library(
hdrs = ["sample_type_conversion.h"],
deps = [
"//obr/audio_buffer:simd_utils",
"@com_google_absl//absl/log:check",
"@abseil-cpp//absl/log:check",
],
)

Expand All @@ -102,9 +102,9 @@ cc_library(
"//obr/ambisonic_binaural_decoder/binaural_filters:binaural_filters_wrapper",
"//obr/audio_buffer",
"//obr/common",
"@com_google_absl//absl/log",
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/log:die_if_null",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/log:check",
"@abseil-cpp//absl/log:die_if_null",
],
)

Expand All @@ -120,7 +120,7 @@ cc_library(
srcs = ["wav_reader.cc"],
hdrs = ["wav_reader.h"],
deps = [
"@com_google_absl//absl/log:check",
"@com_google_absl//absl/log:die_if_null",
"@abseil-cpp//absl/log:check",
"@abseil-cpp//absl/log:die_if_null",
],
)
4 changes: 3 additions & 1 deletion obr/ambisonic_binaural_decoder/binaural_filters/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,7 @@ cc_library(
"binaural_filters_4_oa_reverberant_r.h",
"binaural_filters_wrapper.h",
],
deps = [],
deps = [
"@abseil-cpp//absl/types:span",
],
)
7 changes: 4 additions & 3 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#include "binaural_filters_1_oa_ambient_l.h"

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

// clang-format off
std::vector<unsigned char> BinauralFilters1OAAmbientL() {
return {
absl::Span<const unsigned char> BinauralFilters1OAAmbientL() {
static const unsigned char kDataArray[] = {
0x52, 0x49, 0x46, 0x46, 0x24, 0x00, 0x01, 0x00, 0x57, 0x41, 0x56, 0x45,
0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,
0x80, 0xbb, 0x00, 0x00, 0x00, 0xdc, 0x05, 0x00, 0x08, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -5482,6 +5482,7 @@ std::vector<unsigned char> BinauralFilters1OAAmbientL() {
0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
};
return kDataArray;
}
// clang-format on

Expand Down
4 changes: 2 additions & 2 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#ifndef BINAURAL_FILTERS_1_OA_AMBIENT_L_H_
#define BINAURAL_FILTERS_1_OA_AMBIENT_L_H_

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

std::vector<unsigned char> BinauralFilters1OAAmbientL();
absl::Span<const unsigned char> BinauralFilters1OAAmbientL();

} // namespace filter_files
} // namespace obr
Expand Down
7 changes: 4 additions & 3 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#include "binaural_filters_1_oa_ambient_r.h"

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

// clang-format off
std::vector<unsigned char> BinauralFilters1OAAmbientR() {
return {
absl::Span<const unsigned char> BinauralFilters1OAAmbientR() {
static const unsigned char kDataArray[] = {
0x52, 0x49, 0x46, 0x46, 0x24, 0x00, 0x01, 0x00, 0x57, 0x41, 0x56, 0x45,
0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,
0x80, 0xbb, 0x00, 0x00, 0x00, 0xdc, 0x05, 0x00, 0x08, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -5482,6 +5482,7 @@ std::vector<unsigned char> BinauralFilters1OAAmbientR() {
0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00,
};
return kDataArray;
}
// clang-format on

Expand Down
4 changes: 2 additions & 2 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#ifndef BINAURAL_FILTERS_1_OA_AMBIENT_R_H_
#define BINAURAL_FILTERS_1_OA_AMBIENT_R_H_

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

std::vector<unsigned char> BinauralFilters1OAAmbientR();
absl::Span<const unsigned char> BinauralFilters1OAAmbientR();

} // namespace filter_files
} // namespace obr
Expand Down
7 changes: 4 additions & 3 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#include "binaural_filters_1_oa_direct_l.h"

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

// clang-format off
std::vector<unsigned char> BinauralFilters1OADirectL() {
return {
absl::Span<const unsigned char> BinauralFilters1OADirectL() {
static const unsigned char kDataArray[] = {
0x52, 0x49, 0x46, 0x46, 0x24, 0x08, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45,
0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,
0x80, 0xbb, 0x00, 0x00, 0x00, 0xdc, 0x05, 0x00, 0x08, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -192,6 +192,7 @@ std::vector<unsigned char> BinauralFilters1OADirectL() {
0xfe, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x00, 0x00,
0xff, 0xff, 0x00, 0x00,
};
return kDataArray;
}
// clang-format on

Expand Down
4 changes: 2 additions & 2 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#ifndef BINAURAL_FILTERS_1_OA_DIRECT_L_H_
#define BINAURAL_FILTERS_1_OA_DIRECT_L_H_

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

std::vector<unsigned char> BinauralFilters1OADirectL();
absl::Span<const unsigned char> BinauralFilters1OADirectL();

} // namespace filter_files
} // namespace obr
Expand Down
7 changes: 4 additions & 3 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#include "binaural_filters_1_oa_direct_r.h"

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

// clang-format off
std::vector<unsigned char> BinauralFilters1OADirectR() {
return {
absl::Span<const unsigned char> BinauralFilters1OADirectR() {
static const unsigned char kDataArray[] = {
0x52, 0x49, 0x46, 0x46, 0x24, 0x08, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45,
0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,
0x80, 0xbb, 0x00, 0x00, 0x00, 0xdc, 0x05, 0x00, 0x08, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -192,6 +192,7 @@ std::vector<unsigned char> BinauralFilters1OADirectR() {
0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff,
0xff, 0xff, 0x00, 0x00,
};
return kDataArray;
}
// clang-format on

Expand Down
4 changes: 2 additions & 2 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#ifndef BINAURAL_FILTERS_1_OA_DIRECT_R_H_
#define BINAURAL_FILTERS_1_OA_DIRECT_R_H_

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

std::vector<unsigned char> BinauralFilters1OADirectR();
absl::Span<const unsigned char> BinauralFilters1OADirectR();

} // namespace filter_files
} // namespace obr
Expand Down
7 changes: 4 additions & 3 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#include "binaural_filters_1_oa_reverberant_l.h"

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

// clang-format off
std::vector<unsigned char> BinauralFilters1OAReverberantL() {
return {
absl::Span<const unsigned char> BinauralFilters1OAReverberantL() {
static const unsigned char kDataArray[] = {
0x52, 0x49, 0x46, 0x46, 0x24, 0x00, 0x01, 0x00, 0x57, 0x41, 0x56, 0x45,
0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,
0x80, 0xbb, 0x00, 0x00, 0x00, 0xdc, 0x05, 0x00, 0x08, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -5482,6 +5482,7 @@ std::vector<unsigned char> BinauralFilters1OAReverberantL() {
0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff,
0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
};
return kDataArray;
}
// clang-format on

Expand Down
4 changes: 2 additions & 2 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#ifndef BINAURAL_FILTERS_1_OA_REVERBERANT_L_H_
#define BINAURAL_FILTERS_1_OA_REVERBERANT_L_H_

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

std::vector<unsigned char> BinauralFilters1OAReverberantL();
absl::Span<const unsigned char> BinauralFilters1OAReverberantL();

} // namespace filter_files
} // namespace obr
Expand Down
7 changes: 4 additions & 3 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#include "binaural_filters_1_oa_reverberant_r.h"

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

// clang-format off
std::vector<unsigned char> BinauralFilters1OAReverberantR() {
return {
absl::Span<const unsigned char> BinauralFilters1OAReverberantR() {
static const unsigned char kDataArray[] = {
0x52, 0x49, 0x46, 0x46, 0x24, 0x00, 0x01, 0x00, 0x57, 0x41, 0x56, 0x45,
0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00,
0x80, 0xbb, 0x00, 0x00, 0x00, 0xdc, 0x05, 0x00, 0x08, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -5482,6 +5482,7 @@ std::vector<unsigned char> BinauralFilters1OAReverberantR() {
0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00,
};
return kDataArray;
}
// clang-format on

Expand Down
4 changes: 2 additions & 2 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
#ifndef BINAURAL_FILTERS_1_OA_REVERBERANT_R_H_
#define BINAURAL_FILTERS_1_OA_REVERBERANT_R_H_

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

std::vector<unsigned char> BinauralFilters1OAReverberantR();
absl::Span<const unsigned char> BinauralFilters1OAReverberantR();

} // namespace filter_files
} // namespace obr
Expand Down
7 changes: 4 additions & 3 deletions obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#include "binaural_filters_2_oa_ambient_l.h"

#include <vector>
#include "absl/types/span.h"

namespace obr {
namespace filter_files {

// clang-format off
std::vector<unsigned char> BinauralFilters2OAAmbientL() {
return {
absl::Span<const unsigned char> BinauralFilters2OAAmbientL() {
static const unsigned char kDataArray[] = {
0x52, 0x49, 0x46, 0x46, 0x24, 0x40, 0x02, 0x00, 0x57, 0x41, 0x56, 0x45,
0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x09, 0x00,
0x80, 0xbb, 0x00, 0x00, 0x00, 0x2f, 0x0d, 0x00, 0x12, 0x00, 0x10, 0x00,
Expand Down Expand Up @@ -12309,6 +12309,7 @@ std::vector<unsigned char> BinauralFilters2OAAmbientL() {
0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff,
};
return kDataArray;
}
// clang-format on

Expand Down
Loading
Loading