diff options
| author | Dan Stoza <stoza@google.com> | 2014-11-07 19:44:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-07 19:44:34 +0000 |
| commit | d17793ea2a93af6ba9bc64c77502f48aa32814e4 (patch) | |
| tree | a90dfedeb72ed669efe27b5fee07e7ae5a5bf716 /core/jni/android | |
| parent | f9cf698fe00da7a0bf2ded408b86926c1f9155b2 (diff) | |
| parent | 2c34b5e8136eac0332dac294cb06a6a98eac1c14 (diff) | |
| download | frameworks_base-d17793ea2a93af6ba9bc64c77502f48aa32814e4.zip frameworks_base-d17793ea2a93af6ba9bc64c77502f48aa32814e4.tar.gz frameworks_base-d17793ea2a93af6ba9bc64c77502f48aa32814e4.tar.bz2 | |
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
Diffstat (limited to 'core/jni/android')
| -rw-r--r-- | core/jni/android/graphics/SurfaceTexture.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp index eea16f1..eaca6d2 100644 --- a/core/jni/android/graphics/SurfaceTexture.cpp +++ b/core/jni/android/graphics/SurfaceTexture.cpp @@ -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); |