summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-12-04 02:49:33 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-12-04 02:49:33 +0000
commit3af0f3a7c33454b7847a64a7c1ea550e4dbe9432 (patch)
tree96d80564ed69d3756000da899b0c90bd252507f7
parent402f60848cb1f12a35c620c602975d5974723b0e (diff)
parentbff3dae8090700279de5d1a564f889f304b18939 (diff)
Merge "Specify AudioTrack HWAVSync timestamp units as nanoseconds"
-rw-r--r--media/java/android/media/AudioTrack.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java
index c226d49c6af7..71736dd38e91 100644
--- a/media/java/android/media/AudioTrack.java
+++ b/media/java/android/media/AudioTrack.java
@@ -2620,7 +2620,8 @@ public class AudioTrack extends PlayerBase
* to the audio sink.
* <BR>With {@link #WRITE_NON_BLOCKING}, the write will return immediately after
* queuing as much audio data for playback as possible without blocking.
- * @param timestamp The timestamp of the first decodable audio frame in the provided audioData.
+ * @param timestamp The timestamp, in nanoseconds, of the first decodable audio frame in the
+ * provided audioData.
* @return zero or the positive number of bytes that were written, or one of the following
* error codes.
* <ul>