diff --git a/.bazelrc b/.bazelrc index c0c964d..dd72e12 100644 --- a/.bazelrc +++ b/.bazelrc @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f15763..7042db5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/MODULE.bazel b/MODULE.bazel index 19e908d..579f9c1 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -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", diff --git a/obr/ambisonic_binaural_decoder/BUILD b/obr/ambisonic_binaural_decoder/BUILD index d069580..c4729d7 100644 --- a/obr/ambisonic_binaural_decoder/BUILD +++ b/obr/ambisonic_binaural_decoder/BUILD @@ -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", ], ) @@ -24,7 +24,7 @@ cc_library( deps = [ "//obr/audio_buffer", "//obr/common", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) @@ -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", ], ) diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/BUILD b/obr/ambisonic_binaural_decoder/binaural_filters/BUILD index b3073ab..a29d3bd 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/BUILD +++ b/obr/ambisonic_binaural_decoder/binaural_filters/BUILD @@ -58,5 +58,7 @@ cc_library( "binaural_filters_4_oa_reverberant_r.h", "binaural_filters_wrapper.h", ], - deps = [], + deps = [ + "@abseil-cpp//absl/types:span", + ], ) diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.cc index 6451605..571e3d9 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_1_oa_ambient_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters1OAAmbientL() { - return { +absl::Span 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, @@ -5482,6 +5482,7 @@ std::vector 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 diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.h index 9860167..c1f827b 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_1_OA_AMBIENT_L_H_ #define BINAURAL_FILTERS_1_OA_AMBIENT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters1OAAmbientL(); +absl::Span BinauralFilters1OAAmbientL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.cc index 494cb97..9ec290a 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_1_oa_ambient_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters1OAAmbientR() { - return { +absl::Span 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, @@ -5482,6 +5482,7 @@ std::vector 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 diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.h index a302d45..4f4cf3a 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_ambient_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_1_OA_AMBIENT_R_H_ #define BINAURAL_FILTERS_1_OA_AMBIENT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters1OAAmbientR(); +absl::Span BinauralFilters1OAAmbientR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.cc index 4b4c322..ec1ff04 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_1_oa_direct_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters1OADirectL() { - return { +absl::Span 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, @@ -192,6 +192,7 @@ std::vector BinauralFilters1OADirectL() { 0xfe, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.h index b1fa30a..5f9f404 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_1_OA_DIRECT_L_H_ #define BINAURAL_FILTERS_1_OA_DIRECT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters1OADirectL(); +absl::Span BinauralFilters1OADirectL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.cc index d8f4829..65d65ae 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_1_oa_direct_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters1OADirectR() { - return { +absl::Span 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, @@ -192,6 +192,7 @@ std::vector BinauralFilters1OADirectR() { 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.h index 42e1559..51c661f 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_direct_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_1_OA_DIRECT_R_H_ #define BINAURAL_FILTERS_1_OA_DIRECT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters1OADirectR(); +absl::Span BinauralFilters1OADirectR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.cc index b73c93f..17da145 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_1_oa_reverberant_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters1OAReverberantL() { - return { +absl::Span 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, @@ -5482,6 +5482,7 @@ std::vector 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 diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.h index 974c6a2..86cf668 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_1_OA_REVERBERANT_L_H_ #define BINAURAL_FILTERS_1_OA_REVERBERANT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters1OAReverberantL(); +absl::Span BinauralFilters1OAReverberantL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.cc index ae488cf..94cc934 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_1_oa_reverberant_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters1OAReverberantR() { - return { +absl::Span 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, @@ -5482,6 +5482,7 @@ std::vector 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 diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.h index 78a7c4a..c275d39 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_1_oa_reverberant_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_1_OA_REVERBERANT_R_H_ #define BINAURAL_FILTERS_1_OA_REVERBERANT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters1OAReverberantR(); +absl::Span BinauralFilters1OAReverberantR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.cc index fadbf00..5bd7a99 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_2_oa_ambient_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters2OAAmbientL() { - return { +absl::Span 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, @@ -12309,6 +12309,7 @@ std::vector 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 diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.h index 2d280ba..209b80e 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_2_OA_AMBIENT_L_H_ #define BINAURAL_FILTERS_2_OA_AMBIENT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters2OAAmbientL(); +absl::Span BinauralFilters2OAAmbientL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.cc index 1981d62..e4b0ed2 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_2_oa_ambient_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters2OAAmbientR() { - return { +absl::Span BinauralFilters2OAAmbientR() { + 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, @@ -12309,6 +12309,7 @@ std::vector BinauralFilters2OAAmbientR() { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.h index bcfd465..9cc1d8f 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_ambient_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_2_OA_AMBIENT_R_H_ #define BINAURAL_FILTERS_2_OA_AMBIENT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters2OAAmbientR(); +absl::Span BinauralFilters2OAAmbientR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.cc index fd83fd4..60ab8ee 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_2_oa_direct_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters2OADirectL() { - return { +absl::Span BinauralFilters2OADirectL() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x12, 0x00, 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, @@ -405,6 +405,7 @@ std::vector BinauralFilters2OADirectL() { 0x01, 0x00, 0xfd, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.h index b6eef64..cc7e574 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_2_OA_DIRECT_L_H_ #define BINAURAL_FILTERS_2_OA_DIRECT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters2OADirectL(); +absl::Span BinauralFilters2OADirectL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.cc index d520695..45ee90b 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_2_oa_direct_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters2OADirectR() { - return { +absl::Span BinauralFilters2OADirectR() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x12, 0x00, 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, @@ -405,6 +405,7 @@ std::vector BinauralFilters2OADirectR() { 0x01, 0x00, 0xfd, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.h index 382af8c..0e4e233 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_direct_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_2_OA_DIRECT_R_H_ #define BINAURAL_FILTERS_2_OA_DIRECT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters2OADirectR(); +absl::Span BinauralFilters2OADirectR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.cc index 7e16481..5b3088d 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_2_oa_reverberant_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters2OAReverberantL() { - return { +absl::Span BinauralFilters2OAReverberantL() { + 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, @@ -12309,6 +12309,7 @@ std::vector BinauralFilters2OAReverberantL() { 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.h index 47fb177..2b68749 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_2_OA_REVERBERANT_L_H_ #define BINAURAL_FILTERS_2_OA_REVERBERANT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters2OAReverberantL(); +absl::Span BinauralFilters2OAReverberantL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.cc index 07f9af0..a3e46db 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_2_oa_reverberant_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters2OAReverberantR() { - return { +absl::Span BinauralFilters2OAReverberantR() { + 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, @@ -12309,6 +12309,7 @@ std::vector BinauralFilters2OAReverberantR() { 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.h index b2d91a3..7448c5a 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_2_oa_reverberant_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_2_OA_REVERBERANT_R_H_ #define BINAURAL_FILTERS_2_OA_REVERBERANT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters2OAReverberantR(); +absl::Span BinauralFilters2OAReverberantR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.cc index 176b2d3..1d8a784 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_3_oa_ambient_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters3OAAmbientL() { - return { +absl::Span BinauralFilters3OAAmbientL() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x00, 0x04, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x70, 0x17, 0x00, 0x20, 0x00, 0x10, 0x00, @@ -21866,6 +21866,7 @@ std::vector BinauralFilters3OAAmbientL() { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.h index c5aab70..ec1085f 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_3_OA_AMBIENT_L_H_ #define BINAURAL_FILTERS_3_OA_AMBIENT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters3OAAmbientL(); +absl::Span BinauralFilters3OAAmbientL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.cc index 72ada3b..b2ceaa0 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_3_oa_ambient_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters3OAAmbientR() { - return { +absl::Span BinauralFilters3OAAmbientR() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x00, 0x04, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x70, 0x17, 0x00, 0x20, 0x00, 0x10, 0x00, @@ -21866,6 +21866,7 @@ std::vector BinauralFilters3OAAmbientR() { 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.h index 346f78d..5707d45 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_ambient_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_3_OA_AMBIENT_R_H_ #define BINAURAL_FILTERS_3_OA_AMBIENT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters3OAAmbientR(); +absl::Span BinauralFilters3OAAmbientR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.cc index 1f86a36..e04fe9d 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_3_oa_direct_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters3OADirectL() { - return { +absl::Span BinauralFilters3OADirectL() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x20, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x70, 0x17, 0x00, 0x20, 0x00, 0x10, 0x00, @@ -704,6 +704,7 @@ std::vector BinauralFilters3OADirectL() { 0xfe, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.h index 3560946..4637fde 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_3_OA_DIRECT_L_H_ #define BINAURAL_FILTERS_3_OA_DIRECT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters3OADirectL(); +absl::Span BinauralFilters3OADirectL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.cc index bea349f..3ba8a63 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_3_oa_direct_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters3OADirectR() { - return { +absl::Span BinauralFilters3OADirectR() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x20, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x70, 0x17, 0x00, 0x20, 0x00, 0x10, 0x00, @@ -704,6 +704,7 @@ std::vector BinauralFilters3OADirectR() { 0xfe, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.h index ebcb0c3..d573053 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_direct_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_3_OA_DIRECT_R_H_ #define BINAURAL_FILTERS_3_OA_DIRECT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters3OADirectR(); +absl::Span BinauralFilters3OADirectR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.cc index 7817821..c3c98f6 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_3_oa_reverberant_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters3OAReverberantL() { - return { +absl::Span BinauralFilters3OAReverberantL() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x00, 0x04, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x70, 0x17, 0x00, 0x20, 0x00, 0x10, 0x00, @@ -21866,6 +21866,7 @@ std::vector BinauralFilters3OAReverberantL() { 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.h index cb17302..3a1846e 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_3_OA_REVERBERANT_L_H_ #define BINAURAL_FILTERS_3_OA_REVERBERANT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters3OAReverberantL(); +absl::Span BinauralFilters3OAReverberantL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.cc index 14fcf64..10d9a17 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_3_oa_reverberant_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters3OAReverberantR() { - return { +absl::Span BinauralFilters3OAReverberantR() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x00, 0x04, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x70, 0x17, 0x00, 0x20, 0x00, 0x10, 0x00, @@ -21866,6 +21866,7 @@ std::vector BinauralFilters3OAReverberantR() { 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.h index 5a808c4..14f3a98 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_3_oa_reverberant_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_3_OA_REVERBERANT_R_H_ #define BINAURAL_FILTERS_3_OA_REVERBERANT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters3OAReverberantR(); +absl::Span BinauralFilters3OAReverberantR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.cc index a8daa87..1115e7d 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_4_oa_ambient_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters4OAAmbientL() { - return { +absl::Span BinauralFilters4OAAmbientL() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x40, 0x06, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x19, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x9f, 0x24, 0x00, 0x32, 0x00, 0x10, 0x00, @@ -34154,6 +34154,7 @@ std::vector BinauralFilters4OAAmbientL() { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.h index 3013a45..3dbcaf1 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_4_OA_AMBIENT_L_H_ #define BINAURAL_FILTERS_4_OA_AMBIENT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters4OAAmbientL(); +absl::Span BinauralFilters4OAAmbientL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.cc index b3fc4cc..d7affa8 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_4_oa_ambient_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters4OAAmbientR() { - return { +absl::Span BinauralFilters4OAAmbientR() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x40, 0x06, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x19, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x9f, 0x24, 0x00, 0x32, 0x00, 0x10, 0x00, @@ -34154,6 +34154,7 @@ std::vector BinauralFilters4OAAmbientR() { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.h index 6bb5233..3577862 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_ambient_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_4_OA_AMBIENT_R_H_ #define BINAURAL_FILTERS_4_OA_AMBIENT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters4OAAmbientR(); +absl::Span BinauralFilters4OAAmbientR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.cc index 97a361d..88aa250 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_4_oa_direct_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters4OADirectL() { - return { +absl::Span BinauralFilters4OADirectL() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x32, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x19, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x9f, 0x24, 0x00, 0x32, 0x00, 0x10, 0x00, @@ -1088,6 +1088,7 @@ std::vector BinauralFilters4OADirectL() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.h index e6825b8..547ca82 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_4_OA_DIRECT_L_H_ #define BINAURAL_FILTERS_4_OA_DIRECT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters4OADirectL(); +absl::Span BinauralFilters4OADirectL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.cc index 41348be..d631333 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_4_oa_direct_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters4OADirectR() { - return { +absl::Span BinauralFilters4OADirectR() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x32, 0x00, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x19, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x9f, 0x24, 0x00, 0x32, 0x00, 0x10, 0x00, @@ -1088,6 +1088,7 @@ std::vector BinauralFilters4OADirectR() { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.h index a1fcb62..6b22f87 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_direct_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_4_OA_DIRECT_R_H_ #define BINAURAL_FILTERS_4_OA_DIRECT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters4OADirectR(); +absl::Span BinauralFilters4OADirectR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.cc index 3e5daef..ef23c22 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.cc @@ -8,14 +8,14 @@ #include "binaural_filters_4_oa_reverberant_l.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters4OAReverberantL() { - return { +absl::Span BinauralFilters4OAReverberantL() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x40, 0x06, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x19, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x9f, 0x24, 0x00, 0x32, 0x00, 0x10, 0x00, @@ -34154,6 +34154,7 @@ std::vector BinauralFilters4OAReverberantL() { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.h index 71b3fed..b9e0f70 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_l.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_4_OA_REVERBERANT_L_H_ #define BINAURAL_FILTERS_4_OA_REVERBERANT_L_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters4OAReverberantL(); +absl::Span BinauralFilters4OAReverberantL(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.cc index 176170a..4912943 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.cc @@ -8,14 +8,14 @@ #include "binaural_filters_4_oa_reverberant_r.h" -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { // clang-format off -std::vector BinauralFilters4OAReverberantR() { - return { +absl::Span BinauralFilters4OAReverberantR() { + static const unsigned char kDataArray[] = { 0x52, 0x49, 0x46, 0x46, 0x24, 0x40, 0x06, 0x00, 0x57, 0x41, 0x56, 0x45, 0x66, 0x6d, 0x74, 0x20, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x19, 0x00, 0x80, 0xbb, 0x00, 0x00, 0x00, 0x9f, 0x24, 0x00, 0x32, 0x00, 0x10, 0x00, @@ -34154,6 +34154,7 @@ std::vector BinauralFilters4OAReverberantR() { 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, }; + return kDataArray; } // clang-format on diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.h b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.h index 197b07d..efca18f 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.h +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_4_oa_reverberant_r.h @@ -9,12 +9,12 @@ #ifndef BINAURAL_FILTERS_4_OA_REVERBERANT_R_H_ #define BINAURAL_FILTERS_4_OA_REVERBERANT_R_H_ -#include +#include "absl/types/span.h" namespace obr { namespace filter_files { -std::vector BinauralFilters4OAReverberantR(); +absl::Span BinauralFilters4OAReverberantR(); } // namespace filter_files } // namespace obr diff --git a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_wrapper.cc b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_wrapper.cc index 2cca265..567de70 100644 --- a/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_wrapper.cc +++ b/obr/ambisonic_binaural_decoder/binaural_filters/binaural_filters_wrapper.cc @@ -14,6 +14,7 @@ #include #include +#include "absl/types/span.h" #include "binaural_filters_1_oa_ambient_l.h" #include "binaural_filters_1_oa_ambient_r.h" #include "binaural_filters_1_oa_direct_l.h" @@ -49,7 +50,7 @@ std::unique_ptr BinauralFiltersWrapper::GetFile( const std::string& filename) const { using AssetMap = std::unordered_map()>>; + std::function()>>; static const AssetMap kAssetMap = [] { return AssetMap{ {"1OAAmbientL", filter_files::BinauralFilters1OAAmbientL}, diff --git a/obr/ambisonic_binaural_decoder/tests/BUILD b/obr/ambisonic_binaural_decoder/tests/BUILD index a4bc9d1..10cf6f9 100644 --- a/obr/ambisonic_binaural_decoder/tests/BUILD +++ b/obr/ambisonic_binaural_decoder/tests/BUILD @@ -10,7 +10,7 @@ cc_test( "//obr/ambisonic_binaural_decoder:fft_manager", "//obr/audio_buffer", "//obr/common", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", "@com_google_googletest//:gtest_main", ], ) @@ -55,8 +55,8 @@ cc_test( deps = [ "//obr/ambisonic_binaural_decoder:planar_interleaved_conversion", "//obr/audio_buffer", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:check", "@com_google_googletest//:gtest_main", ], ) diff --git a/obr/ambisonic_encoder/BUILD b/obr/ambisonic_encoder/BUILD index 3814715..fc79287 100644 --- a/obr/ambisonic_encoder/BUILD +++ b/obr/ambisonic_encoder/BUILD @@ -13,8 +13,8 @@ cc_library( ":associated_legendre_polynomials_generator", "//obr/audio_buffer", "//obr/common", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log:check", "@eigen", ], ) @@ -30,6 +30,6 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//obr/common", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", ], ) diff --git a/obr/ambisonic_encoder/tests/BUILD b/obr/ambisonic_encoder/tests/BUILD index dd352ab..8916f53 100644 --- a/obr/ambisonic_encoder/tests/BUILD +++ b/obr/ambisonic_encoder/tests/BUILD @@ -19,7 +19,7 @@ cc_test( deps = [ "//obr/ambisonic_encoder", "//obr/audio_buffer", - "@com_google_absl//absl/container:flat_hash_map", + "@abseil-cpp//absl/container:flat_hash_map", "@com_google_googletest//:gtest_main", ], ) diff --git a/obr/ambisonic_rotator/BUILD b/obr/ambisonic_rotator/BUILD index b32814f..83f65fa 100644 --- a/obr/ambisonic_rotator/BUILD +++ b/obr/ambisonic_rotator/BUILD @@ -12,7 +12,7 @@ cc_library( deps = [ "//obr/audio_buffer", "//obr/common", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", "@eigen", ], ) diff --git a/obr/audio_buffer/BUILD b/obr/audio_buffer/BUILD index 0ac31a9..f8c626e 100644 --- a/obr/audio_buffer/BUILD +++ b/obr/audio_buffer/BUILD @@ -16,7 +16,7 @@ cc_library( ":channel_view", ":simd_utils", "//obr/common", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", ], ) @@ -26,7 +26,7 @@ cc_library( hdrs = ["channel_view.h"], deps = [ ":simd_utils", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", ], ) @@ -43,6 +43,6 @@ cc_library( deps = [ ":simd_macros", "//obr/common", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", ], ) diff --git a/obr/cli/BUILD b/obr/cli/BUILD index 896ed1b..e1c2eb2 100644 --- a/obr/cli/BUILD +++ b/obr/cli/BUILD @@ -13,10 +13,10 @@ cc_library( "//obr/renderer:audio_element_config", "//obr/renderer:audio_element_type", "//obr/renderer:obr_impl", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", "@com_google_audio_to_tactile//:dsp", "@com_google_protobuf//:protobuf", ], @@ -29,13 +29,13 @@ cc_binary( ":obr_cli_lib", "//obr/renderer:audio_element_config", "//obr/renderer:audio_element_type", - "@com_google_absl//absl/flags:flag", - "@com_google_absl//absl/flags:parse", - "@com_google_absl//absl/flags:usage", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/log:flags", - "@com_google_absl//absl/status", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/flags:flag", + "@abseil-cpp//absl/flags:parse", + "@abseil-cpp//absl/flags:usage", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/log:flags", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/strings", ], ) diff --git a/obr/cli/tests/BUILD b/obr/cli/tests/BUILD index 9d554f5..a0698e1 100644 --- a/obr/cli/tests/BUILD +++ b/obr/cli/tests/BUILD @@ -14,7 +14,7 @@ cc_test( "//obr/cli:obr_cli_lib", "//obr/renderer:audio_element_config", "//obr/renderer:audio_element_type", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/strings", "@com_google_googletest//:gtest_main", ], ) diff --git a/obr/common/BUILD b/obr/common/BUILD index 081bbe3..d384bdd 100644 --- a/obr/common/BUILD +++ b/obr/common/BUILD @@ -10,7 +10,7 @@ cc_library( "misc_math.h", ], deps = [ - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", "@eigen", ], ) @@ -27,7 +27,7 @@ cc_library( deps = [ ":common", "//obr/audio_buffer", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", "@com_google_googletest//:gtest", ], ) diff --git a/obr/peak_limiter/BUILD b/obr/peak_limiter/BUILD index efa4a7a..9ac1505 100644 --- a/obr/peak_limiter/BUILD +++ b/obr/peak_limiter/BUILD @@ -9,6 +9,6 @@ cc_library( visibility = ["//visibility:public"], deps = [ "//obr/audio_buffer", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/log:check", ], ) diff --git a/obr/renderer/BUILD b/obr/renderer/BUILD index 7768f0a..d752841 100644 --- a/obr/renderer/BUILD +++ b/obr/renderer/BUILD @@ -11,10 +11,10 @@ cc_library( ":input_channel_config", ":loudspeaker_layouts", "//obr/common", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) @@ -23,11 +23,11 @@ cc_library( hdrs = ["audio_element_type.h"], visibility = ["//visibility:public"], deps = [ - "@com_google_absl//absl/base:no_destructor", - "@com_google_absl//absl/container:btree", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:statusor", - "@com_google_absl//absl/strings", + "@abseil-cpp//absl/base:no_destructor", + "@abseil-cpp//absl/container:btree", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:statusor", + "@abseil-cpp//absl/strings", ], ) @@ -50,10 +50,10 @@ cc_library( "//obr/audio_buffer", "//obr/common", "//obr/peak_limiter", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", - "@com_google_absl//absl/status", - "@com_google_absl//absl/synchronization", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:check", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/synchronization", ], ) @@ -69,8 +69,8 @@ cc_library( deps = [ ":audio_element_type", ":input_channel_config", - "@com_google_absl//absl/container:flat_hash_map", - "@com_google_absl//absl/log", - "@com_google_absl//absl/log:check", + "@abseil-cpp//absl/container:flat_hash_map", + "@abseil-cpp//absl/log", + "@abseil-cpp//absl/log:check", ], ) diff --git a/obr/renderer/obr_impl.cc b/obr/renderer/obr_impl.cc index af00689..c4ebeb8 100644 --- a/obr/renderer/obr_impl.cc +++ b/obr/renderer/obr_impl.cc @@ -70,7 +70,7 @@ absl::Status ObrImpl::ResetDsp() { LOG(INFO) << "Resetting DSP."; // Enable the lock. - absl::MutexLock lock(mutex_); + absl::MutexLock lock(&mutex_); // Release resources. ambisonic_binaural_decoder_.reset(); @@ -116,7 +116,7 @@ absl::Status ObrImpl::InitializeDsp() { RETURN_IF_NOT_OK(ResetDsp()); // Enable the lock. - absl::MutexLock lock(mutex_); + absl::MutexLock lock(&mutex_); // Setup Ambisonic mix bed. ambisonic_mix_bed_ = @@ -187,7 +187,7 @@ void ObrImpl::Process(const AudioBuffer& input_buffer, CHECK_EQ(output_buffer->num_frames(), buffer_size_per_channel_); // Enable the lock. - absl::MutexLock lock(mutex_); + absl::MutexLock lock(&mutex_); // Pass audio through Ambisonic Encoder and render to Ambisonic // mix bed. diff --git a/obr/renderer/tests/BUILD b/obr/renderer/tests/BUILD index d6401b0..3aab689 100644 --- a/obr/renderer/tests/BUILD +++ b/obr/renderer/tests/BUILD @@ -15,7 +15,7 @@ cc_test( srcs = ["audio_element_type_test.cc"], deps = [ "//obr/renderer:audio_element_type", - "@com_google_absl//absl/status:status_matchers", + "@abseil-cpp//absl/status:status_matchers", "@com_google_googletest//:gtest_main", ], ) @@ -30,8 +30,8 @@ cc_test( "//obr/renderer:audio_element_config", "//obr/renderer:audio_element_type", "//obr/renderer:obr_impl", - "@com_google_absl//absl/status", - "@com_google_absl//absl/status:status_matchers", + "@abseil-cpp//absl/status", + "@abseil-cpp//absl/status:status_matchers", "@com_google_googletest//:gtest_main", ], )