am 298eac15: Merge "AArch64: Minor changes related to 64-bit platform"

* commit '298eac1548462c05e9c417abb0e401d805700e82':
  AArch64: Minor changes related to 64-bit platform

3 files changed, 4 insertions, 3 deletions

diff --git a/src/android/AacBqToPcmCbRenderer.cpp b/src/android/AacBqToPcmCbRenderer.cpp
index 194662b..77786fc 100644
--- a/src/android/AacBqToPcmCbRenderer.cpp
+++ b/src/android/AacBqToPcmCbRenderer.cpp
@@ -61,7 +61,7 @@ static size_t getAdtsFrameSize(const uint8_t *data, off64_t offset, size_t size)
     static const size_t kAdtsHeaderLengthWithCrc = 9;
     size_t headSize = protectionAbsent ? kAdtsHeaderLengthNoCrc : kAdtsHeaderLengthWithCrc;
     if (headSize > frameSize) {
-        SL_LOGE("AacBqToPcmCbRenderer::getAdtsFrameSize() returns 0 (frameSize %u < headSize %u)",
+        SL_LOGE("AacBqToPcmCbRenderer::getAdtsFrameSize() returns 0 (frameSize %zu < headSize %zu)",
                 frameSize, headSize);
         return 0;
     }
diff --git a/src/android/android_GenericPlayer.cpp b/src/android/android_GenericPlayer.cpp
index e87f9a8..dca8c2b 100644
--- a/src/android/android_GenericPlayer.cpp
+++ b/src/android/android_GenericPlayer.cpp
@@ -20,6 +20,7 @@
 
 #include <media/stagefright/foundation/ADebug.h>
 #include <sys/stat.h>
+#include <inttypes.h>
 
 namespace android {
 
@@ -167,7 +168,7 @@ void GenericPlayer::stop() {
 void GenericPlayer::seek(int64_t timeMsec) {
     SL_LOGV("GenericPlayer::seek %lld", timeMsec);
     if (timeMsec < 0 && timeMsec != ANDROID_UNKNOWN_TIME) {
-        SL_LOGE("GenericPlayer::seek error, can't seek to negative time %lldms", timeMsec);
+        SL_LOGE("GenericPlayer::seek error, can't seek to negative time %" PRId64 "ms", timeMsec);
         return;
     }
     sp<AMessage> msg = new AMessage(kWhatSeek, id());
diff --git a/src/android/util/AacAdtsExtractor.cpp b/src/android/util/AacAdtsExtractor.cpp
index 4a175bf..e615f79 100644
--- a/src/android/util/AacAdtsExtractor.cpp
+++ b/src/android/util/AacAdtsExtractor.cpp
@@ -79,7 +79,7 @@ static size_t getFrameSize(const sp<DataSource> &source, off64_t offset) {
     static const size_t kAdtsHeaderLengthWithCrc = 9;
     size_t headSize = protectionAbsent ? kAdtsHeaderLengthNoCrc : kAdtsHeaderLengthWithCrc;
     if (headSize > frameSize) {
-        SL_LOGE("AacAdtsExtractor:: getFrameSize() returns 0 (frameSize %u < headSize %u)",
+        SL_LOGE("AacAdtsExtractor:: getFrameSize() returns 0 (frameSize %zu < headSize %zu)",
                 frameSize, headSize);
         return 0;
     }