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

Commit 1a9b49f3 authored by Leena Winterrowd's avatar Leena Winterrowd Committed by Steve Kondik
Browse files

frameworks/av: Fix LOG_NDEBUG compilation errors 

- Cleans up undefined references due to scope & naming

Change-Id: Ib342e57c69353fb873c6c0e7ba66e62983676f61
parent ba12641f

libvideoeditor/lvpp/VideoEditorSRC.cpp

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ status_t VideoEditorSRC::getNextBuffer(AudioBufferProvider::Buffer *pBuffer, int 




void VideoEditorSRC::releaseBuffer(AudioBufferProvider::Buffer *pBuffer) {

    ALOGV("releaseBuffer: %p", pBuffers);

    ALOGV("releaseBuffer: %p", pBuffer);

    free(pBuffer->raw);

    pBuffer->raw = NULL;

    pBuffer->frameCount = 0;

media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -397,10 +397,10 @@ void NuPlayer::Renderer::onDrainVideoQueue() { 
    }



    int64_t realTimeUs;

    int64_t mediaTimeUs;

    if (mFlags & FLAG_REAL_TIME) {

        CHECK(entry->mBuffer->meta()->findInt64("timeUs", &realTimeUs));

    } else {

        int64_t mediaTimeUs;

        CHECK(entry->mBuffer->meta()->findInt64("timeUs", &mediaTimeUs));



        realTimeUs = mediaTimeUs - mAnchorTimeMediaUs + mAnchorTimeRealUs;
@@ -412,6 +412,8 @@ void NuPlayer::Renderer::onDrainVideoQueue() { 
    if (tooLate) {

        ALOGV("video late by %lld us (%.2f secs)",

             mVideoLateByUs, mVideoLateByUs / 1E6);

    } else if (mFlags & FLAG_REAL_TIME) {

        ALOGV("rendering video at real time %.2f secs", realTimeUs / 1E6);

    } else {

        ALOGV("rendering video at media time %.2f secs", mediaTimeUs / 1E6);

    }

media/libnbaio/MonoPipeReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ ssize_t MonoPipeReader::availableToRead() 
        return NEGOTIATE;

    }

    ssize_t ret = android_atomic_acquire_load(&mPipe->mRear) - mPipe->mFront;

    ALOG_ASSERT((0 <= ret) && (ret <= mMaxFrames));

    ALOG_ASSERT((0 <= ret) && (ret <= mPipe->mMaxFrames));

    return ret;

}

media/libstagefright/OMXCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 * limitations under the License.

 */



#define LOG_NDEBUG 0

//#define LOG_NDEBUG 0

#define LOG_TAG "OMXCodec"

#include <utils/Log.h>

media/libstagefright/httplive/LiveSession.cpp

+1 −2
Original line number Diff line number Diff line
@@ -632,8 +632,7 @@ sp<M3UParser> LiveSession::fetchPlaylist( 
        // playlist unchanged

        *unchanged = true;



        ALOGV("Playlist unchanged, refresh state is now %d",

             (int)mRefreshState);

        ALOGV("Playlist unchanged");



        return NULL;

    }