diff options
Diffstat (limited to 'apps/codecs/libwavpack/unpack.c')
-rw-r--r-- | apps/codecs/libwavpack/unpack.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/codecs/libwavpack/unpack.c b/apps/codecs/libwavpack/unpack.c index daf88718c8..f2eca7619f 100644 --- a/apps/codecs/libwavpack/unpack.c +++ b/apps/codecs/libwavpack/unpack.c | |||
@@ -286,9 +286,9 @@ int read_config_info (WavpackContext *wpc, WavpackMetadata *wpmd) | |||
286 | // samples unpacked, which can be less than the number requested if an error | 286 | // samples unpacked, which can be less than the number requested if an error |
287 | // occurs or the end of the block is reached. | 287 | // occurs or the end of the block is reached. |
288 | 288 | ||
289 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 289 | #if defined(CPU_COLDFIRE) |
290 | extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); | 290 | extern void decorr_stereo_pass_cont_mcf5249 (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); |
291 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 291 | #elif defined(CPU_ARM) |
292 | extern void decorr_stereo_pass_cont_arm (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); | 292 | extern void decorr_stereo_pass_cont_arm (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); |
293 | extern void decorr_stereo_pass_cont_arml (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); | 293 | extern void decorr_stereo_pass_cont_arml (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count); |
294 | #else | 294 | #else |
@@ -351,9 +351,9 @@ int32_t unpack_samples (WavpackContext *wpc, int32_t *buffer, uint32_t sample_co | |||
351 | else | 351 | else |
352 | for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { | 352 | for (tcount = wps->num_terms, dpp = wps->decorr_passes; tcount--; dpp++) { |
353 | decorr_stereo_pass (dpp, buffer, 8); | 353 | decorr_stereo_pass (dpp, buffer, 8); |
354 | #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) | 354 | #if defined(CPU_COLDFIRE) |
355 | decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8); | 355 | decorr_stereo_pass_cont_mcf5249 (dpp, buffer + 16, sample_count - 8); |
356 | #elif defined(CPU_ARM) && !defined(SIMULATOR) | 356 | #elif defined(CPU_ARM) |
357 | if (((flags & MAG_MASK) >> MAG_LSB) > 15) | 357 | if (((flags & MAG_MASK) >> MAG_LSB) > 15) |
358 | decorr_stereo_pass_cont_arml (dpp, buffer + 16, sample_count - 8); | 358 | decorr_stereo_pass_cont_arml (dpp, buffer + 16, sample_count - 8); |
359 | else | 359 | else |
@@ -525,7 +525,7 @@ static void decorr_stereo_pass (struct decorr_pass *dpp, int32_t *buffer, int32_ | |||
525 | dpp->weight_B = weight_B; | 525 | dpp->weight_B = weight_B; |
526 | } | 526 | } |
527 | 527 | ||
528 | #if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) || defined(SIMULATOR) | 528 | #if (!defined(CPU_COLDFIRE) && !defined(CPU_ARM)) |
529 | 529 | ||
530 | static void decorr_stereo_pass_cont (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count) | 530 | static void decorr_stereo_pass_cont (struct decorr_pass *dpp, int32_t *buffer, int32_t sample_count) |
531 | { | 531 | { |