summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoshe Piekarski <dev.rockbox@melachim.net>2020-06-25 09:45:54 -0400
committerFranklin Wei <franklin@rockbox.org>2020-06-28 03:24:20 +0000
commit3e7ab2a284510c4101aff881e4c00096d1f53af0 (patch)
tree52e057f29a8651a90bd0bf1895a17fe7135e7014
parent2e0a5969b62f93251c7b9673ae0a2f43545f2f0c (diff)
downloadrockbox-3e7ab2a284510c4101aff881e4c00096d1f53af0.tar.gz
rockbox-3e7ab2a284510c4101aff881e4c00096d1f53af0.zip
Fix logf build warnings in speex codec
Change-Id: I8ce9473c98f863cc53273c16b2e55321d7b0795a
-rw-r--r--lib/rbcodec/codecs/speex.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/rbcodec/codecs/speex.c b/lib/rbcodec/codecs/speex.c
index 659694fa2a..4d14e83760 100644
--- a/lib/rbcodec/codecs/speex.c
+++ b/lib/rbcodec/codecs/speex.c
@@ -117,7 +117,7 @@ static spx_int64_t seek_backwards(spx_ogg_sync_state *oy, spx_ogg_page *og,
117 begin = 0; 117 begin = 0;
118 time++; 118 time++;
119 } else { 119 } else {
120 LOGF("Can't seek that early:%lld\n",begin); 120 LOGF("Can't seek that early:%lld\n", (long long int)begin);
121 return -3; /* too early */ 121 return -3; /* too early */
122 } 122 }
123 } 123 }
@@ -157,7 +157,8 @@ static spx_int64_t seek_backwards(spx_ogg_sync_state *oy, spx_ogg_page *og,
157 } else if (lastgranule > wantedpos) { /*too late, seek more*/ 157 } else if (lastgranule > wantedpos) { /*too late, seek more*/
158 if (offset != -1) { 158 if (offset != -1) {
159 LOGF("Toolate, returnanyway:%lld,%lld,%lld,%lld\n", 159 LOGF("Toolate, returnanyway:%lld,%lld,%lld,%lld\n",
160 ret,lastgranule,wantedpos,avgpagelen); 160 (long long int)ret, (long long int)lastgranule,
161 (long long int)wantedpos, (long long int)avgpagelen);
161 return ret; 162 return ret;
162 } 163 }
163 break; 164 break;
@@ -222,8 +223,8 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos,
222 223
223 if (offset < 0) { /* could not find new page,use old offset */ 224 if (offset < 0) { /* could not find new page,use old offset */
224 LOGF("Seek/guess/fault:%lld->-<-%d,%lld:%lld,%d,%ld,%d\n", 225 LOGF("Seek/guess/fault:%lld->-<-%d,%lld:%lld,%d,%ld,%d\n",
225 curpos,0,pos,offset,0, 226 (long long int)curpos,0, (long long int)pos,
226 ci->curpos,/*stream_length*/0); 227 (long long int)offset,0,ci->curpos,/*stream_length*/0);
227 228
228 curoffset = *curbyteoffset; 229 curoffset = *curbyteoffset;
229 230
@@ -233,8 +234,8 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos,
233 } else { 234 } else {
234 if (spx_ogg_page_granulepos(&og) == 0 && pos > 5000) { 235 if (spx_ogg_page_granulepos(&og) == 0 && pos > 5000) {
235 LOGF("SEEK/guess/fault:%lld->-<-%lld,%lld:%lld,%d,%ld,%d\n", 236 LOGF("SEEK/guess/fault:%lld->-<-%lld,%lld:%lld,%d,%ld,%d\n",
236 curpos,spx_ogg_page_granulepos(&og),pos, 237 (long long int)curpos,(long long int)spx_ogg_page_granulepos(&og),
237 offset,0,ci->curpos,/*stream_length*/0); 238 (long long int)pos, (long long int)offset,0,ci->curpos,/*stream_length*/0);
238 239
239 curoffset = *curbyteoffset; 240 curoffset = *curbyteoffset;
240 241
@@ -287,7 +288,7 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos,
287 288
288 spx_ogg_sync_reset(oy); 289 spx_ogg_sync_reset(oy);
289 290
290 LOGF("Seek failed:%lld\n", offset); 291 LOGF("Seek failed:%lld\n", (long long int)offset);
291 292
292 return -1; 293 return -1;
293} 294}
@@ -447,10 +448,10 @@ enum codec_status codec_run(void)
447 if (action == CODEC_ACTION_SEEK_TIME) { 448 if (action == CODEC_ACTION_SEEK_TIME) {
448 if(samplerate!=0&&packet_count>1){ 449 if(samplerate!=0&&packet_count>1){
449 LOGF("Speex seek page:%lld,%lld,%ld,%lld,%d\n", 450 LOGF("Speex seek page:%lld,%lld,%ld,%lld,%d\n",
450 ((spx_int64_t)param/1000) * 451 (long long int)((spx_int64_t)param/1000) *
451 (spx_int64_t)samplerate, 452 (spx_int64_t)samplerate,
452 page_granule, (long)param, 453 (long long int)page_granule, (long)param,
453 (page_granule/samplerate)*1000, samplerate); 454 (long long int)((page_granule/samplerate)*1000), samplerate);
454 455
455 speex_seek_page_granule(((spx_int64_t)param/1000) * 456 speex_seek_page_granule(((spx_int64_t)param/1000) *
456 (spx_int64_t)samplerate, 457 (spx_int64_t)samplerate,