From 9cf2492407af6fae5928685205e7fc17032ac253 Mon Sep 17 00:00:00 2001 From: Moshe Piekarski Date: Tue, 30 Jun 2020 04:54:05 -0400 Subject: Fix logf warnings in more codecs Change-Id: I7e83a9979aedadf3b7c2b162a8202efdc6227e88 --- lib/rbcodec/codecs/aac_bsf.c | 2 +- lib/rbcodec/codecs/opus.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/rbcodec/codecs/aac_bsf.c b/lib/rbcodec/codecs/aac_bsf.c index 3bce283958..14d4baa028 100644 --- a/lib/rbcodec/codecs/aac_bsf.c +++ b/lib/rbcodec/codecs/aac_bsf.c @@ -91,7 +91,7 @@ enum codec_status codec_run(void) buffer=ci->request_buffer(&n, FAAD_BYTE_BUFFER_SIZE); bread = NeAACDecInit(decoder, buffer, n, &s, &c); if (bread < 0) { - LOGF("FAAD: DecInit: %ld, %d\n", bread, decoder->object_type); + LOGF("FAAD: DecInit: %ld, %d\n", (long int)bread, decoder->object_type); return CODEC_ERROR; } ci->advance_buffer(bread); diff --git a/lib/rbcodec/codecs/opus.c b/lib/rbcodec/codecs/opus.c index c34c0b885b..6f4a5644fb 100644 --- a/lib/rbcodec/codecs/opus.c +++ b/lib/rbcodec/codecs/opus.c @@ -166,7 +166,7 @@ static int64_t seek_backwards(ogg_sync_state *oy, 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 */ } } @@ -206,7 +206,8 @@ static int64_t seek_backwards(ogg_sync_state *oy, 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; @@ -340,7 +341,7 @@ static int opus_seek_page_granule(int64_t pos, int64_t curpos, ogg_sync_reset(oy); - LOGF("Seek failed:%lld\n", offset); + LOGF("Seek failed:%lld\n", (long long int)offset); return -1; } @@ -410,8 +411,8 @@ enum codec_status codec_run(void) skip = MIN(seek_target, SEEK_REWIND); seek_target -= skip; - LOGF("Opus seek page:%lld,%lld,%ld\n", - seek_target, page_granule, (long)param); + LOGF("Opus seek page:%lld,%lld,%ld\n", (long long int)seek_target, + (long long int)page_granule, (long)param); opus_seek_page_granule(seek_target, page_granule, &oy, &os); /* reset the state to help ensure that subsequent packets won't use state set by unrelated packets processed before seek */ -- cgit v1.2.3