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

Commit f8bd29c6 authored by Steve Block's avatar Steve Block
Browse files

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 

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

Bug: 5449033
Change-Id: I5c54a0185527f6ca3e746d625a007aa06f6f25f9
parent e70ff370

libvideoeditor/lvpp/DummyAudioSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
/*---------------------*/

/*  DEBUG LEVEL SETUP  */

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

#define LOG1 LOGE    /*ERRORS Logging*/

#define LOG1 ALOGE    /*ERRORS Logging*/

#define LOG2 ALOGV    /*WARNING Logging*/

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

libvideoeditor/lvpp/DummyVideoSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include <memory.h>





#define LOG1 LOGE    /*ERRORS Logging*/

#define LOG1 ALOGE    /*ERRORS Logging*/

#define LOG2 ALOGV    /*WARNING Logging*/

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

libvideoeditor/lvpp/NativeWindowRenderer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ void NativeWindowRenderer::createProgram( 
            char* buf = (char*) malloc(infoLen);

            if (buf) {

                glGetProgramInfoLog(program, infoLen, NULL, buf);

                LOGE("Program link log:\n%s\n", buf);

                ALOGE("Program link log:\n%s\n", buf);

                free(buf);

            }

        }
@@ -300,7 +300,7 @@ void NativeWindowRenderer::loadShader(GLenum shaderType, const char* pSource, 
        char* buf = (char*) malloc(infoLen);

        if (buf) {

            glGetShaderInfoLog(shader, infoLen, NULL, buf);

            LOGE("Shader compile log:\n%s\n", buf);

            ALOGE("Shader compile log:\n%s\n", buf);

            free(buf);

        }

        glDeleteShader(shader);
@@ -385,7 +385,7 @@ void NativeWindowRenderer::queueInternalBuffer(ANativeWindow *anw, 
    native_window_set_buffers_timestamp(anw, timeUs * 1000);

    status_t err = anw->queueBuffer(anw, buffer->graphicBuffer().get());

    if (err != 0) {

        LOGE("queueBuffer failed with error %s (%d)", strerror(-err), -err);

        ALOGE("queueBuffer failed with error %s (%d)", strerror(-err), -err);

        return;

    }

libvideoeditor/lvpp/PreviewPlayer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ status_t PreviewPlayer::initVideoDecoder(uint32_t flags) { 
    initRenderer_l();



    if (mVideoRenderer == NULL) {

        LOGE("Cannot create renderer");

        ALOGE("Cannot create renderer");

        return UNKNOWN_ERROR;

    }
@@ -925,7 +925,7 @@ void PreviewPlayer::onVideoEvent() { 
    if (mAudioPlayer != NULL && !(mFlags & (AUDIO_RUNNING))) {

        status_t err = startAudioPlayer_l();

        if (err != OK) {

            LOGE("Starting the audio player failed w/ err %d", err);

            ALOGE("Starting the audio player failed w/ err %d", err);

            return;

        }

    }

libvideoeditor/lvpp/PreviewPlayerBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ struct AwesomeNativeWindowRenderer : public AwesomeRenderer { 
        status_t err = mNativeWindow->queueBuffer(

                mNativeWindow.get(), buffer->graphicBuffer().get());

        if (err != 0) {

            LOGE("queueBuffer failed with error %s (%d)", strerror(-err),

            ALOGE("queueBuffer failed with error %s (%d)", strerror(-err),

                    -err);

            return;

        }
@@ -1437,7 +1437,7 @@ void PreviewPlayerBase::onVideoEvent() { 
    if (mAudioPlayer != NULL && !(mFlags & (AUDIO_RUNNING | SEEK_PREVIEW))) {

        status_t err = startAudioPlayer_l();

        if (err != OK) {

            LOGE("Startung the audio player failed w/ err %d", err);

            ALOGE("Startung the audio player failed w/ err %d", err);

            return;

        }

    }