Merge "Add support for timestamps into SurfaceTexture."

2011-03-17 15:52:34 -07:00
parent 6764ba4482 c5f94d8a47
commit ce06ebfda4
13 changed files with 163 additions and 20 deletions
--- a/media/java/android/media/MediaPlayer.java
+++ b/media/java/android/media/MediaPlayer.java
@ -623,6 +623,11 @@ public class MediaPlayer
     * being played. Note that if a SurfaceTexture is used, the value
     * set via setScreenOnWhilePlaying has no effect.
     *
+     * The timestamps provided by {@link SurfaceTexture#getTimestamp()} for a
+     * SurfaceTexture set as the video sink have an unspecified zero point,
+     * and cannot be directly compared between different media sources or different
+     * instances of the same media source, or across multiple runs of the same
+     * program.
     * @hide
     */
    public void setTexture(SurfaceTexture st) {