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

Merge "Fix JAVA doc for AudioRecord and AudioTrack Builder" into nyc-dev

Browse Source
This commit is contained in:
Eric Laurent
2016-06-22 01:08:44 +00:00
committed by Android (Google) Code Review
parent cdb7434140 0f0da49fce
commit 34ed8ad3c2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/java/android/media/AudioRecord.java
View File

@@ -467,11 +467,11 @@ public class AudioRecord implements AudioRouting
* <p> * <p>
* If the audio source is not set with {@link #setAudioSource(int)}, * If the audio source is not set with {@link #setAudioSource(int)},
* {@link MediaRecorder.AudioSource#DEFAULT} is used. * {@link MediaRecorder.AudioSource#DEFAULT} is used.
* <br>If the audio format is not specified or is incomplete, its sample rate will be the * <br>If the audio format is not specified or is incomplete, its channel configuration will be
* default output sample rate of the device (see
* {@link AudioManager#PROPERTY_OUTPUT_SAMPLE_RATE}), its channel configuration will be
* {@link AudioFormat#CHANNEL_IN_MONO}, and the encoding will be * {@link AudioFormat#CHANNEL_IN_MONO}, and the encoding will be
* {@link AudioFormat#ENCODING_PCM_16BIT}. * {@link AudioFormat#ENCODING_PCM_16BIT}.
* The sample rate will depend on the device actually selected for capture and can be queried
* with {@link #getSampleRate()} method.
* <br>If the buffer size is not specified with {@link #setBufferSizeInBytes(int)}, * <br>If the buffer size is not specified with {@link #setBufferSizeInBytes(int)},
* the minimum buffer size for the source is used. * the minimum buffer size for the source is used.
*/ */

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

@@ -619,11 +619,11 @@ public class AudioTrack extends PlayerBase
* <p> * <p>
* If the audio attributes are not set with {@link #setAudioAttributes(AudioAttributes)}, * If the audio attributes are not set with {@link #setAudioAttributes(AudioAttributes)},
* attributes comprising {@link AudioAttributes#USAGE_MEDIA} will be used. * attributes comprising {@link AudioAttributes#USAGE_MEDIA} will be used.
* <br>If the audio format is not specified or is incomplete, its sample rate will be the * <br>If the audio format is not specified or is incomplete, its channel configuration will be
* default output sample rate of the device (see
* {@link AudioManager#PROPERTY_OUTPUT_SAMPLE_RATE}), its channel configuration will be
* {@link AudioFormat#CHANNEL_OUT_STEREO} and the encoding will be * {@link AudioFormat#CHANNEL_OUT_STEREO} and the encoding will be
* {@link AudioFormat#ENCODING_PCM_16BIT}. * {@link AudioFormat#ENCODING_PCM_16BIT}.
* The sample rate will depend on the device actually selected for playback and can be queried
* with {@link #getSampleRate()} method.
* <br>If the buffer size is not specified with {@link #setBufferSizeInBytes(int)}, * <br>If the buffer size is not specified with {@link #setBufferSizeInBytes(int)},
* and the mode is {@link AudioTrack#MODE_STREAM}, the minimum buffer size is used. * and the mode is {@link AudioTrack#MODE_STREAM}, the minimum buffer size is used.
* <br>If the transfer mode is not specified with {@link #setTransferMode(int)}, * <br>If the transfer mode is not specified with {@link #setTransferMode(int)},