From df64d15042bbd5e0e4933ac49bf3c177dd94752c Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 4 Jan 2012 20:05:49 +0000 Subject: Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea --- media/libstagefright/AwesomePlayer.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'media/libstagefright/AwesomePlayer.cpp') diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 6fb16f5..6fce890 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -280,9 +280,9 @@ status_t AwesomePlayer::setDataSource_l( } if (!(mFlags & INCOGNITO)) { - LOGI("setDataSource_l('%s')", mUri.string()); + ALOGI("setDataSource_l('%s')", mUri.string()); } else { - LOGI("setDataSource_l(URL suppressed)"); + ALOGI("setDataSource_l(URL suppressed)"); } // The actual work will be done during preparation in the call to @@ -483,7 +483,7 @@ void AwesomePlayer::reset_l() { if (mFlags & PREPARING) { modifyFlags(PREPARE_CANCELLED, SET); if (mConnectingDataSource != NULL) { - LOGI("interrupting the connection process"); + ALOGI("interrupting the connection process"); mConnectingDataSource->disconnect(); } @@ -686,7 +686,7 @@ void AwesomePlayer::onBufferingUpdate() { if ((mFlags & PLAYING) && !eos && (cachedDataRemaining < kLowWaterMarkBytes)) { - LOGI("cache is running low (< %d) , pausing.", + ALOGI("cache is running low (< %d) , pausing.", kLowWaterMarkBytes); modifyFlags(CACHE_UNDERRUN, SET); pause_l(); @@ -695,7 +695,7 @@ void AwesomePlayer::onBufferingUpdate() { notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_START); } else if (eos || cachedDataRemaining > kHighWaterMarkBytes) { if (mFlags & CACHE_UNDERRUN) { - LOGI("cache has filled up (> %d), resuming.", + ALOGI("cache has filled up (> %d), resuming.", kHighWaterMarkBytes); modifyFlags(CACHE_UNDERRUN, CLEAR); play_l(); @@ -742,7 +742,7 @@ void AwesomePlayer::onBufferingUpdate() { if ((mFlags & PLAYING) && !eos && (cachedDurationUs < kLowWaterMarkUs)) { - LOGI("cache is running low (%.2f secs) , pausing.", + ALOGI("cache is running low (%.2f secs) , pausing.", cachedDurationUs / 1E6); modifyFlags(CACHE_UNDERRUN, SET); pause_l(); @@ -751,7 +751,7 @@ void AwesomePlayer::onBufferingUpdate() { notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_START); } else if (eos || cachedDurationUs > kHighWaterMarkUs) { if (mFlags & CACHE_UNDERRUN) { - LOGI("cache has filled up (%.2f secs), resuming.", + ALOGI("cache has filled up (%.2f secs), resuming.", cachedDurationUs / 1E6); modifyFlags(CACHE_UNDERRUN, CLEAR); play_l(); @@ -1667,7 +1667,7 @@ void AwesomePlayer::onVideoEvent() { if (mSeeking == SEEK_VIDEO_ONLY) { if (mSeekTimeUs > timeUs) { - LOGI("XXX mSeekTimeUs = %lld us, timeUs = %lld us", + ALOGI("XXX mSeekTimeUs = %lld us, timeUs = %lld us", mSeekTimeUs, timeUs); } } @@ -1715,7 +1715,7 @@ void AwesomePlayer::onVideoEvent() { int64_t latenessUs = nowUs - timeUs; if (latenessUs > 0) { - LOGI("after SEEK_VIDEO_ONLY we're late by %.2f secs", latenessUs / 1E6); + ALOGI("after SEEK_VIDEO_ONLY we're late by %.2f secs", latenessUs / 1E6); } } @@ -1730,7 +1730,7 @@ void AwesomePlayer::onVideoEvent() { && mAudioPlayer != NULL && mAudioPlayer->getMediaTimeMapping( &realTimeUs, &mediaTimeUs)) { - LOGI("we're much too late (%.2f secs), video skipping ahead", + ALOGI("we're much too late (%.2f secs), video skipping ahead", latenessUs / 1E6); mVideoBuffer->release(); @@ -1975,7 +1975,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { if (err != OK) { mConnectingDataSource.clear(); - LOGI("mConnectingDataSource->connect() returned %d", err); + ALOGI("mConnectingDataSource->connect() returned %d", err); return err; } @@ -2073,7 +2073,7 @@ status_t AwesomePlayer::finishSetDataSource_l() { } if (mFlags & PREPARE_CANCELLED) { - LOGI("Prepare cancelled while waiting for initial cache fill."); + ALOGI("Prepare cancelled while waiting for initial cache fill."); return UNKNOWN_ERROR; } } @@ -2155,7 +2155,7 @@ void AwesomePlayer::onPrepareAsyncEvent() { Mutex::Autolock autoLock(mLock); if (mFlags & PREPARE_CANCELLED) { - LOGI("prepare was cancelled before doing anything"); + ALOGI("prepare was cancelled before doing anything"); abortPrepare(UNKNOWN_ERROR); return; } -- cgit v1.1