Bug 4571308 Test video timestamps

Change-Id: I4d1fe3b9e090fe014c45432a91ea43360213ee2e

diff --git a/wilhelm/tests/native-media/res/layout/main.xml b/wilhelm/tests/native-media/res/layout/main.xml
index bfe6c09..d303b19 100644 (file)
--- a/wilhelm/tests/native-media/res/layout/main.xml
+++ b/wilhelm/tests/native-media/res/layout/main.xml
@@ -56,6 +56,25 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     >
+    <Button
+        android:id="@+id/rewind_java"
+        android:text="@string/rewind_java"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        />
+    <Button
+        android:id="@+id/rewind_native"
+        android:text="@string/rewind_native"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        />
+</LinearLayout>
+
+<LinearLayout
+    android:orientation="horizontal"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    >
     <TextView
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"

diff --git a/wilhelm/tests/native-media/res/values/strings.xml b/wilhelm/tests/native-media/res/values/strings.xml
index 2cf45da..2b5207e 100644 (file)
--- a/wilhelm/tests/native-media/res/values/strings.xml
+++ b/wilhelm/tests/native-media/res/values/strings.xml
@@ -6,6 +6,9 @@
     <string name="start_java">Start/Pause Java MediaPlayer</string>
     <string name="start_native">Start/Pause native MediaPlayer</string>
 
+    <string name="rewind_java">Rewind Java MediaPlayer</string>
+    <string name="rewind_native">Rewind native MediaPlayer</string>
+
     <string name="source_select">Please select the media source</string>
     <string name="source_prompt">Media source</string>
     <string-array name="source_array">

diff --git a/wilhelm/tests/native-media/src/com/example/nativemedia/MyGLSurfaceView.java b/wilhelm/tests/native-media/src/com/example/nativemedia/MyGLSurfaceView.java
index 20a4cdd..c3f4ce1 100644 (file)
--- a/wilhelm/tests/native-media/src/com/example/nativemedia/MyGLSurfaceView.java
+++ b/wilhelm/tests/native-media/src/com/example/nativemedia/MyGLSurfaceView.java
@@ -306,6 +306,7 @@ class MyRenderer implements GLSurfaceView.Renderer, SurfaceTexture.OnFrameAvaila
          * so let's be safe and use synchronize. No OpenGL calls can be done here.
          */
         updateSurface = true;
+        //Log.v(TAG, "onFrameAvailable " + surface.getTimestamp());
     }
 
     private void doPhysics(long timestamp) {

diff --git a/wilhelm/tests/native-media/src/com/example/nativemedia/NativeMedia.java b/wilhelm/tests/native-media/src/com/example/nativemedia/NativeMedia.java
index 6120776..294372e 100644 (file)
--- a/wilhelm/tests/native-media/src/com/example/nativemedia/NativeMedia.java
+++ b/wilhelm/tests/native-media/src/com/example/nativemedia/NativeMedia.java
@@ -269,6 +269,20 @@ public class NativeMedia extends Activity {
 
         });
 
+        // Java MediaPlayer rewind
+
+        ((Button) findViewById(R.id.rewind_java)).setOnClickListener(new View.OnClickListener() {
+
+            public void onClick(View view) {
+                if (mMediaPlayerIsPrepared) {
+                    mMediaPlayer.seekTo(0);
+                }
+            }
+
+        });
+
+        // FIXME native MediaPlayer rewind
+
     }
 
     /** Called when the activity is about to be paused. */