Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2703f23a authored by Steve Block's avatar Steve Block
Browse files

Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE 

See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I366680b6e614b8983d1def28cc2fdbfa98f39531
parent e20c2c17

libvideoeditor/lvpp/AudioPlayerBase.cpp

+6 −6
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ status_t AudioPlayerBase::start(bool sourceAlreadyStarted) { 


    mFirstBufferResult = mSource->read(&mFirstBuffer);

    if (mFirstBufferResult == INFO_FORMAT_CHANGED) {

        LOGV("INFO_FORMAT_CHANGED!!!");

        ALOGV("INFO_FORMAT_CHANGED!!!");



        CHECK(mFirstBuffer == NULL);

        mFirstBufferResult = OK;
@@ -215,7 +215,7 @@ void AudioPlayerBase::reset() { 
    }



    if (mInputBuffer != NULL) {

        LOGV("AudioPlayerBase releasing input buffer.");

        ALOGV("AudioPlayerBase releasing input buffer.");



        mInputBuffer->release();

        mInputBuffer = NULL;
@@ -302,7 +302,7 @@ uint32_t AudioPlayerBase::getNumFramesPendingPlayout() const { 


size_t AudioPlayerBase::fillBuffer(void *data, size_t size) {

    if (mNumFramesPlayed == 0) {

        LOGV("AudioCallback");

        ALOGV("AudioCallback");

    }



    if (mReachedEOS) {
@@ -382,12 +382,12 @@ size_t AudioPlayerBase::fillBuffer(void *data, size_t size) { 
                    int64_t timeToCompletionUs =

                        (1000000ll * numFramesPendingPlayout) / mSampleRate;



                    LOGV("total number of frames played: %lld (%lld us)",

                    ALOGV("total number of frames played: %lld (%lld us)",

                            (mNumFramesPlayed + numAdditionalFrames),

                            1000000ll * (mNumFramesPlayed + numAdditionalFrames)

                                / mSampleRate);



                    LOGV("%d frames left to play, %lld us (%.2f secs)",

                    ALOGV("%d frames left to play, %lld us (%.2f secs)",

                         numFramesPendingPlayout,

                         timeToCompletionUs, timeToCompletionUs / 1E6);
@@ -407,7 +407,7 @@ size_t AudioPlayerBase::fillBuffer(void *data, size_t size) { 
                ((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);

libvideoeditor/lvpp/DummyAudioSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ 
/*  DEBUG LEVEL SETUP  */

/*---------------------*/

#define LOG1 LOGE    /*ERRORS Logging*/

#define LOG2 LOGV    /*WARNING Logging*/

#define LOG3 //LOGV    /*COMMENTS Logging*/

#define LOG2 ALOGV    /*WARNING Logging*/

#define LOG3 //ALOGV    /*COMMENTS Logging*/



/*---------------------*/

/*  CONSTANTS          */

libvideoeditor/lvpp/DummyVideoSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 




#define LOG1 LOGE    /*ERRORS Logging*/

#define LOG2 LOGV    /*WARNING Logging*/

#define LOG3 //LOGV    /*COMMENTS Logging*/

#define LOG2 ALOGV    /*WARNING Logging*/

#define LOG3 //ALOGV    /*COMMENTS Logging*/





namespace android {

libvideoeditor/lvpp/PreviewPlayer.cpp

+41 −41
Original line number Diff line number Diff line
@@ -201,11 +201,11 @@ status_t PreviewPlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { 


    /* Add the support for Dummy audio*/

    if( !haveAudio ){

        LOGV("PreviewPlayer: setDataSource_l Dummyaudiocreation started");

        ALOGV("PreviewPlayer: setDataSource_l Dummyaudiocreation started");



        mAudioTrack = DummyAudioSource::Create(32000, 2, 20000,

                                              ((mPlayEndTimeMsec)*1000LL));

        LOGV("PreviewPlayer: setDataSource_l Dummyauiosource created");

        ALOGV("PreviewPlayer: setDataSource_l Dummyauiosource created");

        if(mAudioTrack != NULL) {

            haveAudio = true;

        }
@@ -221,17 +221,17 @@ status_t PreviewPlayer::setDataSource_l(const sp<MediaExtractor> &extractor) { 


status_t PreviewPlayer::setDataSource_l_jpg() {

    M4OSA_ERR err = M4NO_ERROR;

    LOGV("PreviewPlayer: setDataSource_l_jpg started");

    ALOGV("PreviewPlayer: setDataSource_l_jpg started");



    mAudioSource = DummyAudioSource::Create(32000, 2, 20000,

                                          ((mPlayEndTimeMsec)*1000LL));

    LOGV("PreviewPlayer: setDataSource_l_jpg Dummyaudiosource created");

    ALOGV("PreviewPlayer: setDataSource_l_jpg Dummyaudiosource created");

    if(mAudioSource != NULL) {

        setAudioSource(mAudioSource);

    }

    status_t error = mAudioSource->start();

    if (error != OK) {

        LOGV("Error starting dummy audio source");

        ALOGV("Error starting dummy audio source");

        mAudioSource.clear();

        return err;

    }
@@ -380,7 +380,7 @@ status_t PreviewPlayer::setAudioPlayer(AudioPlayerBase *audioPlayer) { 
    CHECK(!(mFlags & PLAYING));

    mAudioPlayer = audioPlayer;



    LOGV("SetAudioPlayer");

    ALOGV("SetAudioPlayer");

    mIsChangeSourceRequired = true;

    mVeAudioPlayer =

            (VideoEditorAudioPlayer*)mAudioPlayer;
@@ -389,7 +389,7 @@ status_t PreviewPlayer::setAudioPlayer(AudioPlayerBase *audioPlayer) { 
    sp<MediaSource> anAudioSource = mVeAudioPlayer->getSource();

    if (anAudioSource == NULL) {

        // Audio player does not have any source set.

        LOGV("setAudioPlayer: Audio player does not have any source set");

        ALOGV("setAudioPlayer: Audio player does not have any source set");

        return OK;

    }
@@ -402,7 +402,7 @@ status_t PreviewPlayer::setAudioPlayer(AudioPlayerBase *audioPlayer) { 
        const char *pVidSrcType;

        if (meta->findCString(kKeyDecoderComponent, &pVidSrcType)) {

            if (strcmp(pVidSrcType, "DummyVideoSource") != 0) {

                LOGV(" Video clip with silent audio; need to change source");

                ALOGV(" Video clip with silent audio; need to change source");

                return OK;

            }

        }
@@ -427,7 +427,7 @@ status_t PreviewPlayer::setAudioPlayer(AudioPlayerBase *audioPlayer) { 


                    // Stop the new audio source

                    // since we continue using old source

                    LOGV("setAudioPlayer: stop new audio source");

                    ALOGV("setAudioPlayer: stop new audio source");

                    mAudioSource->stop();

                }

            }
@@ -447,7 +447,7 @@ void PreviewPlayer::onStreamDone() { 
    mStreamDoneEventPending = false;



    if (mStreamDoneStatus != ERROR_END_OF_STREAM) {

        LOGV("MEDIA_ERROR %d", mStreamDoneStatus);

        ALOGV("MEDIA_ERROR %d", mStreamDoneStatus);



        notifyListener_l(

                MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, mStreamDoneStatus);
@@ -473,7 +473,7 @@ void PreviewPlayer::onStreamDone() { 
            postVideoEvent_l();

        }

    } else {

        LOGV("MEDIA_PLAYBACK_COMPLETE");

        ALOGV("MEDIA_PLAYBACK_COMPLETE");

        //pause before sending event

        pause_l(true /* at eos */);
@@ -499,7 +499,7 @@ void PreviewPlayer::onStreamDone() { 
            mFlags |= INFORMED_AV_EOS;

        }

        mFlags |= AT_EOS;

        LOGV("onStreamDone end");

        ALOGV("onStreamDone end");

        return;

    }

}
@@ -572,7 +572,7 @@ status_t PreviewPlayer::play_l() { 
            bool isAudioPlayerStarted = mVeAudioPlayer->isStarted();



            if (mIsChangeSourceRequired == true) {

                LOGV("play_l: Change audio source required");

                ALOGV("play_l: Change audio source required");



                if (isAudioPlayerStarted == true) {

                    mVeAudioPlayer->pause();
@@ -602,7 +602,7 @@ status_t PreviewPlayer::play_l() { 
                    }

                }

            } else {

                LOGV("play_l: No Source change required");

                ALOGV("play_l: No Source change required");

                mVeAudioPlayer->setAudioMixStoryBoardSkimTimeStamp(

                    mAudioMixStoryBoardTS, mCurrentMediaBeginCutTime,

                    mCurrentMediaVolumeValue);
@@ -708,7 +708,7 @@ status_t PreviewPlayer::initAudioDecoder() { 
                mAudioTrack);



        if(aRawSource != NULL) {

            LOGV("initAudioDecoder: new VideoEditorSRC");

            ALOGV("initAudioDecoder: new VideoEditorSRC");

            mAudioSource = new VideoEditorSRC(aRawSource);

        }

    }
@@ -820,7 +820,7 @@ void PreviewPlayer::onVideoEvent() { 
    if (!mVideoBuffer) {

        MediaSource::ReadOptions options;

        if (mSeeking != NO_SEEK) {

            LOGV("LV PLAYER seeking to %lld us (%.2f secs)", mSeekTimeUs,

            ALOGV("LV PLAYER seeking to %lld us (%.2f secs)", mSeekTimeUs,

                                                      mSeekTimeUs / 1E6);



            options.setSeekTo(
@@ -834,7 +834,7 @@ void PreviewPlayer::onVideoEvent() { 
                CHECK_EQ(mVideoBuffer, NULL);



                if (err == INFO_FORMAT_CHANGED) {

                    LOGV("LV PLAYER VideoSource signalled format change");

                    ALOGV("LV PLAYER VideoSource signalled format change");

                    notifyVideoSize_l();



                    if (mVideoRenderer != NULL) {
@@ -852,10 +852,10 @@ void PreviewPlayer::onVideoEvent() { 
                // So video playback is complete, but we may still have

                // a seek request pending that needs to be applied to the audio track

                if (mSeeking != NO_SEEK) {

                    LOGV("video stream ended while seeking!");

                    ALOGV("video stream ended while seeking!");

                }

                finishSeekIfNecessary(-1);

                LOGV("PreviewPlayer: onVideoEvent EOS reached.");

                ALOGV("PreviewPlayer: onVideoEvent EOS reached.");

                mFlags |= VIDEO_AT_EOS;

                mFlags |= AUDIO_AT_EOS;

                mOverlayUpdateEventPosted = false;
@@ -959,12 +959,12 @@ void PreviewPlayer::onVideoEvent() { 
            // Let's display the first frame after seeking right away.

            latenessUs = 0;

        }

        LOGV("Audio time stamp = %lld and video time stamp = %lld",

        ALOGV("Audio time stamp = %lld and video time stamp = %lld",

                                            ts->getRealTimeUs(),timeUs);

        if (latenessUs > 40000) {

            // We're more than 40ms late.



            LOGV("LV PLAYER we're late by %lld us (%.2f secs)",

            ALOGV("LV PLAYER we're late by %lld us (%.2f secs)",

                                           latenessUs, latenessUs / 1E6);



            mVideoBuffer->release();
@@ -975,7 +975,7 @@ void PreviewPlayer::onVideoEvent() { 


        if (latenessUs < -25000) {

            // We're more than 25ms early.

            LOGV("We're more than 25ms early, lateness %lld", latenessUs);

            ALOGV("We're more than 25ms early, lateness %lld", latenessUs);



            postVideoEvent_l(25000);

            return;
@@ -997,7 +997,7 @@ void PreviewPlayer::onVideoEvent() { 
        mVideoBuffer = NULL;

        mFlags |= VIDEO_AT_EOS;

        mFlags |= AUDIO_AT_EOS;

        LOGV("PreviewPlayer: onVideoEvent timeUs > mPlayEndTime; send EOS..");

        ALOGV("PreviewPlayer: onVideoEvent timeUs > mPlayEndTime; send EOS..");

        mOverlayUpdateEventPosted = false;

        // Set the last decoded timestamp to duration

        mDecodedVideoTs = (mPlayEndTimeMsec*1000LL);
@@ -1057,15 +1057,15 @@ void PreviewPlayer::onVideoEvent() { 
                mCurrFramingEffectIndex = index;

                mOverlayUpdateEventPosted = true;

                postOverlayUpdateEvent_l();

                LOGV("Framing index = %d", mCurrFramingEffectIndex);

                ALOGV("Framing index = %d", mCurrFramingEffectIndex);

            } else {

                LOGV("No framing effects found");

                ALOGV("No framing effects found");

            }

        }



    } else if (mOverlayUpdateEventPosted) {

        //Post the event when the overlay is no more valid

        LOGV("Overlay is Done");

        ALOGV("Overlay is Done");

        mOverlayUpdateEventPosted = false;

        postOverlayUpdateEvent_l();

    }
@@ -1086,7 +1086,7 @@ void PreviewPlayer::onVideoEvent() { 


    // if reached EndCutTime of clip, post EOS event

    if((timeUs/1000) >= mPlayEndTimeMsec) {

        LOGV("PreviewPlayer: onVideoEvent EOS.");

        ALOGV("PreviewPlayer: onVideoEvent EOS.");

        mFlags |= VIDEO_AT_EOS;

        mFlags |= AUDIO_AT_EOS;

        mOverlayUpdateEventPosted = false;
@@ -1178,7 +1178,7 @@ status_t PreviewPlayer::finishSetDataSource_l() { 
    }



    if (extractor == NULL) {

        LOGV("PreviewPlayer::finishSetDataSource_l  extractor == NULL");

        ALOGV("PreviewPlayer::finishSetDataSource_l  extractor == NULL");

        return setDataSource_l_jpg();

    }
@@ -1195,10 +1195,10 @@ bool PreviewPlayer::ContinuePreparation(void *cookie) { 


void PreviewPlayer::onPrepareAsyncEvent() {

    Mutex::Autolock autoLock(mLock);

    LOGV("onPrepareAsyncEvent");

    ALOGV("onPrepareAsyncEvent");



    if (mFlags & PREPARE_CANCELLED) {

        LOGV("LV PLAYER prepare was cancelled before doing anything");

        ALOGV("LV PLAYER prepare was cancelled before doing anything");

        abortPrepare(UNKNOWN_ERROR);

        return;

    }
@@ -1236,13 +1236,13 @@ void PreviewPlayer::onPrepareAsyncEvent() { 
void PreviewPlayer::finishAsyncPrepare_l() {

    if (mIsAsyncPrepare) {

        if (mVideoSource == NULL) {

            LOGV("finishAsyncPrepare_l: MEDIA_SET_VIDEO_SIZE 0 0 ");

            ALOGV("finishAsyncPrepare_l: MEDIA_SET_VIDEO_SIZE 0 0 ");

            notifyListener_l(MEDIA_SET_VIDEO_SIZE, 0, 0);

        } else {

            LOGV("finishAsyncPrepare_l: MEDIA_SET_VIDEO_SIZE");

            ALOGV("finishAsyncPrepare_l: MEDIA_SET_VIDEO_SIZE");

            notifyVideoSize_l();

        }

        LOGV("finishAsyncPrepare_l: MEDIA_PREPARED");

        ALOGV("finishAsyncPrepare_l: MEDIA_PREPARED");

        notifyListener_l(MEDIA_PREPARED);

    }
@@ -1254,12 +1254,12 @@ void PreviewPlayer::finishAsyncPrepare_l() { 
}



void PreviewPlayer::acquireLock() {

    LOGV("acquireLock");

    ALOGV("acquireLock");

    mLockControl.lock();

}



void PreviewPlayer::releaseLock() {

    LOGV("releaseLock");

    ALOGV("releaseLock");

    mLockControl.unlock();

}
@@ -1276,7 +1276,7 @@ status_t PreviewPlayer::loadEffectsSettings( 
status_t PreviewPlayer::loadAudioMixSettings(

                    M4xVSS_AudioMixingSettings* pAudioMixSettings) {



    LOGV("PreviewPlayer: loadAudioMixSettings: ");

    ALOGV("PreviewPlayer: loadAudioMixSettings: ");

    mPreviewPlayerAudioMixSettings = pAudioMixSettings;

    return OK;

}
@@ -1284,7 +1284,7 @@ status_t PreviewPlayer::loadAudioMixSettings( 
status_t PreviewPlayer::setAudioMixPCMFileHandle(

                    M4OSA_Context pAudioMixPCMFileHandle) {



    LOGV("PreviewPlayer: setAudioMixPCMFileHandle: ");

    ALOGV("PreviewPlayer: setAudioMixPCMFileHandle: ");

    mAudioMixPCMFileHandle = pAudioMixPCMFileHandle;

    return OK;

}
@@ -1479,12 +1479,12 @@ status_t PreviewPlayer::setImageClipProperties(uint32_t width,uint32_t height) { 
}



status_t PreviewPlayer::readFirstVideoFrame() {

    LOGV("PreviewPlayer::readFirstVideoFrame");

    ALOGV("PreviewPlayer::readFirstVideoFrame");



    if (!mVideoBuffer) {

        MediaSource::ReadOptions options;

        if (mSeeking != NO_SEEK) {

            LOGV("LV PLAYER seeking to %lld us (%.2f secs)", mSeekTimeUs,

            ALOGV("LV PLAYER seeking to %lld us (%.2f secs)", mSeekTimeUs,

                    mSeekTimeUs / 1E6);



            options.setSeekTo(
@@ -1498,7 +1498,7 @@ status_t PreviewPlayer::readFirstVideoFrame() { 
                CHECK_EQ(mVideoBuffer, NULL);



                if (err == INFO_FORMAT_CHANGED) {

                    LOGV("LV PLAYER VideoSource signalled format change");

                    ALOGV("LV PLAYER VideoSource signalled format change");

                    notifyVideoSize_l();



                    if (mVideoRenderer != NULL) {
@@ -1512,7 +1512,7 @@ status_t PreviewPlayer::readFirstVideoFrame() { 
                    updateSizeToRender(mVideoSource->getFormat());

                    continue;

                }

                LOGV("PreviewPlayer: onVideoEvent EOS reached.");

                ALOGV("PreviewPlayer: onVideoEvent EOS reached.");

                mFlags |= VIDEO_AT_EOS;

                mFlags |= AUDIO_AT_EOS;

                postStreamDoneEvent_l(err);

libvideoeditor/lvpp/PreviewPlayerBase.cpp

+17 −17
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ status_t PreviewPlayerBase::setDataSource_l(const sp<MediaExtractor> &extractor) 


    mBitrate = totalBitRate;



    LOGV("mBitrate = %lld bits/sec", mBitrate);

    ALOGV("mBitrate = %lld bits/sec", mBitrate);



    bool haveAudio = false;

    bool haveVideo = false;
@@ -546,7 +546,7 @@ void PreviewPlayerBase::onVideoLagUpdate() { 
    int64_t videoLateByUs = audioTimeUs - mVideoTimeUs;



    if (!(mFlags & VIDEO_AT_EOS) && videoLateByUs > 300000ll) {

        LOGV("video late by %lld ms.", videoLateByUs / 1000ll);

        ALOGV("video late by %lld ms.", videoLateByUs / 1000ll);



        notifyListener_l(

                MEDIA_INFO,
@@ -574,7 +574,7 @@ void PreviewPlayerBase::onBufferingUpdate() { 
                notifyListener_l(MEDIA_BUFFERING_UPDATE, 100);

            }

            if (mFlags & PREPARING) {

                LOGV("cache has reached EOS, prepare is done.");

                ALOGV("cache has reached EOS, prepare is done.");

                finishAsyncPrepare_l();

            }

        } else {
@@ -609,7 +609,7 @@ void PreviewPlayerBase::onBufferingUpdate() { 
                        play_l();

                        notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_END);

                    } else if (mFlags & PREPARING) {

                        LOGV("cache has filled up (> %d), prepare is done",

                        ALOGV("cache has filled up (> %d), prepare is done",

                             kHighWaterMarkBytes);

                        finishAsyncPrepare_l();

                    }
@@ -621,7 +621,7 @@ void PreviewPlayerBase::onBufferingUpdate() { 
    int64_t cachedDurationUs;

    bool eos;

    if (getCachedDuration_l(&cachedDurationUs, &eos)) {

        LOGV("cachedDurationUs = %.2f secs, eos=%d",

        ALOGV("cachedDurationUs = %.2f secs, eos=%d",

             cachedDurationUs / 1E6, eos);



        if ((mFlags & PLAYING) && !eos
@@ -640,7 +640,7 @@ void PreviewPlayerBase::onBufferingUpdate() { 
                play_l();

                notifyListener_l(MEDIA_INFO, MEDIA_INFO_BUFFERING_END);

            } else if (mFlags & PREPARING) {

                LOGV("cache has filled up (%.2f secs), prepare is done",

                ALOGV("cache has filled up (%.2f secs), prepare is done",

                     cachedDurationUs / 1E6);

                finishAsyncPrepare_l();

            }
@@ -660,7 +660,7 @@ void PreviewPlayerBase::onStreamDone() { 
    mStreamDoneEventPending = false;



    if (mStreamDoneStatus != ERROR_END_OF_STREAM) {

        LOGV("MEDIA_ERROR %d", mStreamDoneStatus);

        ALOGV("MEDIA_ERROR %d", mStreamDoneStatus);



        notifyListener_l(

                MEDIA_ERROR, MEDIA_ERROR_UNKNOWN, mStreamDoneStatus);
@@ -686,7 +686,7 @@ void PreviewPlayerBase::onStreamDone() { 
            postVideoEvent_l();

        }

    } else {

        LOGV("MEDIA_PLAYBACK_COMPLETE");

        ALOGV("MEDIA_PLAYBACK_COMPLETE");

        notifyListener_l(MEDIA_PLAYBACK_COMPLETE);



        pause_l(true /* at eos */);
@@ -859,12 +859,12 @@ void PreviewPlayerBase::notifyVideoSize_l() { 


    int32_t displayWidth;

    if (meta->findInt32(kKeyDisplayWidth, &displayWidth)) {

        LOGV("Display width changed (%d=>%d)", mDisplayWidth, displayWidth);

        ALOGV("Display width changed (%d=>%d)", mDisplayWidth, displayWidth);

        mDisplayWidth = displayWidth;

    }

    int32_t displayHeight;

    if (meta->findInt32(kKeyDisplayHeight, &displayHeight)) {

        LOGV("Display height changed (%d=>%d)", mDisplayHeight, displayHeight);

        ALOGV("Display height changed (%d=>%d)", mDisplayHeight, displayHeight);

        mDisplayHeight = displayHeight;

    }
@@ -1126,7 +1126,7 @@ status_t PreviewPlayerBase::seekTo_l(int64_t timeUs) { 
    seekAudioIfNecessary_l();



    if (!(mFlags & PLAYING)) {

        LOGV("seeking while paused, sending SEEK_COMPLETE notification"

        ALOGV("seeking while paused, sending SEEK_COMPLETE notification"

             " immediately.");



        notifyListener_l(MEDIA_SEEK_COMPLETE);
@@ -1255,7 +1255,7 @@ status_t PreviewPlayerBase::initVideoDecoder(uint32_t flags) { 
        flags |= OMXCodec::kEnableGrallocUsageProtected;

    }

#endif

    LOGV("initVideoDecoder flags=0x%x", flags);

    ALOGV("initVideoDecoder flags=0x%x", flags);

    mVideoSource = OMXCodec::Create(

            mClient.interface(), mVideoTrack->getFormat(),

            false, // createEncoder
@@ -1293,7 +1293,7 @@ void PreviewPlayerBase::finishSeekIfNecessary(int64_t videoTimeUs) { 
    }



    if (mAudioPlayer != NULL) {

        LOGV("seeking audio to %lld us (%.2f secs).", videoTimeUs, videoTimeUs / 1E6);

        ALOGV("seeking audio to %lld us (%.2f secs).", videoTimeUs, videoTimeUs / 1E6);



        // If we don't have a video time, seek audio to the originally

        // requested seek time instead.
@@ -1356,7 +1356,7 @@ void PreviewPlayerBase::onVideoEvent() { 
    if (!mVideoBuffer) {

        MediaSource::ReadOptions options;

        if (mSeeking != NO_SEEK) {

            LOGV("seeking to %lld us (%.2f secs)", mSeekTimeUs, mSeekTimeUs / 1E6);

            ALOGV("seeking to %lld us (%.2f secs)", mSeekTimeUs, mSeekTimeUs / 1E6);



            options.setSeekTo(

                    mSeekTimeUs,
@@ -1372,7 +1372,7 @@ void PreviewPlayerBase::onVideoEvent() { 
                CHECK(mVideoBuffer == NULL);



                if (err == INFO_FORMAT_CHANGED) {

                    LOGV("VideoSource signalled format change.");

                    ALOGV("VideoSource signalled format change.");



                    notifyVideoSize_l();
@@ -1387,7 +1387,7 @@ void PreviewPlayerBase::onVideoEvent() { 
                // a seek request pending that needs to be applied

                // to the audio track.

                if (mSeeking != NO_SEEK) {

                    LOGV("video stream ended while seeking!");

                    ALOGV("video stream ended while seeking!");

                }

                finishSeekIfNecessary(-1);
@@ -1491,7 +1491,7 @@ void PreviewPlayerBase::onVideoEvent() { 


        if (latenessUs > 40000) {

            // We're more than 40ms late.

            LOGV("we're late by %lld us (%.2f secs), dropping frame",

            ALOGV("we're late by %lld us (%.2f secs), dropping frame",

                 latenessUs, latenessUs / 1E6);

            mVideoBuffer->release();

            mVideoBuffer = NULL;