diff --git a/api/current.xml b/api/current.xml index 112c14760d043..d353d72cd584e 100644 --- a/api/current.xml +++ b/api/current.xml @@ -85932,6 +85932,70 @@ + + + + + + + + + + + + + + + + + + + +#include + +#include + +#include +#include + +#include "android/graphics/GraphicsJNI.h" +#include "jni.h" + +// ---------------------------------------------------------------------------- + +namespace android { + +static const char* const OutOfResourcesException = + "android/graphics/SurfaceTexture$OutOfResourcesException"; + +struct st_t { + jfieldID surfaceTexture; +}; +static st_t st; + +// ---------------------------------------------------------------------------- + +static void setSurfaceTexture(JNIEnv* env, jobject clazz, + const sp& surfaceTexture) +{ + SurfaceTexture* const p = + (SurfaceTexture*)env->GetIntField(clazz, st.surfaceTexture); + if (surfaceTexture.get()) { + surfaceTexture->incStrong(clazz); + } + if (p) { + p->decStrong(clazz); + } + env->SetIntField(clazz, st.surfaceTexture, (int)surfaceTexture.get()); +} + +sp getSurfaceTexture(JNIEnv* env, jobject clazz) +{ + sp surfaceTexture( + (SurfaceTexture*)env->GetIntField(clazz, st.surfaceTexture)); + return surfaceTexture; +} + +// ---------------------------------------------------------------------------- + +static void SurfaceTexture_init(JNIEnv* env, jobject clazz, jint texName) +{ + sp surfaceTexture(new SurfaceTexture(texName)); + + if (surfaceTexture == 0) { + doThrow(env, OutOfResourcesException); + return; + } + setSurfaceTexture(env, clazz, surfaceTexture); +} + +static void SurfaceTexture_updateTexImage(JNIEnv* env, jobject clazz) +{ + sp surfaceTexture(getSurfaceTexture(env, clazz)); + surfaceTexture->updateTexImage(); +} + +// ---------------------------------------------------------------------------- + +const char* const kSurfaceTextureClassPathName = "android/graphics/SurfaceTexture"; +static void nativeClassInit(JNIEnv* env, jclass clazz); + +static JNINativeMethod gSurfaceTextureMethods[] = { + {"nativeClassInit", "()V", (void*)nativeClassInit }, + {"init", "(I)V", (void*)SurfaceTexture_init }, + {"updateTexImage", "()V", (void*)SurfaceTexture_updateTexImage }, +}; + +static void nativeClassInit(JNIEnv* env, jclass clazz) +{ + st.surfaceTexture = env->GetFieldID(clazz, + ANDROID_GRAPHICS_SURFACETEXTURE_JNI_ID, "I"); +} + +int register_android_graphics_SurfaceTexture(JNIEnv* env) +{ + int err = 0; + err = AndroidRuntime::registerNativeMethods(env, kSurfaceTextureClassPathName, + gSurfaceTextureMethods, NELEM(gSurfaceTextureMethods)); + return err; +} + +} // namespace android diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java new file mode 100644 index 0000000000000..883c4ebbb750c --- /dev/null +++ b/graphics/java/android/graphics/SurfaceTexture.java @@ -0,0 +1,90 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.graphics; + +/** + * Captures frames from an image stream as an OpenGL ES texture. + * + *

The image stream may come from either video playback or camera preview. A SurfaceTexture may + * be used in place of a SurfaceHolder when specifying the output destination of a MediaPlayer or + * Camera object. This will cause all the frames from that image stream to be sent to the + * SurfaceTexture object rather than to the device's display. When {@link #updateTexImage} is + * called, the contents of the texture object specified when the SurfaceTexture was created is + * updated to contain the most recent image from the image stream. This may cause some frames of + * the stream to be skipped. + * + *

The texture object uses the GL_TEXTURE_EXTERNAL_OES texture target, which is defined by the + * OES_EGL_image_external OpenGL ES extension. This limits how the texture may be used. + */ +public class SurfaceTexture { + + @SuppressWarnings("unused") + private int mSurfaceTexture; + + /** + * Callback interface for being notified that a new stream frame is available. + */ + public interface OnFrameAvailableListener { + void onFrameAvailable(SurfaceTexture surfaceTexture); + } + + /** + * Exception thrown when a surface couldn't be created or resized + */ + public static class OutOfResourcesException extends Exception { + public OutOfResourcesException() { + } + public OutOfResourcesException(String name) { + super(name); + } + } + + /** + * Construct a new SurfaceTexture to stream images to a given OpenGL texture. + * + * @param texName the OpenGL texture object name (e.g. generated via glGenTextures) + */ + public SurfaceTexture(int texName) { + init(texName); + } + + /** + * Register a callback to be invoked when a new image frame becomes available to the + * SurfaceTexture. Note that this callback may be called on an arbitrary thread, so it is not + * safe to call {@link #updateTexImage} without first binding the OpenGL ES context to the + * thread invoking the callback. + */ + public void setOnFrameAvailableListener(OnFrameAvailableListener l) { + // TODO: Implement this! + } + + /** + * Update the texture image to the most recent frame from the image stream. This may only be + * called while the OpenGL ES context that owns the texture is bound to the thread. It will + * implicitly bind its texture to the GL_TEXTURE_EXTERNAL_OES texture target. + */ + public native void updateTexImage(); + + private native void init(int texName); + + /* + * We use a class initializer to allow the native code to cache some + * field offsets. + */ + private static native void nativeClassInit(); + static { nativeClassInit(); } +}