From 58c6ca059b35b3fd213fc3e8c528fdf16d300912 Mon Sep 17 00:00:00 2001 From: Philippe G Date: Tue, 11 May 2021 07:16:36 -0700 Subject: [PATCH] reverse SBR enablement logic --- components/codecs/CMakeLists.txt | 6 +++--- components/squeezelite/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/codecs/CMakeLists.txt b/components/codecs/CMakeLists.txt index 20b3c5f1..c38196f2 100644 --- a/components/codecs/CMakeLists.txt +++ b/components/codecs/CMakeLists.txt @@ -2,10 +2,10 @@ idf_component_register( INCLUDE_DIRS . ./inc inc/alac inc/FLAC inc/helix-aac inc/mad inc/ogg inc/opus inc/opusfile inc/resample16 inc/soxr inc/vorbis ) -if (DEFINED AAC_ENABLE_SBR) -add_prebuilt_library(libhelix-aac lib/libhelix-aac-sbr.a ) -else () +if (DEFINED AAC_DISABLE_SBR) add_prebuilt_library(libhelix-aac lib/libhelix-aac.a ) +else () +add_prebuilt_library(libhelix-aac lib/libhelix-aac-sbr.a ) endif() add_prebuilt_library(libmad lib/libmad.a) diff --git a/components/squeezelite/CMakeLists.txt b/components/squeezelite/CMakeLists.txt index 1de1fdc5..391774a5 100644 --- a/components/squeezelite/CMakeLists.txt +++ b/components/squeezelite/CMakeLists.txt @@ -37,7 +37,7 @@ else() add_definitions(-DRESAMPLE16 -DBYTES_PER_FRAME=4) endif() -if (DEFINED AAC_ENABLE_SBR) +if (NOT DEFINED AAC_DISABLED_SBR) add_definitions(-DAAC_ENABLE_SBR) endif()