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

Commit 1609e451 authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev

parents c339a921 04f101c3

cmds/screenrecord/FrameOutput.cpp

+1 −1
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ void FrameOutput::reduceRgbaToRgb(uint8_t* buf, unsigned int pixelCount) { 
}



// Callback; executes on arbitrary thread.

void FrameOutput::onFrameAvailable() {

void FrameOutput::onFrameAvailable(const BufferItem& /* item */) {

    Mutex::Autolock _l(mMutex);

    mFrameAvailable = true;

    mEventCond.signal();

cmds/screenrecord/FrameOutput.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ private: 
    }



    // (overrides GLConsumer::FrameAvailableListener method)

    virtual void onFrameAvailable();

    virtual void onFrameAvailable(const BufferItem& item);



    // Reduces RGBA to RGB, in place.

    static void reduceRgbaToRgb(uint8_t* buf, unsigned int pixelCount);

cmds/screenrecord/Overlay.cpp

+1 −1
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ void Overlay::getTimeString_l(nsecs_t monotonicNsec, char* buf, size_t bufLen) { 
}



// Callback; executes on arbitrary thread.

void Overlay::onFrameAvailable() {

void Overlay::onFrameAvailable(const BufferItem& /* item */) {

    ALOGV("Overlay::onFrameAvailable");

    Mutex::Autolock _l(mMutex);

    mFrameAvailable = true;

cmds/screenrecord/Overlay.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ private: 
            const Program& texRender, TextRenderer& textRenderer);



    // (overrides GLConsumer::FrameAvailableListener method)

    virtual void onFrameAvailable();

    virtual void onFrameAvailable(const BufferItem& item);



    // (overrides Thread method)

    virtual bool threadLoop();

include/camera/ProCamera.h

+1 −1
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ private: 
        }



    protected:

        virtual void onFrameAvailable() {

        virtual void onFrameAvailable(const BufferItem& /* item */) {

            sp<ProCamera> c = mCamera.promote();

            if (c.get() != NULL) {

                c->onFrameAvailable(mStreamId);