diff options
| author | Dave Chapman <dave@dchapman.com> | 2007-05-10 13:16:08 +0000 |
|---|---|---|
| committer | Dave Chapman <dave@dchapman.com> | 2007-05-10 13:16:08 +0000 |
| commit | f02cba80967b7e42d03962625394bf5d1691a59c (patch) | |
| tree | ab752be0024ec544500eaf6fcba4207848c9a89e /apps/codecs/libffmpegFLAC | |
| parent | 1fc2d91a83f6154c11a203c8da993d647799691a (diff) | |
| download | rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.zip rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.tar.gz rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.tar.bz2 rockbox-f02cba80967b7e42d03962625394bf5d1691a59c.tar.xz | |
Code cleaning - remove some unnecessary defined(SIMULATOR) checks
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13369 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libffmpegFLAC')
| -rw-r--r-- | apps/codecs/libffmpegFLAC/decoder.c | 10 | ||||
| -rw-r--r-- | apps/codecs/libffmpegFLAC/shndec.c | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/apps/codecs/libffmpegFLAC/decoder.c index 8a1f84c..88fcbfd 100644 --- a/apps/codecs/libffmpegFLAC/decoder.c +++ b/apps/codecs/libffmpegFLAC/decoder.c @@ -42,9 +42,9 @@ #include "decoder.h" -#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) #include "coldfire.h" -#elif defined(CPU_ARM) && !defined(SIMULATOR) +#elif defined(CPU_ARM) #include "arm.h" #endif @@ -260,11 +260,11 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) return -8; if ((s->bps + coeff_prec + av_log2(pred_order)) <= 32) { - #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) (void)sum; lpc_decode_emac(s->blocksize - pred_order, qlevel, pred_order, decoded + pred_order, coeffs); - #elif defined(CPU_ARM) && !defined(SIMULATOR) + #elif defined(CPU_ARM) (void)sum; lpc_decode_arm(s->blocksize - pred_order, qlevel, pred_order, decoded + pred_order, coeffs); @@ -278,7 +278,7 @@ static int decode_subframe_lpc(FLACContext *s, int32_t* decoded, int pred_order) } #endif } else { - #if defined(CPU_COLDFIRE) && !defined(SIMULATOR) + #if defined(CPU_COLDFIRE) (void)wsum; (void)j; lpc_decode_emac_wide(s->blocksize - pred_order, qlevel, pred_order, diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/apps/codecs/libffmpegFLAC/shndec.c index 61b3703..1afcff6 100644 --- a/apps/codecs/libffmpegFLAC/shndec.c +++ b/apps/codecs/libffmpegFLAC/shndec.c @@ -82,7 +82,7 @@ static unsigned int get_uint(ShortenContext *s, int k) return get_ur_golomb_shorten(&s->gb, k); } -#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) static void coldfire_lshift_samples(int n, int shift, int32_t *samples) ICODE_ATTR_FLAC; static void coldfire_lshift_samples(int n, int shift, int32_t *samples) { @@ -132,7 +132,7 @@ static inline void fix_bitshift(ShortenContext *s, int32_t *samples) /* Wrapped samples don't get bitshifted, so we'll do them during the next iteration. */ if (s->bitshift != 0) { -#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) coldfire_lshift_samples(s->blocksize, s->bitshift, samples - s->nwrap); #else for (i = -s->nwrap; i < (s->blocksize - s->nwrap); i++) @@ -349,7 +349,7 @@ int shorten_decode_frames(ShortenContext *s, int *nsamples, /* Scale the samples for the pcmbuf */ int scale = SHN_OUTPUT_DEPTH - s->bits_per_sample; -#if defined(CPU_COLDFIRE) && !defined(SIMULATOR) +#if defined(CPU_COLDFIRE) coldfire_lshift_samples(*nsamples, scale, decoded0 + s->nwrap); coldfire_lshift_samples(*nsamples, scale, decoded1 + s->nwrap); #else |