Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I366680b6e614b8983d1def28cc2fdbfa98f39531
diff --git a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
index 89a0450..0812ec3 100755
--- a/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
+++ b/libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp
@@ -37,7 +37,7 @@
PreviewPlayerBase *observer)
: AudioPlayerBase(audioSink, observer) {
- LOGV("VideoEditorAudioPlayer");
+ ALOGV("VideoEditorAudioPlayer");
mBGAudioPCMFileHandle = NULL;
mAudioProcess = NULL;
mBGAudioPCMFileLength = 0;
@@ -54,7 +54,7 @@
VideoEditorAudioPlayer::~VideoEditorAudioPlayer() {
- LOGV("~VideoEditorAudioPlayer");
+ ALOGV("~VideoEditorAudioPlayer");
if (mStarted) {
reset();
}
@@ -76,7 +76,7 @@
}
if (mInputBuffer != NULL) {
- LOGV("VideoEditorAudioPlayer releasing input buffer.");
+ ALOGV("VideoEditorAudioPlayer releasing input buffer.");
mInputBuffer->release();
mInputBuffer = NULL;
@@ -97,7 +97,7 @@
}
void VideoEditorAudioPlayer::setObserver(PreviewPlayerBase *observer) {
- LOGV("setObserver");
+ ALOGV("setObserver");
//CHECK(!mStarted);
mObserver = observer;
}
@@ -110,7 +110,7 @@
Mutex::Autolock autoLock(mLock);
CHECK(!mStarted);
CHECK(mSource != NULL);
- LOGV("Start");
+ ALOGV("Start");
status_t err;
M4OSA_ERR result = M4NO_ERROR;
M4OSA_UInt32 startTime = 0;
@@ -157,12 +157,12 @@
mBGAudioPCMFileTrimmedLength = mBGAudioPCMFileLength;
- LOGV("VideoEditorAudioPlayer::start M4OSA_kFileReadGetFileSize = %lld",
+ ALOGV("VideoEditorAudioPlayer::start M4OSA_kFileReadGetFileSize = %lld",
mBGAudioPCMFileLength);
// Get the duration in time of the audio BT
if ( result == M4NO_ERROR ) {
- LOGV("VEAP: channels = %d freq = %d",
+ ALOGV("VEAP: channels = %d freq = %d",
mAudioMixSettings->uiNbChannels, mAudioMixSettings->uiSamplingFrequency);
// No trim
@@ -171,7 +171,7 @@
mAudioMixSettings->uiNbChannels))*1000 ) /
mAudioMixSettings->uiSamplingFrequency;
- LOGV("VideoEditorAudioPlayer:: beginCutMs %d , endCutMs %d",
+ ALOGV("VideoEditorAudioPlayer:: beginCutMs %d , endCutMs %d",
(unsigned int) mAudioMixSettings->beginCutMs,
(unsigned int) mAudioMixSettings->endCutMs);
@@ -212,15 +212,15 @@
sizeof(M4OSA_UInt16)) / 1000; /*make to sec from ms*/
}
- LOGV("VideoEditorAudioPlayer: file duration recorded : %lld",
+ ALOGV("VideoEditorAudioPlayer: file duration recorded : %lld",
mBGAudioPCMFileDuration);
}
// Last played location to be seeked at for next media item
if ( result == M4NO_ERROR ) {
- LOGV("VideoEditorAudioPlayer::mBGAudioStoryBoardSkimTimeStamp %lld",
+ ALOGV("VideoEditorAudioPlayer::mBGAudioStoryBoardSkimTimeStamp %lld",
mBGAudioStoryBoardSkimTimeStamp);
- LOGV("VideoEditorAudioPlayer::uiAddCts %d",
+ ALOGV("VideoEditorAudioPlayer::uiAddCts %d",
mAudioMixSettings->uiAddCts);
if (mBGAudioStoryBoardSkimTimeStamp >= mAudioMixSettings->uiAddCts) {
startTime = (mBGAudioStoryBoardSkimTimeStamp -
@@ -230,7 +230,7 @@
// do nothing
}
- LOGV("VideoEditorAudioPlayer::startTime %d", startTime);
+ ALOGV("VideoEditorAudioPlayer::startTime %d", startTime);
seekTimeStamp = 0;
if (startTime) {
if (startTime >= mBGAudioPCMFileDuration) {
@@ -276,7 +276,7 @@
mFirstBufferResult = mSource->read(&mFirstBuffer);
if (mFirstBufferResult == INFO_FORMAT_CHANGED) {
- LOGV("INFO_FORMAT_CHANGED!!!");
+ ALOGV("INFO_FORMAT_CHANGED!!!");
CHECK(mFirstBuffer == NULL);
mFirstBufferResult = OK;
@@ -384,7 +384,7 @@
void VideoEditorAudioPlayer::reset() {
- LOGV("reset");
+ ALOGV("reset");
AudioPlayerBase::reset();
// Capture the current seek point
@@ -478,8 +478,8 @@
(mPositionTimeMediaUs - mSeekTimeUs)) >=
(int64_t)(mAudioMixSettings->uiAddCts * 1000)) {
- LOGV("VideoEditorAudioPlayer::INSIDE MIXING");
- LOGV("Checking %lld <= %lld",
+ ALOGV("VideoEditorAudioPlayer::INSIDE MIXING");
+ ALOGV("Checking %lld <= %lld",
mBGAudioPCMFileSeekPoint-mBGAudioPCMFileOriginalSeekPoint,
mBGAudioPCMFileTrimmedLength);
@@ -495,7 +495,7 @@
pPTMdata = (M4OSA_Int16*) ((uint8_t*) mInputBuffer->data()
+ mInputBuffer->range_offset());
- LOGV("mix with background malloc to do len %d", len);
+ ALOGV("mix with background malloc to do len %d", len);
bgFrame.m_dataAddress = (M4OSA_UInt16*)M4OSA_32bitAlignedMalloc( len, 1,
(M4OSA_Char*)"bgFrame");
@@ -505,7 +505,7 @@
(M4OSA_Char*)"mixFrame");
mixFrame.m_bufferSize = len;
- LOGV("mix with bgm with size %lld", mBGAudioPCMFileLength);
+ ALOGV("mix with bgm with size %lld", mBGAudioPCMFileLength);
CHECK(mInputBuffer->meta_data()->findInt64(kKeyTime,
&mPositionTimeMediaUs));
@@ -514,11 +514,11 @@
mBGAudioPCMFileOriginalSeekPoint <=
(mBGAudioPCMFileTrimmedLength - len)) {
- LOGV("Checking mBGAudioPCMFileHandle %d",
+ ALOGV("Checking mBGAudioPCMFileHandle %d",
(unsigned int)mBGAudioPCMFileHandle);
if (mBGAudioPCMFileHandle != M4OSA_NULL) {
- LOGV("fillBuffer seeking file to %lld",
+ ALOGV("fillBuffer seeking file to %lld",
mBGAudioPCMFileSeekPoint);
// TODO : 32bits required for OSAL
@@ -539,7 +539,7 @@
(M4OSA_UInt32*)&len);
if (err == M4WAR_NO_DATA_YET ) {
- LOGV("fillBuffer End of file reached");
+ ALOGV("fillBuffer End of file reached");
err = M4NO_ERROR;
// We reached the end of file
@@ -550,7 +550,7 @@
mAudioMixSettings->uiSamplingFrequency) *
mAudioMixSettings->uiNbChannels *
sizeof(M4OSA_UInt16)) / 1000;
- LOGV("fillBuffer Looping \
+ ALOGV("fillBuffer Looping \
to mBGAudioPCMFileSeekPoint %lld",
mBGAudioPCMFileSeekPoint);
}
@@ -563,10 +563,10 @@
}
}
} else if (err != M4NO_ERROR ) {
- LOGV("fileReadData for audio err %d", err);
+ ALOGV("fileReadData for audio err %d", err);
} else {
mBGAudioPCMFileSeekPoint += len;
- LOGV("fillBuffer mBGAudioPCMFileSeekPoint \
+ ALOGV("fillBuffer mBGAudioPCMFileSeekPoint \
%lld", mBGAudioPCMFileSeekPoint);
// Assign the ptr data to primary track
@@ -617,7 +617,7 @@
Mutex::Autolock autoLock(mLock);
if (status != OK) {
- LOGV("fillBuffer: mSource->read returned err %d", status);
+ ALOGV("fillBuffer: mSource->read returned err %d", status);
if (mObserver && !mReachedEOS) {
postEOS = true;
}
@@ -634,7 +634,7 @@
((mNumFramesPlayed + size_done / mFrameSize) * 1000000)
/ mSampleRate;
- LOGV("buffer->size() = %d, "
+ ALOGV("buffer->size() = %d, "
"mPositionTimeMediaUs=%.2f mPositionTimeRealUs=%.2f",
mInputBuffer->range_length(),
mPositionTimeMediaUs / 1E6, mPositionTimeRealUs / 1E6);