summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2010-08-29 16:46:03 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2010-08-29 16:46:03 +0000
commit5be1c3352116978fb69fe02c33599cb78686796f (patch)
tree00ab1b5b64bff1d458089bb0e03123b34cbf9088
parentd4567b64bae0df28d2ab667c7f8b3cd2d9432227 (diff)
downloadrockbox-5be1c3352116978fb69fe02c33599cb78686796f.tar.gz
rockbox-5be1c3352116978fb69fe02c33599cb78686796f.zip
Fix red.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27940 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/aac.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index 55254f41d8..dbc4782505 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -72,7 +72,7 @@ next_track:
72 /* Clean and initialize decoder structures */ 72 /* Clean and initialize decoder structures */
73 memset(&demux_res , 0, sizeof(demux_res)); 73 memset(&demux_res , 0, sizeof(demux_res));
74 if (codec_init()) { 74 if (codec_init()) {
75 printf("FAAD: Codec init error\n"); 75 LOGF("FAAD: Codec init error\n");
76 err = CODEC_ERROR; 76 err = CODEC_ERROR;
77 goto exit; 77 goto exit;
78 } 78 }
@@ -90,7 +90,7 @@ next_track:
90 /* if qtmovie_read returns successfully, the stream is up to 90 /* if qtmovie_read returns successfully, the stream is up to
91 * the movie data, which can be used directly by the decoder */ 91 * the movie data, which can be used directly by the decoder */
92 if (!qtmovie_read(&input_stream, &demux_res)) { 92 if (!qtmovie_read(&input_stream, &demux_res)) {
93 printf("FAAD: File init error\n"); 93 LOGF("FAAD: File init error\n");
94 err = CODEC_ERROR; 94 err = CODEC_ERROR;
95 goto done; 95 goto done;
96 } 96 }
@@ -99,7 +99,7 @@ next_track:
99 decoder = NeAACDecOpen(); 99 decoder = NeAACDecOpen();
100 100
101 if (!decoder) { 101 if (!decoder) {
102 printf("FAAD: Decode open error\n"); 102 LOGF("FAAD: Decode open error\n");
103 err = CODEC_ERROR; 103 err = CODEC_ERROR;
104 goto done; 104 goto done;
105 } 105 }
@@ -110,7 +110,7 @@ next_track:
110 110
111 err = NeAACDecInit2(decoder, demux_res.codecdata, demux_res.codecdata_len, &s, &c); 111 err = NeAACDecInit2(decoder, demux_res.codecdata, demux_res.codecdata_len, &s, &c);
112 if (err) { 112 if (err) {
113 printf("FAAD: DecInit: %d, %d\n", err, decoder->object_type); 113 LOGF("FAAD: DecInit: %d, %d\n", err, decoder->object_type);
114 err = CODEC_ERROR; 114 err = CODEC_ERROR;
115 goto done; 115 goto done;
116 } 116 }
@@ -191,7 +191,7 @@ next_track:
191 /* Lookup the length (in samples and bytes) of block i */ 191 /* Lookup the length (in samples and bytes) of block i */
192 if (!get_sample_info(&demux_res, i, &sample_duration, 192 if (!get_sample_info(&demux_res, i, &sample_duration,
193 &sample_byte_size)) { 193 &sample_byte_size)) {
194 printf("AAC: get_sample_info error\n"); 194 LOGF("AAC: get_sample_info error\n");
195 err = CODEC_ERROR; 195 err = CODEC_ERROR;
196 goto done; 196 goto done;
197 } 197 }
@@ -210,7 +210,7 @@ next_track:
210 } 210 }
211 else if (file_offset == 0) 211 else if (file_offset == 0)
212 { 212 {
213 printf("AAC: get_sample_offset error\n"); 213 LOGF("AAC: get_sample_offset error\n");
214 err = CODEC_ERROR; 214 err = CODEC_ERROR;
215 goto done; 215 goto done;
216 } 216 }
@@ -223,7 +223,7 @@ next_track:
223 223
224 /* NeAACDecDecode may sometimes return NULL without setting error. */ 224 /* NeAACDecDecode may sometimes return NULL without setting error. */
225 if (ret == NULL || frame_info.error > 0) { 225 if (ret == NULL || frame_info.error > 0) {
226 printf("FAAD: decode error '%s'\n", NeAACDecGetErrorMessage(frame_info.error)); 226 LOGF("FAAD: decode error '%s'\n", NeAACDecGetErrorMessage(frame_info.error));
227 err = CODEC_ERROR; 227 err = CODEC_ERROR;
228 goto done; 228 goto done;
229 } 229 }
@@ -284,7 +284,7 @@ next_track:
284 err = CODEC_OK; 284 err = CODEC_OK;
285 285
286done: 286done:
287 printf("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done); 287 LOGF("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done);
288 288
289 if (ci->request_next_track()) 289 if (ci->request_next_track())
290 goto next_track; 290 goto next_track;