summaryrefslogtreecommitdiffstats
path: root/libvideoeditor/vss
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2012-01-04 20:06:05 +0000
committerSteve Block <steveblock@google.com>2012-01-04 20:06:05 +0000
commitec9e663f697df4254dacc79f52cdb633179c92ab (patch)
treeb5a80447fbe0093a1acac8c9a9357949b7958747 /libvideoeditor/vss
parent4ca06b0a9af472cfd13f52841fc9d2e5a6558674 (diff)
downloadframeworks_av-ec9e663f697df4254dacc79f52cdb633179c92ab.zip
frameworks_av-ec9e663f697df4254dacc79f52cdb633179c92ab.tar.gz
frameworks_av-ec9e663f697df4254dacc79f52cdb633179c92ab.tar.bz2
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: I261ad4d5348f4832488707edeb3cbdbb6dd12fca
Diffstat (limited to 'libvideoeditor/vss')
-rwxr-xr-xlibvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp2
-rwxr-xr-xlibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp4
-rwxr-xr-xlibvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
index 4a67fe2..95591e9 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorUtils.cpp
@@ -41,7 +41,7 @@
/* DEBUG LEVEL SETUP */
/*---------------------*/
#define LOG1 LOGE /*ERRORS Logging*/
-#define LOG2 LOGI /*WARNING Logging*/
+#define LOG2 ALOGI /*WARNING Logging*/
#define LOG3 //ALOGV /*COMMENTS Logging*/
namespace android {
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
index 39546db..6e2a90f 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoDecoder.cpp
@@ -1055,7 +1055,7 @@ M4OSA_ERR VideoEditorVideoDecoder_create(M4OSA_Context *pContext,
pDecShellContext->mI420ColorConverter = NULL;
}
- LOGI("decoder output format = 0x%X\n", decoderOutput);
+ ALOGI("decoder output format = 0x%X\n", decoderOutput);
// Configure the buffer pool from the metadata
err = VideoEditorVideoDecoder_configureFromMetadata(pDecShellContext,
@@ -1187,7 +1187,7 @@ M4OSA_ERR VideoEditorVideoSoftwareDecoder_create(M4OSA_Context *pContext,
status = pDecShellContext->mClient.connect();
VIDEOEDITOR_CHECK(OK == status, M4ERR_SF_DECODER_RSRC_FAIL);
- LOGI("Using software codecs only");
+ ALOGI("Using software codecs only");
// Create the decoder
pDecShellContext->mVideoDecoder = OMXCodec::Create(
pDecShellContext->mClient.interface(),
diff --git a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
index 1a942ba..5e37c1b 100755
--- a/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
+++ b/libvideoeditor/vss/stagefrightshells/src/VideoEditorVideoEncoder.cpp
@@ -653,7 +653,7 @@ M4OSA_ERR VideoEditorVideoEncoder_init(M4ENCODER_Format format,
pEncoderContext->mI420ColorConverter = NULL;
}
pEncoderContext->mEncoderColorFormat = (OMX_COLOR_FORMATTYPE)encoderInput;
- LOGI("encoder input format = 0x%X\n", encoderInput);
+ ALOGI("encoder input format = 0x%X\n", encoderInput);
*pContext = pEncoderContext;
@@ -857,11 +857,11 @@ M4OSA_ERR VideoEditorVideoEncoder_open(M4ENCODER_Context pContext,
case M4ENCODER_k30_FPS: iFrameRate = 30; break;
case M4ENCODER_kVARIABLE_FPS:
iFrameRate = 30;
- LOGI("Frame rate set to M4ENCODER_kVARIABLE_FPS: set to 30");
+ ALOGI("Frame rate set to M4ENCODER_kVARIABLE_FPS: set to 30");
break;
case M4ENCODER_kUSE_TIMESCALE:
iFrameRate = 30;
- LOGI("Frame rate set to M4ENCODER_kUSE_TIMESCALE: set to 30");
+ ALOGI("Frame rate set to M4ENCODER_kUSE_TIMESCALE: set to 30");
break;
default: