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

Commit 3734cbca authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)" 

* commit '4f367f3387887c538c81c34cc8becaea6fa5e430':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
parents e744a90e 53feeb42

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);

drm/drmserver/main_drmserver.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ int main(int argc, char** argv) 
{

    sp<ProcessState> proc(ProcessState::self());

    sp<IServiceManager> sm = defaultServiceManager();

    LOGI("ServiceManager: %p", sm.get());

    ALOGI("ServiceManager: %p", sm.get());

    DrmManagerService::instantiate();

    ProcessState::self()->startThreadPool();

    IPCThreadState::self()->joinThreadPool();

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;