From b8a805261bf0282e992d3608035e47d05a898710 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 20 Dec 2011 16:23:08 +0000 Subject: Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298 --- media/libstagefright/AwesomePlayer.cpp | 2 +- media/libstagefright/CameraSource.cpp | 6 +++--- media/libstagefright/CameraSourceTimeLapse.cpp | 2 +- media/libstagefright/MPEG4Writer.cpp | 14 +++++++------- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'media/libstagefright') diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 964cb1f..6fb16f5 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -2256,7 +2256,7 @@ status_t AwesomePlayer::setParameter(int key, const Parcel &request) { status_t AwesomePlayer::setCacheStatCollectFreq(const Parcel &request) { if (mCachedSource != NULL) { int32_t freqMs = request.readInt32(); - LOGD("Request to keep cache stats in the past %d ms", + ALOGD("Request to keep cache stats in the past %d ms", freqMs); return mCachedSource->setCacheStatCollectFreq(freqMs); } diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 927e122..080faa6 100755 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -254,7 +254,7 @@ static void getSupportedVideoSizes( *isSetVideoSizeSupported = true; params.getSupportedVideoSizes(sizes); if (sizes.size() == 0) { - LOGD("Camera does not support setVideoSize()"); + ALOGD("Camera does not support setVideoSize()"); params.getSupportedPreviewSizes(sizes); *isSetVideoSizeSupported = false; } @@ -633,7 +633,7 @@ void CameraSource::releaseCamera() { } status_t CameraSource::stop() { - LOGD("stop: E"); + ALOGD("stop: E"); Mutex::Autolock autoLock(mLock); mStarted = false; mFrameAvailableCondition.signal(); @@ -670,7 +670,7 @@ status_t CameraSource::stop() { } CHECK_EQ(mNumFramesReceived, mNumFramesEncoded + mNumFramesDropped); - LOGD("stop: X"); + ALOGD("stop: X"); return OK; } diff --git a/media/libstagefright/CameraSourceTimeLapse.cpp b/media/libstagefright/CameraSourceTimeLapse.cpp index 4f6c8d1..22c3182 100644 --- a/media/libstagefright/CameraSourceTimeLapse.cpp +++ b/media/libstagefright/CameraSourceTimeLapse.cpp @@ -69,7 +69,7 @@ CameraSourceTimeLapse::CameraSourceTimeLapse( mSkipCurrentFrame(false) { mTimeBetweenFrameCaptureUs = timeBetweenFrameCaptureUs; - LOGD("starting time lapse mode: %lld us", + ALOGD("starting time lapse mode: %lld us", mTimeBetweenFrameCaptureUs); mVideoWidth = videoSize.width; diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index dfee281..a368e0a 100755 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -539,7 +539,7 @@ status_t MPEG4Writer::pause() { } void MPEG4Writer::stopWriterThread() { - LOGD("Stopping writer thread"); + ALOGD("Stopping writer thread"); if (!mWriterThreadStarted) { return; } @@ -554,7 +554,7 @@ void MPEG4Writer::stopWriterThread() { void *dummy; pthread_join(mThread, &dummy); mWriterThreadStarted = false; - LOGD("Writer thread stopped"); + ALOGD("Writer thread stopped"); } /* @@ -650,7 +650,7 @@ status_t MPEG4Writer::stop() { } if (mTracks.size() > 1) { - LOGD("Duration from tracks range is [%lld, %lld] us", + ALOGD("Duration from tracks range is [%lld, %lld] us", minDurationUs, maxDurationUs); } @@ -1338,7 +1338,7 @@ void MPEG4Writer::writeAllChunks() { sendSessionSummary(); mChunkInfos.clear(); - LOGD("%d chunks are written in the last batch", outstandingChunks); + ALOGD("%d chunks are written in the last batch", outstandingChunks); } bool MPEG4Writer::findChunkToWrite(Chunk *chunk) { @@ -1523,7 +1523,7 @@ status_t MPEG4Writer::Track::pause() { } status_t MPEG4Writer::Track::stop() { - LOGD("Stopping %s track", mIsAudio? "Audio": "Video"); + ALOGD("Stopping %s track", mIsAudio? "Audio": "Video"); if (!mStarted) { LOGE("Stop() called but track is not started"); return ERROR_END_OF_STREAM; @@ -1539,7 +1539,7 @@ status_t MPEG4Writer::Track::stop() { status_t err = (status_t) dummy; - LOGD("Stopping %s track source", mIsAudio? "Audio": "Video"); + ALOGD("Stopping %s track source", mIsAudio? "Audio": "Video"); { status_t status = mSource->stop(); if (err == OK && status != OK && status != ERROR_END_OF_STREAM) { @@ -1547,7 +1547,7 @@ status_t MPEG4Writer::Track::stop() { } } - LOGD("%s track stopped", mIsAudio? "Audio": "Video"); + ALOGD("%s track stopped", mIsAudio? "Audio": "Video"); return err; } -- cgit v1.1