summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2010-07-25 22:24:53 +0000
committerNils Wallménius <nils@rockbox.org>2010-07-25 22:24:53 +0000
commit6325ef978b2c26445721cae14028c3d429b63b3e (patch)
treed923bd73712cafde272573c26a6820c7c7aa3dab /apps
parentd92f8174a1f838684645267e87b3afebfc48143f (diff)
downloadrockbox-6325ef978b2c26445721cae14028c3d429b63b3e.tar.gz
rockbox-6325ef978b2c26445721cae14028c3d429b63b3e.zip
codecs: mark some local variables with 'static'
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27566 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/codecs/a52.c4
-rw-r--r--apps/codecs/a52_rm.c8
-rw-r--r--apps/codecs/aac.c4
-rw-r--r--apps/codecs/adx.c2
-rw-r--r--apps/codecs/alac.c2
-rw-r--r--apps/codecs/atrac3_oma.c2
-rw-r--r--apps/codecs/atrac3_rm.c6
-rw-r--r--apps/codecs/cook.c8
-rw-r--r--apps/codecs/flac.c8
-rw-r--r--apps/codecs/mpa.c26
-rw-r--r--apps/codecs/mpc.c2
-rw-r--r--apps/codecs/raac.c8
-rw-r--r--apps/codecs/shorten.c10
-rw-r--r--apps/codecs/speex.c2
-rw-r--r--apps/codecs/wmapro.c2
15 files changed, 47 insertions, 47 deletions
diff --git a/apps/codecs/a52.c b/apps/codecs/a52.c
index 360a5862d7..d399e91627 100644
--- a/apps/codecs/a52.c
+++ b/apps/codecs/a52.c
@@ -31,8 +31,8 @@ CODEC_HEADER
31#define A52_SAMPLESPERFRAME (6*256) 31#define A52_SAMPLESPERFRAME (6*256)
32 32
33static a52_state_t *state; 33static a52_state_t *state;
34unsigned long samplesdone; 34static unsigned long samplesdone;
35unsigned long frequency; 35static unsigned long frequency;
36 36
37/* used outside liba52 */ 37/* used outside liba52 */
38static uint8_t buf[3840] IBSS_ATTR; 38static uint8_t buf[3840] IBSS_ATTR;
diff --git a/apps/codecs/a52_rm.c b/apps/codecs/a52_rm.c
index 822d717a81..bc6c129ad2 100644
--- a/apps/codecs/a52_rm.c
+++ b/apps/codecs/a52_rm.c
@@ -32,10 +32,10 @@ CODEC_HEADER
32#define A52_SAMPLESPERFRAME (6*256) 32#define A52_SAMPLESPERFRAME (6*256)
33 33
34static a52_state_t *state; 34static a52_state_t *state;
35unsigned long samplesdone; 35static unsigned long samplesdone;
36unsigned long frequency; 36static unsigned long frequency;
37RMContext rmctx; 37static RMContext rmctx;
38RMPacket pkt; 38static RMPacket pkt;
39 39
40static void init_rm(RMContext *rmctx) 40static void init_rm(RMContext *rmctx)
41{ 41{
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index 4bc6ffb2f9..1796133e53 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -30,8 +30,8 @@ CODEC_HEADER
30/* Global buffers to be used in the mdct synthesis. This way the arrays can 30/* Global buffers to be used in the mdct synthesis. This way the arrays can
31 * be moved to IRAM for some targets */ 31 * be moved to IRAM for some targets */
32#define GB_BUF_SIZE 1024 32#define GB_BUF_SIZE 1024
33ALIGN real_t gb_time_buffer[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM; 33static ALIGN real_t gb_time_buffer[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM;
34ALIGN real_t gb_fb_intermed[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM; 34static ALIGN real_t gb_fb_intermed[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM;
35 35
36/* this is the codec entry point */ 36/* this is the codec entry point */
37enum codec_status codec_main(void) 37enum codec_status codec_main(void)
diff --git a/apps/codecs/adx.c b/apps/codecs/adx.c
index dd5bba16e7..2ef2091a66 100644
--- a/apps/codecs/adx.c
+++ b/apps/codecs/adx.c
@@ -40,7 +40,7 @@ CODEC_HEADER
40 * Others can be set, but the default is nearly always used, 40 * Others can be set, but the default is nearly always used,
41 * and there is no way to determine if another was used, anyway. 41 * and there is no way to determine if another was used, anyway.
42 */ 42 */
43const long cutoff = 500; 43static const long cutoff = 500;
44 44
45static int16_t samples[WAV_CHUNK_SIZE] IBSS_ATTR; 45static int16_t samples[WAV_CHUNK_SIZE] IBSS_ATTR;
46 46
diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c
index 0ac6b1ec80..ebcc657ed7 100644
--- a/apps/codecs/alac.c
+++ b/apps/codecs/alac.c
@@ -25,7 +25,7 @@
25 25
26CODEC_HEADER 26CODEC_HEADER
27 27
28int32_t outputbuffer[ALAC_MAX_CHANNELS][ALAC_BLOCKSIZE] IBSS_ATTR; 28static int32_t outputbuffer[ALAC_MAX_CHANNELS][ALAC_BLOCKSIZE] IBSS_ATTR;
29 29
30/* this is the codec entry point */ 30/* this is the codec entry point */
31enum codec_status codec_main(void) 31enum codec_status codec_main(void)
diff --git a/apps/codecs/atrac3_oma.c b/apps/codecs/atrac3_oma.c
index 00a0ec001e..2085466ed5 100644
--- a/apps/codecs/atrac3_oma.c
+++ b/apps/codecs/atrac3_oma.c
@@ -31,7 +31,7 @@ CODEC_HEADER
31#define FRAMESIZE ci->id3->bytesperframe 31#define FRAMESIZE ci->id3->bytesperframe
32#define BITRATE ci->id3->bitrate 32#define BITRATE ci->id3->bitrate
33 33
34ATRAC3Context q IBSS_ATTR; 34static ATRAC3Context q IBSS_ATTR;
35 35
36/* this is the codec entry point */ 36/* this is the codec entry point */
37enum codec_status codec_main(void) 37enum codec_status codec_main(void)
diff --git a/apps/codecs/atrac3_rm.c b/apps/codecs/atrac3_rm.c
index a0b0fd8b4b..6c559ec868 100644
--- a/apps/codecs/atrac3_rm.c
+++ b/apps/codecs/atrac3_rm.c
@@ -28,9 +28,9 @@
28 28
29CODEC_HEADER 29CODEC_HEADER
30 30
31RMContext rmctx; 31static RMContext rmctx;
32RMPacket pkt; 32static RMPacket pkt;
33ATRAC3Context q IBSS_ATTR; 33static ATRAC3Context q IBSS_ATTR;
34 34
35static void init_rm(RMContext *rmctx) 35static void init_rm(RMContext *rmctx)
36{ 36{
diff --git a/apps/codecs/cook.c b/apps/codecs/cook.c
index 30255d4fd7..7e77c33e1d 100644
--- a/apps/codecs/cook.c
+++ b/apps/codecs/cook.c
@@ -28,10 +28,10 @@
28 28
29CODEC_HEADER 29CODEC_HEADER
30 30
31RMContext rmctx; 31static RMContext rmctx;
32RMPacket pkt; 32static RMPacket pkt;
33COOKContext q IBSS_ATTR; 33static COOKContext q IBSS_ATTR;
34int32_t rm_outbuf[2048]; 34static int32_t rm_outbuf[2048];
35 35
36static void init_rm(RMContext *rmctx) 36static void init_rm(RMContext *rmctx)
37{ 37{
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c
index 14ddd3cb05..c23611a50b 100644
--- a/apps/codecs/flac.c
+++ b/apps/codecs/flac.c
@@ -25,8 +25,8 @@
25CODEC_HEADER 25CODEC_HEADER
26 26
27/* The output buffers containing the decoded samples (channels 0 and 1) */ 27/* The output buffers containing the decoded samples (channels 0 and 1) */
28int32_t decoded0[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_DECODED0; 28static int32_t decoded0[MAX_BLOCKSIZE] IBSS_ATTR_FLAC_DECODED0;
29int32_t decoded1[MAX_BLOCKSIZE] IBSS_ATTR; 29static int32_t decoded1[MAX_BLOCKSIZE] IBSS_ATTR;
30 30
31#define MAX_SUPPORTED_SEEKTABLE_SIZE 5000 31#define MAX_SUPPORTED_SEEKTABLE_SIZE 5000
32 32
@@ -65,8 +65,8 @@ struct FLACseekpoints {
65 uint16_t blocksize; 65 uint16_t blocksize;
66}; 66};
67 67
68struct FLACseekpoints seekpoints[MAX_SUPPORTED_SEEKTABLE_SIZE]; 68static struct FLACseekpoints seekpoints[MAX_SUPPORTED_SEEKTABLE_SIZE];
69int nseekpoints; 69static int nseekpoints;
70 70
71static int8_t *bit_buffer; 71static int8_t *bit_buffer;
72static size_t buff_size; 72static size_t buff_size;
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c
index 3140091434..c0e0f38c64 100644
--- a/apps/codecs/mpa.c
+++ b/apps/codecs/mpa.c
@@ -29,32 +29,32 @@ CODEC_HEADER
29#define MPA_SYNTH_ON_COP 29#define MPA_SYNTH_ON_COP
30#endif 30#endif
31 31
32struct mad_stream stream IBSS_ATTR; 32static struct mad_stream stream IBSS_ATTR;
33struct mad_frame frame IBSS_ATTR; 33static struct mad_frame frame IBSS_ATTR;
34struct mad_synth synth IBSS_ATTR; 34static struct mad_synth synth IBSS_ATTR;
35 35
36#ifdef MPA_SYNTH_ON_COP 36#ifdef MPA_SYNTH_ON_COP
37volatile short die IBSS_ATTR = 0; /*thread should die*/ 37static volatile short die IBSS_ATTR = 0; /*thread should die*/
38 38
39#if (CONFIG_CPU == PP5024) || (CONFIG_CPU == PP5022) 39#if (CONFIG_CPU == PP5024) || (CONFIG_CPU == PP5022)
40mad_fixed_t sbsample_prev[2][36][32] IBSS_ATTR; 40static mad_fixed_t sbsample_prev[2][36][32] IBSS_ATTR;
41#else 41#else
42mad_fixed_t sbsample_prev[2][36][32] SHAREDBSS_ATTR; 42static mad_fixed_t sbsample_prev[2][36][32] SHAREDBSS_ATTR;
43#endif 43#endif
44 44
45struct semaphore synth_done_sem IBSS_ATTR; 45static struct semaphore synth_done_sem IBSS_ATTR;
46struct semaphore synth_pending_sem IBSS_ATTR; 46static struct semaphore synth_pending_sem IBSS_ATTR;
47#endif 47#endif
48 48
49#define INPUT_CHUNK_SIZE 8192 49#define INPUT_CHUNK_SIZE 8192
50 50
51mad_fixed_t mad_frame_overlap[2][32][18] IBSS_ATTR; 51static mad_fixed_t mad_frame_overlap[2][32][18] IBSS_ATTR;
52mad_fixed_t sbsample[2][36][32] IBSS_ATTR; 52static mad_fixed_t sbsample[2][36][32] IBSS_ATTR;
53 53
54unsigned char mad_main_data[MAD_BUFFER_MDLEN] IBSS_ATTR; 54static unsigned char mad_main_data[MAD_BUFFER_MDLEN] IBSS_ATTR;
55/* TODO: what latency does layer 1 have? */ 55/* TODO: what latency does layer 1 have? */
56int mpeg_latency[3] = { 0, 481, 529 }; 56static int mpeg_latency[3] = { 0, 481, 529 };
57int mpeg_framesize[3] = {384, 1152, 1152}; 57static int mpeg_framesize[3] = {384, 1152, 1152};
58 58
59static void init_mad(void) 59static void init_mad(void)
60{ 60{
diff --git a/apps/codecs/mpc.c b/apps/codecs/mpc.c
index 036864c832..1d83449838 100644
--- a/apps/codecs/mpc.c
+++ b/apps/codecs/mpc.c
@@ -25,7 +25,7 @@
25 25
26CODEC_HEADER 26CODEC_HEADER
27 27
28MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH] IBSS_ATTR; 28static MPC_SAMPLE_FORMAT sample_buffer[MPC_DECODER_BUFFER_LENGTH] IBSS_ATTR;
29 29
30/* Our implementations of the mpc_reader callback functions. */ 30/* Our implementations of the mpc_reader callback functions. */
31static mpc_int32_t read_impl(mpc_reader *reader, void *ptr, mpc_int32_t size) 31static mpc_int32_t read_impl(mpc_reader *reader, void *ptr, mpc_int32_t size)
diff --git a/apps/codecs/raac.c b/apps/codecs/raac.c
index 93972f557b..3fcdca24c9 100644
--- a/apps/codecs/raac.c
+++ b/apps/codecs/raac.c
@@ -31,8 +31,8 @@ CODEC_HEADER
31/* Global buffers to be used in the mdct synthesis. This way the arrays can 31/* Global buffers to be used in the mdct synthesis. This way the arrays can
32 * be moved to IRAM for some targets */ 32 * be moved to IRAM for some targets */
33#define GB_BUF_SIZE 1024 33#define GB_BUF_SIZE 1024
34ALIGN real_t gb_time_buffer[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM; 34static ALIGN real_t gb_time_buffer[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM;
35ALIGN real_t gb_fb_intermed[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM; 35static ALIGN real_t gb_fb_intermed[2][GB_BUF_SIZE] IBSS_ATTR_FAAD_LARGE_IRAM;
36 36
37 37
38static void init_rm(RMContext *rmctx) 38static void init_rm(RMContext *rmctx)
@@ -40,8 +40,8 @@ static void init_rm(RMContext *rmctx)
40 memcpy(rmctx, (void*)(( (intptr_t)ci->id3->id3v2buf + 3 ) &~ 3), sizeof(RMContext)); 40 memcpy(rmctx, (void*)(( (intptr_t)ci->id3->id3v2buf + 3 ) &~ 3), sizeof(RMContext));
41} 41}
42 42
43RMContext rmctx; 43static RMContext rmctx;
44RMPacket pkt; 44static RMPacket pkt;
45/* this is the codec entry point */ 45/* this is the codec entry point */
46enum codec_status codec_main(void) 46enum codec_status codec_main(void)
47{ 47{
diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c
index ddc2f9a786..7595ca30c7 100644
--- a/apps/codecs/shorten.c
+++ b/apps/codecs/shorten.c
@@ -28,13 +28,13 @@ CODEC_HEADER
28#define IBSS_ATTR_SHORTEN_DECODED0 IBSS_ATTR 28#define IBSS_ATTR_SHORTEN_DECODED0 IBSS_ATTR
29#endif 29#endif
30 30
31int32_t decoded0[MAX_DECODE_SIZE] IBSS_ATTR_SHORTEN_DECODED0; 31static int32_t decoded0[MAX_DECODE_SIZE] IBSS_ATTR_SHORTEN_DECODED0;
32int32_t decoded1[MAX_DECODE_SIZE] IBSS_ATTR; 32static int32_t decoded1[MAX_DECODE_SIZE] IBSS_ATTR;
33 33
34int32_t offset0[MAX_OFFSET_SIZE] IBSS_ATTR; 34static int32_t offset0[MAX_OFFSET_SIZE] IBSS_ATTR;
35int32_t offset1[MAX_OFFSET_SIZE] IBSS_ATTR; 35static int32_t offset1[MAX_OFFSET_SIZE] IBSS_ATTR;
36 36
37int8_t ibuf[MAX_BUFFER_SIZE] IBSS_ATTR; 37static int8_t ibuf[MAX_BUFFER_SIZE] IBSS_ATTR;
38 38
39/* this is the codec entry point */ 39/* this is the codec entry point */
40enum codec_status codec_main(void) 40enum codec_status codec_main(void)
diff --git a/apps/codecs/speex.c b/apps/codecs/speex.c
index 52f4239652..2a02ccb4b5 100644
--- a/apps/codecs/speex.c
+++ b/apps/codecs/speex.c
@@ -35,7 +35,7 @@
35 35
36CODEC_HEADER 36CODEC_HEADER
37 37
38spx_int16_t output[MAX_FRAME_SIZE] IBSS_ATTR; 38static spx_int16_t output[MAX_FRAME_SIZE] IBSS_ATTR;
39 39
40static int get_more_data(spx_ogg_sync_state *oy) 40static int get_more_data(spx_ogg_sync_state *oy)
41{ 41{
diff --git a/apps/codecs/wmapro.c b/apps/codecs/wmapro.c
index e929c1f428..62759d0d1d 100644
--- a/apps/codecs/wmapro.c
+++ b/apps/codecs/wmapro.c
@@ -28,7 +28,7 @@ CODEC_HEADER
28#define MAXSAMPLES (1L << 12) /* Max number of samples in a wma pro subframe */ 28#define MAXSAMPLES (1L << 12) /* Max number of samples in a wma pro subframe */
29#define MAXCHANNELS 8 29#define MAXCHANNELS 8
30#define BUFSIZE MAXCHANNELS * MAXSAMPLES 30#define BUFSIZE MAXCHANNELS * MAXSAMPLES
31int32_t decoded[BUFSIZE]; 31static int32_t decoded[BUFSIZE];
32 32
33/* this is the codec entry point */ 33/* this is the codec entry point */
34enum codec_status codec_main(void) 34enum codec_status codec_main(void)