Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I52fbb5b2397d6819af66d324fe56c34ce249fe42
diff --git a/apps/CtsVerifier/lib/colorchecker/colorchecker.cpp b/apps/CtsVerifier/lib/colorchecker/colorchecker.cpp
index 1e0ae97..a7431f6 100644
--- a/apps/CtsVerifier/lib/colorchecker/colorchecker.cpp
+++ b/apps/CtsVerifier/lib/colorchecker/colorchecker.cpp
@@ -363,7 +363,7 @@
const int outScale = width / outTargetWidth;
const int outWidth = width / outScale;
const int outHeight = height / outScale;
- LOGV("Debug image dimensions: %d, %d", outWidth, outHeight);
+ ALOGV("Debug image dimensions: %d, %d", outWidth, outHeight);
unsigned char *output = new unsigned char[outWidth * outHeight * totalChannels];
@@ -441,21 +441,21 @@
// Find the bottom-left and top-right corners
if ( (bl = tl->getDNeighbor(3)) == NULL ||
(tr = tl->getRNeighbor(5)) == NULL ) continue;
- LOGV("Candidate at %d, %d", dex, dey);
- LOGV(" Got BL and TR");
+ ALOGV("Candidate at %d, %d", dex, dey);
+ ALOGV(" Got BL and TR");
// Find the bottom-right corner
if ( tr->getDNeighbor(3) == NULL ) {
- LOGV(" No BR from TR");
+ ALOGV(" No BR from TR");
continue;
}
br = tr->getDNeighbor(3);
if ( br != bl->getRNeighbor(5) ) {
- LOGV(" BR from TR and from BL don't agree");
+ ALOGV(" BR from TR and from BL don't agree");
continue;
}
br->getApproxCenter(&dex, &dey);
- LOGV(" Got BR corner at %d, %d", dex, dey);
+ ALOGV(" Got BR corner at %d, %d", dex, dey);
// Check that matching grid edge lengths are about the same
float gridTopWidth = tl->distanceTo(tr);
@@ -463,14 +463,14 @@
if (gridTopWidth / gridBotWidth < minAspectRatio ||
gridTopWidth / gridBotWidth > maxAspectRatio) continue;
- LOGV(" Got reasonable widths: %f %f", gridTopWidth, gridBotWidth);
+ ALOGV(" Got reasonable widths: %f %f", gridTopWidth, gridBotWidth);
float gridLeftWidth = tl->distanceTo(bl);
float gridRightWidth = tr->distanceTo(br);
if (gridLeftWidth / gridRightWidth < minAspectRatio ||
gridLeftWidth / gridRightWidth > maxAspectRatio) continue;
- LOGV(" Got reasonable heights: %f %f", gridLeftWidth, gridRightWidth);
+ ALOGV(" Got reasonable heights: %f %f", gridLeftWidth, gridRightWidth);
// Calculate average grid spacing
float gridAvgXGap = (gridTopWidth + gridBotWidth) / 2 / 5;
@@ -502,13 +502,13 @@
bestError > error) {
bestGrid = grid;
bestError = error;
- LOGV(" Best candidate, error %f", error);
+ ALOGV(" Best candidate, error %f", error);
}
}
// Check if a grid wasn't found
if (bestError == -1) {
- LOGV("No color checker found!");
+ ALOGV("No color checker found!");
}
// Make sure black square is in bottom-right corner
@@ -525,7 +525,7 @@
int brSum = brValues[0] + brValues[1] + brValues[2];
if (brSum > tlSum) {
// Grid is upside down, need to flip!
- LOGV("Flipping grid to put grayscale ramp at bottom");
+ ALOGV("Flipping grid to put grayscale ramp at bottom");
bestGrid = std::vector<int>(bestGrid.rbegin(), bestGrid.rend());
}
}
@@ -579,7 +579,7 @@
}
}
// Print out patch colors
- IF_LOGV() {
+ IF_ALOGV() {
for (int y = 0; y < 4; y++) {
char tmpMsg[256];
int cnt = 0;
@@ -595,7 +595,7 @@
"\t(xxx,xxx,xxx)");
}
}
- LOGV("%s", tmpMsg);
+ ALOGV("%s", tmpMsg);
}
}
}
@@ -705,7 +705,7 @@
}
int64_t endTime = systemTime();
- LOGV("Process time: %f ms",
+ ALOGV("Process time: %f ms",
(endTime - startTime) / 1000000.);
if (bestError == -1) return false;
diff --git a/tests/tests/nativemedia/src/SLObjectCreationTest.cpp b/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
index e63e42fa3..450b32e 100644
--- a/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
+++ b/tests/tests/nativemedia/src/SLObjectCreationTest.cpp
@@ -79,7 +79,7 @@
/* Test setup*/
virtual void SetUp() {
- LOGV("Test Setup()");
+ ALOGV("Test Setup()");
res = SL_RESULT_UNKNOWN_ERROR;
engineItf = NULL;
engineObj = NULL;
@@ -96,7 +96,7 @@
}
virtual void TearDown() {
- LOGV("Test TearDown()");
+ ALOGV("Test TearDown()");
if (audioPlayerObj) {
(*audioPlayerObj)->Destroy(audioPlayerObj);
audioPlayerObj = NULL;
@@ -306,60 +306,60 @@
//-------------------------------------------------------------------------------------------------
TEST_F(SLObjectCreationTest, testEngineCreation) {
- LOGV("Test Fixture: EngineCreation");
+ ALOGV("Test Fixture: EngineCreation");
// nothing to do here that isn't done in SetUp()
}
TEST_F(SLObjectCreationTest, testOutputMixCreation) {
- LOGV("Test Fixture: OutputMixCreation");
+ ALOGV("Test Fixture: OutputMixCreation");
OutputMixCreation();
}
TEST_F(SLObjectCreationTest, testAudioPlayerFromUriCreation) {
- LOGV("Test Fixture: AudioPlayerFromUriCreation");
+ ALOGV("Test Fixture: AudioPlayerFromUriCreation");
// required for AudioPlayer creation
OutputMixCreation();
AudioPlayerFromUriCreation();
}
TEST_F(SLObjectCreationTest, testAudioPlayerFromFdCreation) {
- LOGV("Test Fixture: AudioPlayerFromFdCreation");
+ ALOGV("Test Fixture: AudioPlayerFromFdCreation");
// required for AudioPlayer creation
OutputMixCreation();
AudioPlayerFromFdCreation();
}
TEST_F(SLObjectCreationTest, testAudioPlayerFromPcmBqCreation) {
- LOGV("Test Fixture: AudioPlayerFromPcmBqCreation");
+ ALOGV("Test Fixture: AudioPlayerFromPcmBqCreation");
// required for AudioPlayer creation
OutputMixCreation();
AudioPlayerFromPcmBqCreation();
}
TEST_F(SLObjectCreationTest, testAudioPlayerFromTsAbqCreation) {
- LOGV("Test Fixture: AudioPlayerFromTsAbqCreation");
+ ALOGV("Test Fixture: AudioPlayerFromTsAbqCreation");
// required for AudioPlayer creation
OutputMixCreation();
AudioPlayerFromTsAbqCreation();
}
TEST_F(SLObjectCreationTest, testAudioPlayerFromUriToPcmBqCreation) {
- LOGV("Test Fixture: AudioPlayerFromUriToPcmBqCreation");
+ ALOGV("Test Fixture: AudioPlayerFromUriToPcmBqCreation");
AudioPlayerFromUriToPcmBqCreation();
}
TEST_F(SLObjectCreationTest, testAudioPlayerFromFdToPcmBqCreation) {
- LOGV("Test Fixture: AudioPlayerFromFdToPcmBqCreation");
+ ALOGV("Test Fixture: AudioPlayerFromFdToPcmBqCreation");
AudioPlayerFromFdToPcmBqCreation();
}
TEST_F(SLObjectCreationTest, testAudioPlayerFromAdtsAbqToPcmBqCreation) {
- LOGV("Test Fixture: AudioPlayerFromAdtsAbqToPcmBqCreation");
+ ALOGV("Test Fixture: AudioPlayerFromAdtsAbqToPcmBqCreation");
AudioPlayerFromAdtsAbqToPcmBqCreation();
}
TEST_F(SLObjectCreationTest, testAudioRecorderCreation) {
- LOGV("Test Fixture: AudioRecorderCreation");
+ ALOGV("Test Fixture: AudioRecorderCreation");
AudioRecorderCreation();
}