devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Code cleaning - remove some unnecessary defined(SIMULATOR) checks

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13369 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dave Chapman 2007-05-10 13:16:08 +00:00
parent 1fc2d91a83
commit f02cba8096
30 changed files with 59 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

10
apps/codecs/libffmpegFLAC/decoder.c
View file

@ -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,

6
apps/codecs/libffmpegFLAC/shndec.c
View file

@ -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