Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'd17793ea2a93af6ba9bc64c77502f48aa32814e4':
  Add a BufferItem parameter to onFrameAvailable
This commit is contained in:
Dan Stoza
2014-11-07 19:48:50 +00:00
committed by Android Git Automerger
parent dbda9d1c1b d17793ea2a
commit bb8a87f48a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/jni/android/graphics/SurfaceTexture.cpp
View File

@@ -121,7 +121,7 @@ class JNISurfaceTextureContext : public GLConsumer::FrameAvailableListener
public: public:
JNISurfaceTextureContext(JNIEnv* env, jobject weakThiz, jclass clazz); JNISurfaceTextureContext(JNIEnv* env, jobject weakThiz, jclass clazz);
virtual ~JNISurfaceTextureContext(); virtual ~JNISurfaceTextureContext();
virtual void onFrameAvailable(); virtual void onFrameAvailable(const BufferItem& item);
private: private:
static JNIEnv* getJNIEnv(bool* needsDetach); static JNIEnv* getJNIEnv(bool* needsDetach);
@@ -177,7 +177,7 @@ JNISurfaceTextureContext::~JNISurfaceTextureContext()
} }
} }
void JNISurfaceTextureContext::onFrameAvailable() void JNISurfaceTextureContext::onFrameAvailable(const BufferItem& /* item */)
{ {
bool needsDetach = false; bool needsDetach = false;
JNIEnv* env = getJNIEnv(&needsDetach); JNIEnv* env = getJNIEnv(&needsDetach);

4
media/jni/android_media_ImageReader.cpp
View File

@@ -80,7 +80,7 @@ public:
virtual ~JNIImageReaderContext(); virtual ~JNIImageReaderContext();
virtual void onFrameAvailable(); virtual void onFrameAvailable(const BufferItem& item);
CpuConsumer::LockedBuffer* getLockedBuffer(); CpuConsumer::LockedBuffer* getLockedBuffer();
@@ -187,7 +187,7 @@ JNIImageReaderContext::~JNIImageReaderContext() {
mConsumer.clear(); mConsumer.clear();
} }
void JNIImageReaderContext::onFrameAvailable() void JNIImageReaderContext::onFrameAvailable(const BufferItem& /*item*/)
{ {
ALOGV("%s: frame available", __FUNCTION__); ALOGV("%s: frame available", __FUNCTION__);
bool needsDetach = false; bool needsDetach = false;