diff options
Diffstat (limited to 'lib/rbcodec/codecs')
-rw-r--r-- | lib/rbcodec/codecs/codecs.h | 10 | ||||
-rw-r--r-- | lib/rbcodec/codecs/lib/SOURCES | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/rbcodec/codecs/codecs.h b/lib/rbcodec/codecs/codecs.h index e04727fea8..6048e5012c 100644 --- a/lib/rbcodec/codecs/codecs.h +++ b/lib/rbcodec/codecs/codecs.h | |||
@@ -34,14 +34,12 @@ | |||
34 | #include "profile.h" | 34 | #include "profile.h" |
35 | #include "thread.h" | 35 | #include "thread.h" |
36 | #endif | 36 | #endif |
37 | #if (CONFIG_CODEC == SWCODEC) | ||
38 | #ifdef HAVE_RECORDING | 37 | #ifdef HAVE_RECORDING |
39 | #include "enc_base.h" | 38 | #include "enc_base.h" |
40 | #endif | 39 | #endif |
41 | #include "dsp_core.h" | 40 | #include "dsp_core.h" |
42 | #include "dsp_misc.h" | 41 | #include "dsp_misc.h" |
43 | #include "dsp-util.h" | 42 | #include "dsp-util.h" |
44 | #endif | ||
45 | 43 | ||
46 | #include "gcc_extensions.h" | 44 | #include "gcc_extensions.h" |
47 | #include "load_code.h" | 45 | #include "load_code.h" |
@@ -281,18 +279,18 @@ int codec_load_buf(int hid, struct codec_api *api); | |||
281 | int codec_load_file(const char* codec, struct codec_api *api); | 279 | int codec_load_file(const char* codec, struct codec_api *api); |
282 | int codec_run_proc(void); | 280 | int codec_run_proc(void); |
283 | int codec_close(void); | 281 | int codec_close(void); |
284 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_RECORDING) | 282 | #if defined(HAVE_RECORDING) |
285 | enc_callback_t codec_get_enc_callback(void); | 283 | enc_callback_t codec_get_enc_callback(void); |
286 | #else | ||
287 | #define codec_get_enc_callback() NULL | ||
288 | #endif | 284 | #endif |
289 | 285 | ||
290 | /* defined by the codec */ | 286 | /* defined by the codec */ |
291 | enum codec_status codec_start(enum codec_entry_call_reason reason); | 287 | enum codec_status codec_start(enum codec_entry_call_reason reason); |
292 | enum codec_status codec_main(enum codec_entry_call_reason reason); | 288 | enum codec_status codec_main(enum codec_entry_call_reason reason); |
293 | enum codec_status codec_run(void); | 289 | enum codec_status codec_run(void); |
294 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_RECORDING) | 290 | #if defined(HAVE_RECORDING) |
295 | int enc_callback(enum enc_callback_reason reason, void *params); | 291 | int enc_callback(enum enc_callback_reason reason, void *params); |
292 | #else | ||
293 | #define codec_get_enc_callback() NULL | ||
296 | #endif | 294 | #endif |
297 | 295 | ||
298 | #endif /* _CODECS_H_ */ | 296 | #endif /* _CODECS_H_ */ |
diff --git a/lib/rbcodec/codecs/lib/SOURCES b/lib/rbcodec/codecs/lib/SOURCES index f4b951a5eb..ffa7184019 100644 --- a/lib/rbcodec/codecs/lib/SOURCES +++ b/lib/rbcodec/codecs/lib/SOURCES | |||
@@ -1,4 +1,3 @@ | |||
1 | #if CONFIG_CODEC == SWCODEC /* software codec platforms */ | ||
2 | codeclib.c | 1 | codeclib.c |
3 | ffmpeg_bitstream.c | 2 | ffmpeg_bitstream.c |
4 | 3 | ||
@@ -6,6 +5,6 @@ mdct_lookup.c | |||
6 | fft-ffmpeg.c | 5 | fft-ffmpeg.c |
7 | mdct.c | 6 | mdct.c |
8 | 7 | ||
9 | #elif (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) | 8 | #if (CONFIG_PLATFORM & PLATFORM_HOSTED) && defined(__APPLE__) |
10 | osx.dummy.c | 9 | osx.dummy.c |
11 | #endif | 10 | #endif |