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

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

Browse Source 
* commit 'bb8a87f48a9978d8faec11819d5fabbbc97cac47':
  Add a BufferItem parameter to onFrameAvailable
This commit is contained in:
Dan Stoza
2014-11-07 19:58:51 +00:00
committed by Android Git Automerger
parent 003f248a70 bb8a87f48a
commit 1437146a3e
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:
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);

4
media/jni/android_media_ImageReader.cpp
View File

@@ -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;