commit 09bc46f629d43102e8fe41d9a552e73d445b0f01
author Glenn Kasten <gkasten@google.com> Tue Nov 15 15:24:47 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 15 15:24:47 2011 -0800
tree 9e2344e54dfae796edd44d369afab1039975847e
parent e5ce0bdb3aca8976465b9e2e55b1267e48aef44d
parent 738e761c42f146b655fa01707b82be25c2200d63

Merge "Remove private ANativeWindow_fromSurfaceTexture"

tests/native-media/jni/native-media-jni.c

diff --git a/tests/native-media/jni/native-media-jni.c b/tests/native-media/jni/native-media-jni.c
index fd1d75d..6c5a283 100644
--- a/tests/native-media/jni/native-media-jni.c
+++ b/tests/native-media/jni/native-media-jni.c
@@ -518,15 +518,6 @@
 }
 
 
-// set the surface texture
-void Java_com_example_nativemedia_NativeMedia_setSurfaceTexture(JNIEnv *env, jclass clazz,
-        jobject surfaceTexture)
-{
-    // obtain a native window from a Java surface texture
-    theNativeWindow = ANativeWindow_fromSurfaceTexture(env, surfaceTexture);
-}
-
-
 // rewind the streaming media player
 void Java_com_example_nativemedia_NativeMedia_rewindStreamingMediaPlayer(JNIEnv *env, jclass clazz)
 {

tests/native-media/src/com/example/nativemedia/NativeMedia.java

diff --git a/tests/native-media/src/com/example/nativemedia/NativeMedia.java b/tests/native-media/src/com/example/nativemedia/NativeMedia.java
index 82d579d..816d01f 100644
--- a/tests/native-media/src/com/example/nativemedia/NativeMedia.java
+++ b/tests/native-media/src/com/example/nativemedia/NativeMedia.java
@@ -331,7 +331,6 @@
     public static native void setPlayingStreamingMediaPlayer(boolean isPlaying);
     public static native void shutdown();
     public static native void setSurface(Surface surface);
-    public static native void setSurfaceTexture(SurfaceTexture surfaceTexture);
     public static native void rewindStreamingMediaPlayer();
 
     /** Load jni .so on initialization */
@@ -390,7 +389,9 @@
         }
 
         void useAsSinkForNative() {
-            setSurfaceTexture(mMyGLSurfaceView.getSurfaceTexture());
+            Surface surface = new Surface(mMyGLSurfaceView.getSurfaceTexture());
+            setSurface(surface);
+            surface.release();
         }
 
     }