Skip to content

Commit a5670cc

Browse files
committed
Move HELIX_FEATURE_AUDIO_CODEC_AAC_SBR to ConfigHelix.h
1 parent a3abf4e commit a5670cc

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/ConfigHelix.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,9 @@
5353

5454
#ifndef HELIX_LOG_SIZE
5555
# define HELIX_LOG_SIZE 256
56+
#endif
57+
58+
/// the ESP8266 does not have enough memory
59+
#ifndef ESP8266
60+
# define HELIX_FEATURE_AUDIO_CODEC_AAC_SBR
5661
#endif

src/libhelix-aac/aaccommon.h

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,13 @@
4848

4949
//#include <Arduino.h>
5050
//#include <pgmspace.h>
51+
#include "ConfigHelix.h"
5152
#include "utils/helix_pgm.h"
5253

53-
// Can't fit in ESP8266 RAM
54-
//#ifndef ESP8266
55-
#define AAC_ENABLE_SBR 0
56-
//#endif
54+
/* define these to enable decoder features */
55+
#if defined(HELIX_FEATURE_AUDIO_CODEC_AAC_SBR)
56+
# define AAC_ENABLE_SBR
57+
#endif // HELIX_FEATURE_AUDIO_CODEC_AAC_SBR.
5758

5859
#pragma GCC optimize ("O3")
5960

src/libhelix-aac/aacdec.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ extern "C" {
9999
#define AAC_PROFILE_LC 1
100100
#define AAC_PROFILE_SSR 2
101101

102-
/* define these to enable decoder features */
103-
#if defined(HELIX_FEATURE_AUDIO_CODEC_AAC_SBR)
104-
#define AAC_ENABLE_SBR
105-
#endif // HELIX_FEATURE_AUDIO_CODEC_AAC_SBR.
106102
#define AAC_ENABLE_MPEG4
107103

108104
enum {

0 commit comments

Comments
 (0)