File tree Expand file tree Collapse file tree 2 files changed +9
-17
lines changed Expand file tree Collapse file tree 2 files changed +9
-17
lines changed Original file line number Diff line number Diff line change 10
10
#include <stdint.h>
11
11
#include <stdbool.h>
12
12
#include <string.h>
13
- #if defined(CONFIG_LIBSBC_ENCODER )
14
13
#include "sbc_encoder.h"
15
- #endif
16
- #if defined(CONFIG_LIBSBC_DECODER )
17
14
#include "oi_codec_sbc.h"
18
15
#include "oi_status.h"
19
- #endif
20
16
21
17
/** @brief SBC channel mode */
22
18
enum __packed sbc_ch_mode {
@@ -38,8 +34,6 @@ enum __packed sbc_alloc_mthd {
38
34
SBC_ALLOC_MTHD_SNR ,
39
35
};
40
36
41
- #if defined(CONFIG_LIBSBC_ENCODER )
42
-
43
37
/** @brief SBC encoder */
44
38
struct sbc_encoder {
45
39
/** @cond INTERNAL_HIDDEN */
@@ -112,9 +106,6 @@ int sbc_frame_bytes(struct sbc_encoder *encoder);
112
106
* @return The encoded size of one frame in bytes or (negative) error code otherwise.
113
107
*/
114
108
int sbc_frame_encoded_bytes (struct sbc_encoder * encoder );
115
- #endif
116
-
117
- #if defined(CONFIG_LIBSBC_DECODER )
118
109
119
110
/** @brief SBC decoder */
120
111
struct sbc_decoder {
@@ -145,5 +136,4 @@ int sbc_setup_decoder(struct sbc_decoder *decoder);
145
136
*/
146
137
int sbc_decode (struct sbc_decoder * decoder , const void * * in_data , uint32_t * in_size ,
147
138
void * out_data , uint32_t * out_size );
148
- #endif
149
139
#endif /* ZEPHYR_INCLUDE_LIB_SBC_H_ */
Original file line number Diff line number Diff line change @@ -7,6 +7,15 @@ zephyr_compile_definitions(SBC_FOR_EMBEDDED_LINUX)
7
7
zephyr_compile_definitions(SBC_NO_PCM_CPY_OPTION)
8
8
zephyr_library_sources(sbc.c)
9
9
10
+ zephyr_include_directories(
11
+ ${ZEPHYR_LIBSBC_MODULE_DIR} /encoder/include
12
+ )
13
+
14
+ zephyr_include_directories(
15
+ ${ZEPHYR_LIBSBC_MODULE_DIR} /decoder/include
16
+ ${ZEPHYR_LIBSBC_MODULE_DIR} /decoder/srce
17
+ )
18
+
10
19
if (CONFIG_LIBSBC_ENCODER)
11
20
zephyr_library_sources(
12
21
${ZEPHYR_LIBSBC_MODULE_DIR} /encoder/srce/sbc_analysis.c
@@ -18,9 +27,6 @@ zephyr_library_sources(
18
27
${ZEPHYR_LIBSBC_MODULE_DIR} /encoder/srce/sbc_encoder.c
19
28
${ZEPHYR_LIBSBC_MODULE_DIR} /encoder/srce/sbc_packing.c
20
29
)
21
- zephyr_include_directories(
22
- ${ZEPHYR_LIBSBC_MODULE_DIR} /encoder/include
23
- )
24
30
endif ()
25
31
26
32
if (CONFIG_LIBSBC_DECODER)
@@ -41,9 +47,5 @@ zephyr_library_sources(
41
47
${ZEPHYR_LIBSBC_MODULE_DIR} /decoder/srce/synthesis-dct8.c
42
48
${ZEPHYR_LIBSBC_MODULE_DIR} /decoder/srce/synthesis-sbc.c
43
49
)
44
- zephyr_include_directories(
45
- ${ZEPHYR_LIBSBC_MODULE_DIR} /decoder/include
46
- ${ZEPHYR_LIBSBC_MODULE_DIR} /decoder/srce
47
- )
48
50
endif ()
49
51
endif ()
You can’t perform that action at this time.
0 commit comments