From 3e7ab2a284510c4101aff881e4c00096d1f53af0 Mon Sep 17 00:00:00 2001 From: Moshe Piekarski Date: Thu, 25 Jun 2020 09:45:54 -0400 Subject: Fix logf build warnings in speex codec Change-Id: I8ce9473c98f863cc53273c16b2e55321d7b0795a --- lib/rbcodec/codecs/speex.c | 21 +++++++++++---------- 1 file 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, begin = 0; time++; } else { - LOGF("Can't seek that early:%lld\n",begin); + LOGF("Can't seek that early:%lld\n", (long long int)begin); return -3; /* too early */ } } @@ -157,7 +157,8 @@ static spx_int64_t seek_backwards(spx_ogg_sync_state *oy, spx_ogg_page *og, } else if (lastgranule > wantedpos) { /*too late, seek more*/ if (offset != -1) { LOGF("Toolate, returnanyway:%lld,%lld,%lld,%lld\n", - ret,lastgranule,wantedpos,avgpagelen); + (long long int)ret, (long long int)lastgranule, + (long long int)wantedpos, (long long int)avgpagelen); return ret; } break; @@ -222,8 +223,8 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos, if (offset < 0) { /* could not find new page,use old offset */ LOGF("Seek/guess/fault:%lld->-<-%d,%lld:%lld,%d,%ld,%d\n", - curpos,0,pos,offset,0, - ci->curpos,/*stream_length*/0); + (long long int)curpos,0, (long long int)pos, + (long long int)offset,0,ci->curpos,/*stream_length*/0); curoffset = *curbyteoffset; @@ -233,8 +234,8 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos, } else { if (spx_ogg_page_granulepos(&og) == 0 && pos > 5000) { LOGF("SEEK/guess/fault:%lld->-<-%lld,%lld:%lld,%d,%ld,%d\n", - curpos,spx_ogg_page_granulepos(&og),pos, - offset,0,ci->curpos,/*stream_length*/0); + (long long int)curpos,(long long int)spx_ogg_page_granulepos(&og), + (long long int)pos, (long long int)offset,0,ci->curpos,/*stream_length*/0); curoffset = *curbyteoffset; @@ -287,7 +288,7 @@ static int speex_seek_page_granule(spx_int64_t pos, spx_int64_t curpos, spx_ogg_sync_reset(oy); - LOGF("Seek failed:%lld\n", offset); + LOGF("Seek failed:%lld\n", (long long int)offset); return -1; } @@ -447,10 +448,10 @@ enum codec_status codec_run(void) if (action == CODEC_ACTION_SEEK_TIME) { if(samplerate!=0&&packet_count>1){ LOGF("Speex seek page:%lld,%lld,%ld,%lld,%d\n", - ((spx_int64_t)param/1000) * + (long long int)((spx_int64_t)param/1000) * (spx_int64_t)samplerate, - page_granule, (long)param, - (page_granule/samplerate)*1000, samplerate); + (long long int)page_granule, (long)param, + (long long int)((page_granule/samplerate)*1000), samplerate); speex_seek_page_granule(((spx_int64_t)param/1000) * (spx_int64_t)samplerate, -- cgit v1.2.3