Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f4a392e authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "Unhide AudioTimestamp and getTimestamp" into klp-dev

parents edaf6af1 5e8f278f
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -12139,6 +12139,12 @@ package android.media {
    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 {
    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;
@@ -12161,6 +12167,7 @@ package android.media {
    method public int getSampleRate();
    method public int getState();
    method public int getStreamType();
    method public android.media.AudioTimestamp getTimestamp(android.media.AudioTimestamp);
    method public void pause() throws java.lang.IllegalStateException;
    method public void play() throws java.lang.IllegalStateException;
    method public void release();
+0 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ package android.media;
 * is available to the system, but cannot account for any delay unknown to the implementation.
 *
 * @see AudioTrack#getTimestamp
 * @see AudioTrack.TimestampListener
 *
 * @hide
 */
public final class AudioTimestamp
{
+1 −4
Original line number Diff line number Diff line
@@ -735,8 +735,7 @@ public class AudioTrack
   /**
    * Poll for a timestamp on demand.
    *
    * Use if {@link TimestampListener} is not delivered often enough for your needs,
    * or if you need to get the most recent timestamp outside of the event callback handler.
    * Use if you need to get the most recent timestamp outside of the event callback handler.
    * Calling this method too often may be inefficient;
    * if you need a high-resolution mapping between frame position and presentation time,
    * 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
    *         be presented.
    *         In the case that no timestamp is available, any supplied instance is left unaltered.
    *
    * @hide
    */
    public AudioTimestamp getTimestamp(AudioTimestamp timestamp)
    {