diff options
| author | Chong Zhang <chz@google.com> | 2015-03-17 14:51:06 -0700 |
|---|---|---|
| committer | Chong Zhang <chz@google.com> | 2015-03-17 21:52:50 +0000 |
| commit | 4604458dfe57b0e91a464aefafea50ae7b9876c1 (patch) | |
| tree | d4ef0b05bf84cd2cbb95deb62ebf972393d04b43 /media/libstagefright/httplive | |
| parent | 17c9985894e6b8f148245bd3c72fec33e09c2c6a (diff) | |
| download | frameworks_av-4604458dfe57b0e91a464aefafea50ae7b9876c1.zip frameworks_av-4604458dfe57b0e91a464aefafea50ae7b9876c1.tar.gz frameworks_av-4604458dfe57b0e91a464aefafea50ae7b9876c1.tar.bz2 | |
Fix 64-bit build break caused by print type
Change-Id: I2239d875420f6926918c1a0dcab31b71c8329d1f
Diffstat (limited to 'media/libstagefright/httplive')
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 6 | ||||
| -rw-r--r-- | media/libstagefright/httplive/PlaylistFetcher.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index 183e06a..a94754b 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -1305,7 +1305,7 @@ void LiveSession::onChangeConfiguration2(const sp<AMessage> &msg) { if ((mStreamMask & streamMask & indexToType(i)) && !mStreams[i].mUri.empty() && !(URIs[i] == mStreams[i].mUri)) { - ALOGV("stream %d changed: oldURI %s, newURI %s", i, + ALOGV("stream %zu changed: oldURI %s, newURI %s", i, mStreams[i].mUri.c_str(), URIs[i].c_str()); sp<AnotherPacketSource> source = mPacketSources.valueFor(indexToType(i)); source->queueDiscontinuity( @@ -1477,7 +1477,7 @@ void LiveSession::onChangeConfiguration3(const sp<AMessage> &msg) { break; } - ALOGV("stream[%d]: queue format change", j); + ALOGV("stream[%zu]: queue format change", j); sources[j]->queueDiscontinuity( ATSParser::DISCONTINUITY_FORMATCHANGE, NULL, true); @@ -1682,7 +1682,7 @@ bool LiveSession::checkBuffering(bool &low, bool &mid, bool &high) { ++activeCount; int64_t bufferedDurationUs = mPacketSources[i]->getEstimatedDurationUs(); - ALOGV("source[%d]: buffered %lld us", i, bufferedDurationUs); + ALOGV("source[%zu]: buffered %lld us", i, (long long)bufferedDurationUs); if (bufferedDurationUs < kLowWaterMark) { ++lowCount; break; diff --git a/media/libstagefright/httplive/PlaylistFetcher.h b/media/libstagefright/httplive/PlaylistFetcher.h index 6b1296f..b82e50d 100644 --- a/media/libstagefright/httplive/PlaylistFetcher.h +++ b/media/libstagefright/httplive/PlaylistFetcher.h @@ -116,7 +116,7 @@ private: // adapting or switching tracks. int64_t mSegmentStartTimeUs; - ssize_t mDiscontinuitySeq; + int32_t mDiscontinuitySeq; bool mStartTimeUsRelative; sp<AMessage> mStopParams; // message containing the latest timestamps we should fetch. |