diff options
Diffstat (limited to 'libvideoeditor')
8 files changed, 24 insertions, 24 deletions
diff --git a/libvideoeditor/lvpp/DummyAudioSource.cpp b/libvideoeditor/lvpp/DummyAudioSource.cpp index a037d24..d461873 100755 --- a/libvideoeditor/lvpp/DummyAudioSource.cpp +++ b/libvideoeditor/lvpp/DummyAudioSource.cpp @@ -168,7 +168,7 @@ status_t DummyAudioSource::read( MediaBuffer **out, const MediaSource::ReadOptio Mutex::Autolock autoLock(mLock); if (mTimeStampUs >= mAudioDurationUs) { *out = NULL; - LOGI("EOS reached"); + ALOGI("EOS reached"); return ERROR_END_OF_STREAM; } } diff --git a/libvideoeditor/lvpp/I420ColorConverter.cpp b/libvideoeditor/lvpp/I420ColorConverter.cpp index 75f1e93..ab66a7a 100755 --- a/libvideoeditor/lvpp/I420ColorConverter.cpp +++ b/libvideoeditor/lvpp/I420ColorConverter.cpp @@ -41,7 +41,7 @@ I420ColorConverter::I420ColorConverter() { // Fill the function pointers. getI420ColorConverter(this); - LOGI("I420ColorConverter: libI420colorconvert.so loaded"); + ALOGI("I420ColorConverter: libI420colorconvert.so loaded"); } bool I420ColorConverter::isLoaded() { diff --git a/libvideoeditor/lvpp/PreviewPlayerBase.cpp b/libvideoeditor/lvpp/PreviewPlayerBase.cpp index c234d8f..a50a044 100644 --- a/libvideoeditor/lvpp/PreviewPlayerBase.cpp +++ b/libvideoeditor/lvpp/PreviewPlayerBase.cpp @@ -260,9 +260,9 @@ status_t PreviewPlayerBase::setDataSource_l( } if (!(mFlags & INCOGNITO)) { - LOGI("setDataSource_l('%s')", mUri.string()); + ALOGI("setDataSource_l('%s')", mUri.string()); } else { - LOGI("setDataSource_l(URL suppressed)"); + ALOGI("setDataSource_l(URL suppressed)"); } // The actual work will be done during preparation in the call to @@ -422,7 +422,7 @@ void PreviewPlayerBase::reset_l() { if (mFlags & PREPARING) { mFlags |= PREPARE_CANCELLED; if (mConnectingDataSource != NULL) { - LOGI("interrupting the connection process"); + ALOGI("interrupting the connection process"); mConnectingDataSource->disconnect(); } @@ -595,7 +595,7 @@ void PreviewPlayerBase::onBufferingUpdate() { if ((mFlags & PLAYING) && !eos && (cachedDataRemaining < kLowWaterMarkBytes)) { - LOGI("cache is running low (< %d) , pausing.", + ALOGI("cache is running low (< %d) , pausing.", kLowWaterMarkBytes); mFlags |= CACHE_UNDERRUN; pause_l(); @@ -603,7 +603,7 @@ void PreviewPlayerBase::onBufferingUpdate() { notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_START); } else if (eos || cachedDataRemaining > kHighWaterMarkBytes) { if (mFlags & CACHE_UNDERRUN) { - LOGI("cache has filled up (> %d), resuming.", + ALOGI("cache has filled up (> %d), resuming.", kHighWaterMarkBytes); mFlags &= ~CACHE_UNDERRUN; play_l(); @@ -626,7 +626,7 @@ void PreviewPlayerBase::onBufferingUpdate() { if ((mFlags & PLAYING) && !eos && (cachedDurationUs < kLowWaterMarkUs)) { - LOGI("cache is running low (%.2f secs) , pausing.", + ALOGI("cache is running low (%.2f secs) , pausing.", cachedDurationUs / 1E6); mFlags |= CACHE_UNDERRUN; pause_l(); @@ -634,7 +634,7 @@ void PreviewPlayerBase::onBufferingUpdate() { notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_START); } else if (eos || cachedDurationUs > kHighWaterMarkUs) { if (mFlags & CACHE_UNDERRUN) { - LOGI("cache has filled up (%.2f secs), resuming.", + ALOGI("cache has filled up (%.2f secs), resuming.", cachedDurationUs / 1E6); mFlags &= ~CACHE_UNDERRUN; play_l(); @@ -1025,7 +1025,7 @@ void PreviewPlayerBase::setNativeWindow_l(const sp<ANativeWindow> &native) { return; } - LOGI("attempting to reconfigure to use new surface"); + ALOGI("attempting to reconfigure to use new surface"); bool wasPlaying = (mFlags & PLAYING) != 0; @@ -1421,7 +1421,7 @@ void PreviewPlayerBase::onVideoEvent() { if (mSeeking == SEEK_VIDEO_ONLY) { if (mSeekTimeUs > timeUs) { - LOGI("XXX mSeekTimeUs = %lld us, timeUs = %lld us", + ALOGI("XXX mSeekTimeUs = %lld us, timeUs = %lld us", mSeekTimeUs, timeUs); } } @@ -1461,7 +1461,7 @@ void PreviewPlayerBase::onVideoEvent() { int64_t latenessUs = nowUs - timeUs; if (latenessUs > 0) { - LOGI("after SEEK_VIDEO_ONLY we're late by %.2f secs", latenessUs / 1E6); + ALOGI("after SEEK_VIDEO_ONLY we're late by %.2f secs", latenessUs / 1E6); } } @@ -1476,7 +1476,7 @@ void PreviewPlayerBase::onVideoEvent() { && mAudioPlayer != NULL && mAudioPlayer->getMediaTimeMapping( &realTimeUs, &mediaTimeUs)) { - LOGI("we're much too late (%.2f secs), video skipping ahead", + ALOGI("we're much too late (%.2f secs), video skipping ahead", latenessUs / 1E6); mVideoBuffer->release(); @@ -1677,7 +1677,7 @@ status_t PreviewPlayerBase::finishSetDataSource_l() { if (err != OK) { mConnectingDataSource.clear(); - LOGI("mConnectingDataSource->connect() returned %d", err); + ALOGI("mConnectingDataSource->connect() returned %d", err); return err; } @@ -1724,7 +1724,7 @@ status_t PreviewPlayerBase::finishSetDataSource_l() { } if (mFlags & PREPARE_CANCELLED) { - LOGI("Prepare cancelled while waiting for initial cache fill."); + ALOGI("Prepare cancelled while waiting for initial cache fill."); return UNKNOWN_ERROR; } } else { @@ -1777,7 +1777,7 @@ void PreviewPlayerBase::onPrepareAsyncEvent() { Mutex::Autolock autoLock(mLock); if (mFlags & PREPARE_CANCELLED) { - LOGI("prepare was cancelled before doing anything"); + ALOGI("prepare was cancelled before doing anything"); abortPrepare(UNKNOWN_ERROR); return; } diff --git a/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp index 80e76d4..64ab192 100755 --- a/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp +++ b/libvideoeditor/lvpp/VideoEditorBGAudioProcessing.cpp @@ -85,7 +85,7 @@ M4OSA_Int32 VideoEditorBGAudioProcessing::veProcessAudioMixNDuck( uiPCMsize = pMixedOutBuffer->m_bufferSize/2 ; if ((mDucking_enable) && (mPTVolLevel != 0.0)) { - // LOGI("VideoEditorBGAudioProcessing:: In Ducking analysis "); + // ALOGI("VideoEditorBGAudioProcessing:: In Ducking analysis "); loopIndex = 0; peakDbValue = 0; previousDbValue = peakDbValue; diff --git a/libvideoeditor/lvpp/VideoEditorPlayer.cpp b/libvideoeditor/lvpp/VideoEditorPlayer.cpp index 993f6f4..bf39fbf 100755 --- a/libvideoeditor/lvpp/VideoEditorPlayer.cpp +++ b/libvideoeditor/lvpp/VideoEditorPlayer.cpp @@ -58,7 +58,7 @@ status_t VideoEditorPlayer::setAudioPlayer(VideoEditorAudioPlayer *audioPlayer) status_t VideoEditorPlayer::setDataSource( const char *url, const KeyedVector<String8, String8> *headers) { - LOGI("setDataSource('%s')", url); + ALOGI("setDataSource('%s')", url); return mPlayer->setDataSource(url, headers); } 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: |