summaryrefslogtreecommitdiff
path: root/apps/codecs
diff options
context:
space:
mode:
Diffstat (limited to 'apps/codecs')
-rw-r--r--apps/codecs/a52.c1
-rw-r--r--apps/codecs/aac.c1
-rw-r--r--apps/codecs/adx.c1
-rw-r--r--apps/codecs/aiff.c1
-rw-r--r--apps/codecs/alac.c1
-rw-r--r--apps/codecs/ape.c1
-rw-r--r--apps/codecs/flac.c1
-rw-r--r--apps/codecs/mpa.c1
-rw-r--r--apps/codecs/mpc.c5
-rw-r--r--apps/codecs/shorten.c1
-rw-r--r--apps/codecs/sid.c1
-rw-r--r--apps/codecs/vorbis.c5
-rw-r--r--apps/codecs/wav.c1
-rw-r--r--apps/codecs/wavpack.c1
-rw-r--r--apps/codecs/wma.c1
15 files changed, 0 insertions, 23 deletions
diff --git a/apps/codecs/a52.c b/apps/codecs/a52.c
index b2229d4c49..6cdddb5213 100644
--- a/apps/codecs/a52.c
+++ b/apps/codecs/a52.c
@@ -124,7 +124,6 @@ enum codec_status codec_main(void)
124 /* Generic codec initialisation */ 124 /* Generic codec initialisation */
125 ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); 125 ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
126 ci->configure(DSP_SET_SAMPLE_DEPTH, 28); 126 ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
127 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*128);
128 127
129next_track: 128next_track:
130 if (codec_init()) { 129 if (codec_init()) {
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index d4f051c09c..d3422ea447 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -53,7 +53,6 @@ enum codec_status codec_main(void)
53 unsigned char c = 0; 53 unsigned char c = 0;
54 54
55 /* Generic codec initialisation */ 55 /* Generic codec initialisation */
56 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*16);
57 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 56 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
58 57
59 ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); 58 ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
diff --git a/apps/codecs/adx.c b/apps/codecs/adx.c
index bf339675c7..715df579d7 100644
--- a/apps/codecs/adx.c
+++ b/apps/codecs/adx.c
@@ -55,7 +55,6 @@ enum codec_status codec_main(void)
55 /* Generic codec initialisation */ 55 /* Generic codec initialisation */
56 /* we only render 16 bits */ 56 /* we only render 16 bits */
57 ci->configure(DSP_SET_SAMPLE_DEPTH, 16); 57 ci->configure(DSP_SET_SAMPLE_DEPTH, 16);
58 /*ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*256);*/
59 58
60next_track: 59next_track:
61 DEBUGF("ADX: next_track\n"); 60 DEBUGF("ADX: next_track\n");
diff --git a/apps/codecs/aiff.c b/apps/codecs/aiff.c
index d663b4b367..93a7c39489 100644
--- a/apps/codecs/aiff.c
+++ b/apps/codecs/aiff.c
@@ -65,7 +65,6 @@ enum codec_status codec_main(void)
65 /* Generic codec initialisation */ 65 /* Generic codec initialisation */
66 ci->configure(DSP_SET_SAMPLE_DEPTH, 28); 66 ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
67 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 67 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
68 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*256);
69 68
70next_track: 69next_track:
71 if (codec_init()) { 70 if (codec_init()) {
diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c
index bedd2dd581..9abbfe8ede 100644
--- a/apps/codecs/alac.c
+++ b/apps/codecs/alac.c
@@ -43,7 +43,6 @@ enum codec_status codec_main(void)
43 43
44 /* Generic codec initialisation */ 44 /* Generic codec initialisation */
45 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 45 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
46 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*128);
47 46
48 ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); 47 ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
49 ci->configure(DSP_SET_SAMPLE_DEPTH, ALAC_OUTPUT_DEPTH-1); 48 ci->configure(DSP_SET_SAMPLE_DEPTH, ALAC_OUTPUT_DEPTH-1);
diff --git a/apps/codecs/ape.c b/apps/codecs/ape.c
index 0506c0ca49..6679a1a307 100644
--- a/apps/codecs/ape.c
+++ b/apps/codecs/ape.c
@@ -147,7 +147,6 @@ enum codec_status codec_main(void)
147 147
148 /* Generic codec initialisation */ 148 /* Generic codec initialisation */
149 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 149 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
150 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*128);
151 150
152 ci->configure(DSP_SET_SAMPLE_DEPTH, APE_OUTPUT_DEPTH-1); 151 ci->configure(DSP_SET_SAMPLE_DEPTH, APE_OUTPUT_DEPTH-1);
153 152
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c
index d1c52833a6..3566725772 100644
--- a/apps/codecs/flac.c
+++ b/apps/codecs/flac.c
@@ -422,7 +422,6 @@ enum codec_status codec_main(void)
422 422
423 /* Generic codec initialisation */ 423 /* Generic codec initialisation */
424 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 424 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
425 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*128);
426 425
427 ci->configure(DSP_SET_SAMPLE_DEPTH, FLAC_OUTPUT_DEPTH-1); 426 ci->configure(DSP_SET_SAMPLE_DEPTH, FLAC_OUTPUT_DEPTH-1);
428 427
diff --git a/apps/codecs/mpa.c b/apps/codecs/mpa.c
index 113c81b2a0..e9667973f7 100644
--- a/apps/codecs/mpa.c
+++ b/apps/codecs/mpa.c
@@ -79,7 +79,6 @@ enum codec_status codec_main(void)
79 /* Create a decoder instance */ 79 /* Create a decoder instance */
80 80
81 ci->configure(DSP_SET_SAMPLE_DEPTH, MAD_F_FRACBITS); 81 ci->configure(DSP_SET_SAMPLE_DEPTH, MAD_F_FRACBITS);
82 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*16);
83 82
84next_track: 83next_track:
85 status = CODEC_OK; 84 status = CODEC_OK;
diff --git a/apps/codecs/mpc.c b/apps/codecs/mpc.c
index 4db8a186a2..207a09445f 100644
--- a/apps/codecs/mpc.c
+++ b/apps/codecs/mpc.c
@@ -78,7 +78,6 @@ enum codec_status codec_main(void)
78 int retval = CODEC_OK; 78 int retval = CODEC_OK;
79 79
80 ci->configure(DSP_SET_SAMPLE_DEPTH, 28); 80 ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
81 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*16);
82 81
83 /* Create a decoder instance */ 82 /* Create a decoder instance */
84 reader.read = read_impl; 83 reader.read = read_impl;
@@ -133,14 +132,12 @@ next_track:
133 /* Resume to saved sample offset. */ 132 /* Resume to saved sample offset. */
134 if(samplesdone > 0) { 133 if(samplesdone > 0) {
135 /* hack to improve seek time if filebuf goes empty */ 134 /* hack to improve seek time if filebuf goes empty */
136 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*512);
137 if (mpc_decoder_seek_sample(&decoder, samplesdone)) { 135 if (mpc_decoder_seek_sample(&decoder, samplesdone)) {
138 ci->set_elapsed(samplesdone/frequency); 136 ci->set_elapsed(samplesdone/frequency);
139 } else { 137 } else {
140 samplesdone = 0; 138 samplesdone = 0;
141 } 139 }
142 /* reset chunksize */ 140 /* reset chunksize */
143 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*16);
144 } 141 }
145 142
146 /* This is the decoding loop. */ 143 /* This is the decoding loop. */
@@ -149,7 +146,6 @@ next_track:
149 /* Complete seek handler. */ 146 /* Complete seek handler. */
150 if (ci->seek_time) { 147 if (ci->seek_time) {
151 /* hack to improve seek time if filebuf goes empty */ 148 /* hack to improve seek time if filebuf goes empty */
152 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*512);
153 mpc_int64_t new_offset = (ci->seek_time - 1)*frequency; 149 mpc_int64_t new_offset = (ci->seek_time - 1)*frequency;
154 if (mpc_decoder_seek_sample(&decoder, new_offset)) { 150 if (mpc_decoder_seek_sample(&decoder, new_offset)) {
155 samplesdone = new_offset; 151 samplesdone = new_offset;
@@ -157,7 +153,6 @@ next_track:
157 } 153 }
158 ci->seek_complete(); 154 ci->seek_complete();
159 /* reset chunksize */ 155 /* reset chunksize */
160 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*16);
161 156
162 } 157 }
163 #else 158 #else
diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c
index fdc8142041..82345e0af7 100644
--- a/apps/codecs/shorten.c
+++ b/apps/codecs/shorten.c
@@ -46,7 +46,6 @@ enum codec_status codec_main(void)
46 46
47 /* Generic codec initialisation */ 47 /* Generic codec initialisation */
48 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 48 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
49 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*128);
50 49
51 ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); 50 ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED);
52 ci->configure(DSP_SET_SAMPLE_DEPTH, SHN_OUTPUT_DEPTH-1); 51 ci->configure(DSP_SET_SAMPLE_DEPTH, SHN_OUTPUT_DEPTH-1);
diff --git a/apps/codecs/sid.c b/apps/codecs/sid.c
index c6d3c43170..bb43aef680 100644
--- a/apps/codecs/sid.c
+++ b/apps/codecs/sid.c
@@ -1215,7 +1215,6 @@ enum codec_status codec_main(void)
1215 1215
1216 /* Generic codec initialisation */ 1216 /* Generic codec initialisation */
1217 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 1217 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
1218 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*256);
1219 1218
1220next_track: 1219next_track:
1221 if (codec_init()) { 1220 if (codec_init()) {
diff --git a/apps/codecs/vorbis.c b/apps/codecs/vorbis.c
index 2ea0f74645..2f7a4f4f72 100644
--- a/apps/codecs/vorbis.c
+++ b/apps/codecs/vorbis.c
@@ -117,11 +117,6 @@ enum codec_status codec_main(void)
117 * they should be set differently based on quality setting 117 * they should be set differently based on quality setting
118 */ 118 */
119 119
120 /* The chunk size below is magic. If set any lower, resume
121 * doesn't work properly (ov_raw_seek() does the wrong thing).
122 */
123 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*256);
124
125/* We need to flush reserver memory every track load. */ 120/* We need to flush reserver memory every track load. */
126next_track: 121next_track:
127 if (codec_init()) { 122 if (codec_init()) {
diff --git a/apps/codecs/wav.c b/apps/codecs/wav.c
index ae29bdedc7..504292a8b3 100644
--- a/apps/codecs/wav.c
+++ b/apps/codecs/wav.c
@@ -227,7 +227,6 @@ enum codec_status codec_main(void)
227 /* Generic codec initialisation */ 227 /* Generic codec initialisation */
228 ci->configure(DSP_SET_SAMPLE_DEPTH, 28); 228 ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
229 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 229 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
230 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*256);
231 230
232next_track: 231next_track:
233 if (codec_init()) { 232 if (codec_init()) {
diff --git a/apps/codecs/wavpack.c b/apps/codecs/wavpack.c
index 1485eedf8b..87581db4e6 100644
--- a/apps/codecs/wavpack.c
+++ b/apps/codecs/wavpack.c
@@ -43,7 +43,6 @@ enum codec_status codec_main(void)
43 43
44 /* Generic codec initialisation */ 44 /* Generic codec initialisation */
45 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 45 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
46 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*128);
47 46
48 ci->configure(DSP_SET_SAMPLE_DEPTH, 28); 47 ci->configure(DSP_SET_SAMPLE_DEPTH, 28);
49 48
diff --git a/apps/codecs/wma.c b/apps/codecs/wma.c
index c29386482c..958cf1525b 100644
--- a/apps/codecs/wma.c
+++ b/apps/codecs/wma.c
@@ -317,7 +317,6 @@ enum codec_status codec_main(void)
317 317
318 /* Generic codec initialisation */ 318 /* Generic codec initialisation */
319 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512); 319 ci->configure(CODEC_SET_FILEBUF_WATERMARK, 1024*512);
320 ci->configure(CODEC_SET_FILEBUF_CHUNKSIZE, 1024*128);
321 320
322 ci->configure(DSP_SET_SAMPLE_DEPTH, 30); 321 ci->configure(DSP_SET_SAMPLE_DEPTH, 30);
323 322