diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2014-06-18 16:32:00 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2014-06-20 12:43:37 -0700 |
| commit | 0f6a0435713c435e1aaeacbfd9ce7abb6a5b19a9 (patch) | |
| tree | fc94098dd19cc6b1959df58ff4e8a7384d4d96d0 /media/libnbaio | |
| parent | 77342f72fdf96603938a95fcbb9888ec90e71e68 (diff) | |
| download | frameworks_av-0f6a0435713c435e1aaeacbfd9ce7abb6a5b19a9.zip frameworks_av-0f6a0435713c435e1aaeacbfd9ce7abb6a5b19a9.tar.gz frameworks_av-0f6a0435713c435e1aaeacbfd9ce7abb6a5b19a9.tar.bz2 | |
libnbaio: 64-bit compile warnings
Change-Id: I9517c32193031dcc7af7b2104e985d66805b84aa
Diffstat (limited to 'media/libnbaio')
| -rw-r--r-- | media/libnbaio/MonoPipe.cpp | 6 | ||||
| -rw-r--r-- | media/libnbaio/NBAIO.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/media/libnbaio/MonoPipe.cpp b/media/libnbaio/MonoPipe.cpp index 4adf018..0b65861 100644 --- a/media/libnbaio/MonoPipe.cpp +++ b/media/libnbaio/MonoPipe.cpp @@ -14,6 +14,8 @@ * limitations under the License. */ +#include <inttypes.h> + #define LOG_TAG "MonoPipe" //#define LOG_NDEBUG 0 @@ -87,7 +89,7 @@ MonoPipe::MonoPipe(size_t reqFrames, const NBAIO_Format& format, bool writeCanBl static const uint64_t kUnsignedHiBitsMask = ~(0xFFFFFFFFull); if ((N & kSignedHiBitsMask) || (D & kUnsignedHiBitsMask)) { ALOGE("Cannot reduce sample rate to local clock frequency ratio to fit" - " in a 32/32 bit rational. (max reduction is 0x%016llx/0x%016llx" + " in a 32/32 bit rational. (max reduction is 0x%016" PRIx64 "/0x%016" PRIx64 "). getNextWriteTimestamp calls will be non-functional", N, D); return; } @@ -308,7 +310,7 @@ int64_t MonoPipe::offsetTimestampByAudioFrames(int64_t ts, size_t audFrames) // error, but then zero out the ratio in the linear transform so // that we don't try to do any conversions from now on. This // MonoPipe's getNextWriteTimestamp is now broken for good. - ALOGE("Overflow when attempting to convert %d audio frames to" + ALOGE("Overflow when attempting to convert %zu audio frames to" " duration in local time. getNextWriteTimestamp will fail from" " now on.", audFrames); mSamplesToLocalTime.a_to_b_numer = 0; diff --git a/media/libnbaio/NBAIO.cpp b/media/libnbaio/NBAIO.cpp index ff3284c..d641e74 100644 --- a/media/libnbaio/NBAIO.cpp +++ b/media/libnbaio/NBAIO.cpp @@ -137,7 +137,7 @@ ssize_t NBAIO_Source::readVia(readVia_t via, size_t total, void *user, ssize_t NBAIO_Port::negotiate(const NBAIO_Format offers[], size_t numOffers, NBAIO_Format counterOffers[], size_t& numCounterOffers) { - ALOGV("negotiate offers=%p numOffers=%u countersOffers=%p numCounterOffers=%u", + ALOGV("negotiate offers=%p numOffers=%zu countersOffers=%p numCounterOffers=%zu", offers, numOffers, counterOffers, numCounterOffers); if (Format_isValid(mFormat)) { for (size_t i = 0; i < numOffers; ++i) { |