summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-12-20 16:23:08 +0000
committerSteve Block <steveblock@google.com>2012-01-03 22:38:27 +0000
commitb8a805261bf0282e992d3608035e47d05a898710 (patch)
tree7a43908b8e936ac1f30eef0542b40d667c47aa23 /media/libmedia
parent94023fa6744e24f26f0aba1699ec278649bd66df (diff)
downloadframeworks_av-b8a805261bf0282e992d3608035e47d05a898710.zip
frameworks_av-b8a805261bf0282e992d3608035e47d05a898710.tar.gz
frameworks_av-b8a805261bf0282e992d3608035e47d05a898710.tar.bz2
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
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/AudioSystem.cpp4
-rw-r--r--media/libmedia/MediaScanner.cpp4
-rw-r--r--media/libmedia/mediaplayer.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/media/libmedia/AudioSystem.cpp b/media/libmedia/AudioSystem.cpp
index b9a5bc5..61d0dad 100644
--- a/media/libmedia/AudioSystem.cpp
+++ b/media/libmedia/AudioSystem.cpp
@@ -190,7 +190,7 @@ static const float dBConvertInverse = 1.0f / dBConvert;
float AudioSystem::linearToLog(int volume)
{
// float v = volume ? exp(float(100 - volume) * dBConvert) : 0;
- // LOGD("linearToLog(%d)=%f", volume, v);
+ // ALOGD("linearToLog(%d)=%f", volume, v);
// return v;
return volume ? exp(float(100 - volume) * dBConvert) : 0;
}
@@ -198,7 +198,7 @@ float AudioSystem::linearToLog(int volume)
int AudioSystem::logToLinear(float volume)
{
// int v = volume ? 100 - int(dBConvertInverse * log(volume) + 0.5) : 0;
- // LOGD("logTolinear(%d)=%f", v, volume);
+ // ALOGD("logTolinear(%d)=%f", v, volume);
// return v;
return volume ? 100 - int(dBConvertInverse * log(volume) + 0.5) : 0;
}
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp
index b304f8c..cda185f 100644
--- a/media/libmedia/MediaScanner.cpp
+++ b/media/libmedia/MediaScanner.cpp
@@ -135,7 +135,7 @@ MediaScanResult MediaScanner::doProcessDirectory(
struct dirent* entry;
if (shouldSkipDirectory(path)) {
- LOGD("Skipping: %s", path);
+ ALOGD("Skipping: %s", path);
return MEDIA_SCAN_RESULT_OK;
}
@@ -199,7 +199,7 @@ MediaScanResult MediaScanner::doProcessDirectoryEntry(
type = DT_DIR;
}
} else {
- LOGD("stat() failed for %s: %s", path, strerror(errno) );
+ ALOGD("stat() failed for %s: %s", path, strerror(errno) );
}
}
if (type == DT_DIR) {
diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 5853144..695c4a8 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -201,7 +201,7 @@ status_t MediaPlayer::invoke(const Parcel& request, Parcel *reply)
status_t MediaPlayer::setMetadataFilter(const Parcel& filter)
{
- LOGD("setMetadataFilter");
+ ALOGD("setMetadataFilter");
Mutex::Autolock lock(mLock);
if (mPlayer == NULL) {
return NO_INIT;
@@ -211,7 +211,7 @@ status_t MediaPlayer::setMetadataFilter(const Parcel& filter)
status_t MediaPlayer::getMetadata(bool update_only, bool apply_filter, Parcel *metadata)
{
- LOGD("getMetadata");
+ ALOGD("getMetadata");
Mutex::Autolock lock(mLock);
if (mPlayer == NULL) {
return NO_INIT;