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

Commit 8a08dcc0 authored by Steve Block's avatar Steve Block Committed by Android (Google) Code Review
Browse files

Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"

parents 1dcd4753 df64d150

cmds/stagefright/record.cpp

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public: 
        ++mNumFramesOutput;



        // printf("DummySource::read - returning buffer\n");

        // LOGI("DummySource::read - returning buffer");

        // ALOGI("DummySource::read - returning buffer");

        return OK;

    }

cmds/stagefright/stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ void MyStreamSource::onBufferAvailable(size_t index) { 


#if 0

    if (mNumPacketsSent >= 20000) {

        LOGI("signalling discontinuity now");

        ALOGI("signalling discontinuity now");



        off64_t offset = 0;

        CHECK((offset % 188) == 0);

media/libmediaplayerservice/StagefrightRecorder.cpp

+3 −3
Original line number Diff line number Diff line
@@ -1131,7 +1131,7 @@ void StagefrightRecorder::setDefaultProfileIfNecessary() { 
        audioSampleRate == mSampleRate &&

        audioChannels == mAudioChannels) {

        if (videoCodec == VIDEO_ENCODER_H264) {

            LOGI("Force to use AVC baseline profile");

            ALOGI("Force to use AVC baseline profile");

            setParamVideoEncoderProfile(OMX_VIDEO_AVCProfileBaseline);

        }

    }
@@ -1268,7 +1268,7 @@ status_t StagefrightRecorder::setupSurfaceMediaSource() { 
        int32_t frameRate = 0;

        CHECK (mSurfaceMediaSource->getFormat()->findInt32(

                                        kKeyFrameRate, &frameRate));

        LOGI("Frame rate is not explicitly set. Use the current frame "

        ALOGI("Frame rate is not explicitly set. Use the current frame "

             "rate (%d fps)", frameRate);

        mFrameRate = frameRate;

    } else {
@@ -1319,7 +1319,7 @@ status_t StagefrightRecorder::setupCameraSource( 
        int32_t frameRate = 0;

        CHECK ((*cameraSource)->getFormat()->findInt32(

                    kKeyFrameRate, &frameRate));

        LOGI("Frame rate is not explicitly set. Use the current frame "

        ALOGI("Frame rate is not explicitly set. Use the current frame "

             "rate (%d fps)", frameRate);

        mFrameRate = frameRate;

    }

media/libmediaplayerservice/nuplayer/HTTPLiveSource.cpp

+2 −2
Original line number Diff line number Diff line
@@ -111,9 +111,9 @@ status_t NuPlayer::HTTPLiveSource::feedMoreTSData() { 
            break;

        } else if (n < 0) {

            if (n != ERROR_END_OF_STREAM) {

                LOGI("input data EOS reached, error %ld", n);

                ALOGI("input data EOS reached, error %ld", n);

            } else {

                LOGI("input data EOS reached.");

                ALOGI("input data EOS reached.");

            }

            mTSParser->signalEOS(n);

            mFinalResult = n;

media/libmediaplayerservice/nuplayer/NuPlayer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) { 


                bool timeChange = (type & ATSParser::DISCONTINUITY_TIME) != 0;



                LOGI("%s discontinuity (formatChange=%d, time=%d)",

                ALOGI("%s discontinuity (formatChange=%d, time=%d)",

                     audio ? "audio" : "video", formatChange, timeChange);



                if (audio) {
@@ -705,7 +705,7 @@ status_t NuPlayer::feedDecoderInputData(bool audio, const sp<AMessage> &msg) { 
                        int64_t resumeAtMediaTimeUs;

                        if (extra->findInt64(

                                    "resume-at-mediatimeUs", &resumeAtMediaTimeUs)) {

                            LOGI("suppressing rendering of %s until %lld us",

                            ALOGI("suppressing rendering of %s until %lld us",

                                    audio ? "audio" : "video", resumeAtMediaTimeUs);



                            if (audio) {
@@ -838,7 +838,7 @@ void NuPlayer::notifyListener(int msg, int ext1, int ext2) { 


void NuPlayer::flushDecoder(bool audio, bool needShutdown) {

    if ((audio && mAudioDecoder == NULL) || (!audio && mVideoDecoder == NULL)) {

        LOGI("flushDecoder %s without decoder present",

        ALOGI("flushDecoder %s without decoder present",

             audio ? "audio" : "video");

    }