drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 887b1ca8: Merge "AArch64: Use long for pointers in SurfaceTexture"

Browse Source 
* commit '887b1ca87941095797a246b2d68ec2626a7cfc43':
  AArch64: Use long for pointers in SurfaceTexture
This commit is contained in:
Narayan Kamath
2014-01-29 04:14:44 -08:00
committed by Android Git Automerger
parent 95ba1eb624 887b1ca879
commit 74db9ddb34
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,28 +55,28 @@ static void SurfaceTexture_setSurfaceTexture(JNIEnv* env, jobject thiz,
const sp<GLConsumer>& surfaceTexture) const sp<GLConsumer>& surfaceTexture)
{ {
GLConsumer* const p = GLConsumer* const p =
(GLConsumer*)env->GetIntField(thiz, fields.surfaceTexture); (GLConsumer*)env->GetLongField(thiz, fields.surfaceTexture);
if (surfaceTexture.get()) { if (surfaceTexture.get()) {
surfaceTexture->incStrong((void*)SurfaceTexture_setSurfaceTexture); surfaceTexture->incStrong((void*)SurfaceTexture_setSurfaceTexture);
} }
if (p) { if (p) {
p->decStrong((void*)SurfaceTexture_setSurfaceTexture); p->decStrong((void*)SurfaceTexture_setSurfaceTexture);
} }
env->SetIntField(thiz, fields.surfaceTexture, (int)surfaceTexture.get()); env->SetLongField(thiz, fields.surfaceTexture, (jlong)surfaceTexture.get());
} }
static void SurfaceTexture_setBufferQueue(JNIEnv* env, jobject thiz, static void SurfaceTexture_setBufferQueue(JNIEnv* env, jobject thiz,
const sp<BufferQueue>& bq) const sp<BufferQueue>& bq)
{ {
BufferQueue* const p = BufferQueue* const p =
(BufferQueue*)env->GetIntField(thiz, fields.bufferQueue); (BufferQueue*)env->GetLongField(thiz, fields.bufferQueue);
if (bq.get()) { if (bq.get()) {
bq->incStrong((void*)SurfaceTexture_setBufferQueue); bq->incStrong((void*)SurfaceTexture_setBufferQueue);
} }
if (p) { if (p) {
p->decStrong((void*)SurfaceTexture_setBufferQueue); p->decStrong((void*)SurfaceTexture_setBufferQueue);
} }
env->SetIntField(thiz, fields.bufferQueue, (int)bq.get()); env->SetLongField(thiz, fields.bufferQueue, (jlong)bq.get());
} }
static void SurfaceTexture_setFrameAvailableListener(JNIEnv* env, static void SurfaceTexture_setFrameAvailableListener(JNIEnv* env,
@ -84,22 +84,22 @@ static void SurfaceTexture_setFrameAvailableListener(JNIEnv* env,
{ {
GLConsumer::FrameAvailableListener* const p = GLConsumer::FrameAvailableListener* const p =
(GLConsumer::FrameAvailableListener*) (GLConsumer::FrameAvailableListener*)
env->GetIntField(thiz, fields.frameAvailableListener); env->GetLongField(thiz, fields.frameAvailableListener);
if (listener.get()) { if (listener.get()) {
listener->incStrong((void*)SurfaceTexture_setSurfaceTexture); listener->incStrong((void*)SurfaceTexture_setSurfaceTexture);
} }
if (p) { if (p) {
p->decStrong((void*)SurfaceTexture_setSurfaceTexture); p->decStrong((void*)SurfaceTexture_setSurfaceTexture);
} }
env->SetIntField(thiz, fields.frameAvailableListener, (int)listener.get()); env->SetLongField(thiz, fields.frameAvailableListener, (jlong)listener.get());
} }
sp<GLConsumer> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz) { sp<GLConsumer> SurfaceTexture_getSurfaceTexture(JNIEnv* env, jobject thiz) {
return (GLConsumer*)env->GetIntField(thiz, fields.surfaceTexture); return (GLConsumer*)env->GetLongField(thiz, fields.surfaceTexture);
} }
sp<IGraphicBufferProducer> SurfaceTexture_getProducer(JNIEnv* env, jobject thiz) { sp<IGraphicBufferProducer> SurfaceTexture_getProducer(JNIEnv* env, jobject thiz) {
return (BufferQueue*)env->GetIntField(thiz, fields.bufferQueue); return (BufferQueue*)env->GetLongField(thiz, fields.bufferQueue);
} }
sp<ANativeWindow> android_SurfaceTexture_getNativeWindow(JNIEnv* env, jobject thiz) { sp<ANativeWindow> android_SurfaceTexture_getNativeWindow(JNIEnv* env, jobject thiz) {
@ -201,19 +201,19 @@ void JNISurfaceTextureContext::onFrameAvailable()
static void SurfaceTexture_classInit(JNIEnv* env, jclass clazz) static void SurfaceTexture_classInit(JNIEnv* env, jclass clazz)
{ {
fields.surfaceTexture = env->GetFieldID(clazz, fields.surfaceTexture = env->GetFieldID(clazz,
ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID, "I"); ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID, "J");
if (fields.surfaceTexture == NULL) { if (fields.surfaceTexture == NULL) {
ALOGE("can't find android/graphics/SurfaceTexture.%s", ALOGE("can't find android/graphics/SurfaceTexture.%s",
ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID); ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID);
} }
fields.bufferQueue = env->GetFieldID(clazz, fields.bufferQueue = env->GetFieldID(clazz,
ANDROID_GRAPHICS_BUFFERQUEUE_JNI_ID, "I"); ANDROID_GRAPHICS_BUFFERQUEUE_JNI_ID, "J");
if (fields.bufferQueue == NULL) { if (fields.bufferQueue == NULL) {
ALOGE("can't find android/graphics/SurfaceTexture.%s", ALOGE("can't find android/graphics/SurfaceTexture.%s",
ANDROID_GRAPHICS_BUFFERQUEUE_JNI_ID); ANDROID_GRAPHICS_BUFFERQUEUE_JNI_ID);
} }
fields.frameAvailableListener = env->GetFieldID(clazz, fields.frameAvailableListener = env->GetFieldID(clazz,
ANDROID_GRAPHICS_FRAMEAVAILABLELISTENER_JNI_ID, "I"); ANDROID_GRAPHICS_FRAMEAVAILABLELISTENER_JNI_ID, "J");
if (fields.frameAvailableListener == NULL) { if (fields.frameAvailableListener == NULL) {
ALOGE("can't find android/graphics/SurfaceTexture.%s", ALOGE("can't find android/graphics/SurfaceTexture.%s",
ANDROID_GRAPHICS_FRAMEAVAILABLELISTENER_JNI_ID); ANDROID_GRAPHICS_FRAMEAVAILABLELISTENER_JNI_ID);

6
graphics/java/android/graphics/SurfaceTexture.java
View File

@ -69,9 +69,9 @@ public class SurfaceTexture {
/** /**
* These fields are used by native code, do not access or modify. * These fields are used by native code, do not access or modify.
*/ */
private int mSurfaceTexture; private long mSurfaceTexture;
private int mBufferQueue; private long mBufferQueue;
private int mFrameAvailableListener; private long mFrameAvailableListener;
/** /**
* Callback interface for being notified that a new stream frame is available. * Callback interface for being notified that a new stream frame is available.