commit 738e761c42f146b655fa01707b82be25c2200d63
author Glenn Kasten <gkasten@google.com> Fri Nov 11 17:03:59 2011 -0800
committer Glenn Kasten <gkasten@google.com> Fri Nov 11 17:10:21 2011 -0800
tree a74783bb70e0fa30e5d7b9fe1777922ab5a5fdcf
parent 047916c6e882878075e42a7a5986a6bc1b0cf489

Remove private ANativeWindow_fromSurfaceTexture

ANativeWindow_fromSurfaceTexture was a private API that is now deprecated
and is being removed in a separate CL.  This change replaces all the
known uses by the preferred API ANativeWindow_fromSurface.

Note: a Surface can be derived from a SurfaceTexture by:

    SurfaceTexture st = ...;
    Surface s = new Surface(st);
    // use s
    s.release();

Change-Id: Ia55c023fc1487177ec76ae406ed77193083c9eac

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();
         }
 
     }