Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9f4a392e: Merge "Unhide AudioTimestamp and getTimestamp" into klp-dev

Browse Source 
* commit '9f4a392e367c9702ccce254afd612d2c2ae3f58c':
  Unhide AudioTimestamp and getTimestamp
This commit is contained in:
Eric Laurent
2013-09-06 19:19:36 -07:00
committed by Android Git Automerger
parent 8091f2262f 9f4a392e36
commit 533587d805
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
api/current.txt
View File

@@ -12139,6 +12139,12 @@ package android.media {
method public abstract void onPeriodicNotification(android.media.AudioRecord); method public abstract void onPeriodicNotification(android.media.AudioRecord);
} }
public final class AudioTimestamp {
ctor public AudioTimestamp();
field public long framePosition;
field public long nanoTime;
}
public class AudioTrack { public class AudioTrack {
ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException; ctor public AudioTrack(int, int, int, int, int, int) throws java.lang.IllegalArgumentException;
ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException; ctor public AudioTrack(int, int, int, int, int, int, int) throws java.lang.IllegalArgumentException;
@@ -12161,6 +12167,7 @@ package android.media {
method public int getSampleRate(); method public int getSampleRate();
method public int getState(); method public int getState();
method public int getStreamType(); method public int getStreamType();
method public android.media.AudioTimestamp getTimestamp(android.media.AudioTimestamp);
method public void pause() throws java.lang.IllegalStateException; method public void pause() throws java.lang.IllegalStateException;
method public void play() throws java.lang.IllegalStateException; method public void play() throws java.lang.IllegalStateException;
method public void release(); method public void release();

3
media/java/android/media/AudioTimestamp.java
View File

@@ -26,9 +26,6 @@ package android.media;
* is available to the system, but cannot account for any delay unknown to the implementation. * is available to the system, but cannot account for any delay unknown to the implementation.
* *
* @see AudioTrack#getTimestamp * @see AudioTrack#getTimestamp
* @see AudioTrack.TimestampListener
*
* @hide
*/ */
public final class AudioTimestamp public final class AudioTimestamp
{ {

5
media/java/android/media/AudioTrack.java
View File

@@ -735,8 +735,7 @@ public class AudioTrack
/** /**
* Poll for a timestamp on demand. * Poll for a timestamp on demand.
* *
* Use if {@link TimestampListener} is not delivered often enough for your needs, * Use if you need to get the most recent timestamp outside of the event callback handler.
* or if you need to get the most recent timestamp outside of the event callback handler.
* Calling this method too often may be inefficient; * Calling this method too often may be inefficient;
* if you need a high-resolution mapping between frame position and presentation time, * if you need a high-resolution mapping between frame position and presentation time,
* consider implementing that at application level, based on low-resolution timestamps. * consider implementing that at application level, based on low-resolution timestamps.
@@ -756,8 +755,6 @@ public class AudioTrack
* with the estimated time when that frame was presented or is committed to * with the estimated time when that frame was presented or is committed to
* be presented. * be presented.
* In the case that no timestamp is available, any supplied instance is left unaltered. * In the case that no timestamp is available, any supplied instance is left unaltered.
*
* @hide
*/ */
public AudioTimestamp getTimestamp(AudioTimestamp timestamp) public AudioTimestamp getTimestamp(AudioTimestamp timestamp)
{ {