summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorChong Zhang <chz@google.com>2015-04-24 17:22:36 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-24 17:22:36 +0000
commitbb6635d0aa35d6d31ec7de7c0d957720983fdc55 (patch)
treeb4e21defce1e51deb55186c9747ccf49786edb7b /media/libmediaplayerservice
parenta739165147bd58f7396d605fed1dfa8b68aaf6a8 (diff)
parent5abbd3dcbb0bb32a3d4b90dddbcf90458967eb6f (diff)
downloadframeworks_av-bb6635d0aa35d6d31ec7de7c0d957720983fdc55.zip
frameworks_av-bb6635d0aa35d6d31ec7de7c0d957720983fdc55.tar.gz
frameworks_av-bb6635d0aa35d6d31ec7de7c0d957720983fdc55.tar.bz2
Merge "HLS: make disconnect faster to prevent ANR"
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index 65e80c3..acc9ef5 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -658,7 +658,7 @@ status_t NuPlayer::Decoder::fetchInputData(sp<AMessage> &reply) {
#if 0
int64_t mediaTimeUs;
CHECK(accessUnit->meta()->findInt64("timeUs", &mediaTimeUs));
- ALOGV("[%s] feeding input buffer at media time %" PRId64,
+ ALOGV("[%s] feeding input buffer at media time %.3f",
mIsAudio ? "audio" : "video",
mediaTimeUs / 1E6);
#endif