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

Commit d17793ea 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 f9cf698f 2c34b5e8

core/jni/android/graphics/SurfaceTexture.cpp

+2 −2
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ class JNISurfaceTextureContext : public GLConsumer::FrameAvailableListener 
public:

    JNISurfaceTextureContext(JNIEnv* env, jobject weakThiz, jclass clazz);

    virtual ~JNISurfaceTextureContext();

    virtual void onFrameAvailable();

    virtual void onFrameAvailable(const BufferItem& item);



private:

    static JNIEnv* getJNIEnv(bool* needsDetach);
@@ -177,7 +177,7 @@ JNISurfaceTextureContext::~JNISurfaceTextureContext() 
    }

}



void JNISurfaceTextureContext::onFrameAvailable()

void JNISurfaceTextureContext::onFrameAvailable(const BufferItem& /* item */)

{

    bool needsDetach = false;

    JNIEnv* env = getJNIEnv(&needsDetach);

media/jni/android_media_ImageReader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public: 


    virtual ~JNIImageReaderContext();



    virtual void onFrameAvailable();

    virtual void onFrameAvailable(const BufferItem& item);



    CpuConsumer::LockedBuffer* getLockedBuffer();
@@ -187,7 +187,7 @@ JNIImageReaderContext::~JNIImageReaderContext() { 
    mConsumer.clear();

}



void JNIImageReaderContext::onFrameAvailable()

void JNIImageReaderContext::onFrameAvailable(const BufferItem& /*item*/)

{

    ALOGV("%s: frame available", __FUNCTION__);

    bool needsDetach = false;