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

Commit 40cf0590 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 750a2b05: Merge "Unhide AudioTrack support for ENCODING_PCM_FLOAT" 

* commit '750a2b05a54612c6ed2aa8796e659b00bf21caa0':
  Unhide AudioTrack support for ENCODING_PCM_FLOAT
parents 8ce0279f 4b0c3460

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -13374,6 +13374,7 @@ package android.media { 
    field public static final int ENCODING_INVALID = 0; // 0x0

    field public static final int ENCODING_PCM_16BIT = 2; // 0x2

    field public static final int ENCODING_PCM_8BIT = 3; // 0x3

    field public static final int ENCODING_PCM_FLOAT = 4; // 0x4

  }















  public class AudioManager {










@@ -13591,6 +13592,7 @@ package android.media {













    method public void stop() throws java.lang.IllegalStateException;















    method public int write(byte[], int, int);















    method public int write(short[], int, int);













    method public int write(float[], int, int, int);















    method public int write(java.nio.ByteBuffer, int, int);















    field public static final int ERROR = -1; // 0xffffffff















    field public static final int ERROR_BAD_VALUE = -2; // 0xfffffffe

























media/java/android/media/AudioFormat.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -37,7 +37,7 @@ public class AudioFormat {













    public static final int ENCODING_PCM_16BIT = 2;















    /** Audio data format: PCM 8 bit per sample. Not guaranteed to be supported by devices. */















    public static final int ENCODING_PCM_8BIT = 3;













    /** @hide Candidate for public API */













    /** Audio data format: single-precision floating-point per sample */















    public static final int ENCODING_PCM_FLOAT = 4;































    /** Invalid audio channel configuration */

































media/java/android/media/AudioTrack.java



+11
−12




























Original line number
Diff line number
Diff line








@@ -42,7 +42,8 @@ import com.android.internal.app.IAppOpsService;













 * The AudioTrack class manages and plays a single audio resource for Java applications.















 * It allows streaming of PCM audio buffers to the audio sink for playback. This is















 * achieved by "pushing" the data to the AudioTrack object using one of the













 *  {@link #write(byte[], int, int)} and {@link #write(short[], int, int)} methods.













 *  {@link #write(byte[], int, int)}, {@link #write(short[], int, int)},













 *  and {@link #write(float[], int, int, int)} methods.















 *















 * <p>An AudioTrack instance can operate under two modes: static or streaming.<br>















 * In Streaming mode, the application writes a continuous stream of data to the AudioTrack, using










@@ -72,7 +73,6 @@ import com.android.internal.app.IAppOpsService;













 *















 * AudioTrack is not final and thus permits subclasses, but such use is not recommended.















 */













// add {@link #write(float[], int, int)} when @hide removed















public class AudioTrack















{















    //---------------------------------------------------------










@@ -245,8 +245,8 @@ public class AudioTrack













     * The encoding of the audio samples.















     * @see AudioFormat#ENCODING_PCM_8BIT















     * @see AudioFormat#ENCODING_PCM_16BIT













     * @see AudioFormat#ENCODING_PCM_FLOAT















     */













    // add @see AudioFormat#ENCODING_PCM_FLOAT when @hide removed















    private int mAudioFormat = AudioFormat.ENCODING_PCM_16BIT;















    /**















     * Audio session ID










@@ -287,8 +287,9 @@ public class AudioTrack













     *   See {@link AudioFormat#CHANNEL_OUT_MONO} and















     *   {@link AudioFormat#CHANNEL_OUT_STEREO}















     * @param audioFormat the format in which the audio data is represented.













     *   See {@link AudioFormat#ENCODING_PCM_16BIT} and













     *   {@link AudioFormat#ENCODING_PCM_8BIT}













     *   See {@link AudioFormat#ENCODING_PCM_16BIT},













     *   {@link AudioFormat#ENCODING_PCM_8BIT},













     *   and {@link AudioFormat#ENCODING_PCM_FLOAT}.















     * @param bufferSizeInBytes the total size (in bytes) of the internal buffer where audio data is















     *   read from for playback.















     *   If track's creation mode is {@link #MODE_STREAM}, you can write data into









@@ -302,7 +303,6 @@ public class AudioTrack













     * @param mode streaming or static buffer. See {@link #MODE_STATIC} and {@link #MODE_STREAM}















     * @throws java.lang.IllegalArgumentException















     */













    // add {@link AudioFormat#ENCODING_PCM_FLOAT} to audioFormat section above, when @hide removed















    public AudioTrack(int streamType, int sampleRateInHz, int channelConfig, int audioFormat,















            int bufferSizeInBytes, int mode)















    throws IllegalArgumentException {










@@ -332,7 +332,8 @@ public class AudioTrack













     *   {@link AudioFormat#CHANNEL_OUT_STEREO}















     * @param audioFormat the format in which the audio data is represented.















     *   See {@link AudioFormat#ENCODING_PCM_16BIT} and













     *   {@link AudioFormat#ENCODING_PCM_8BIT}













     *   {@link AudioFormat#ENCODING_PCM_8BIT},













     *   and {@link AudioFormat#ENCODING_PCM_FLOAT}.















     * @param bufferSizeInBytes the total size (in bytes) of the buffer where audio data is read















     *   from for playback. If using the AudioTrack in streaming mode, you can write data into















     *   this buffer in smaller chunks than this size. If using the AudioTrack in static mode,









@@ -344,7 +345,6 @@ public class AudioTrack













     * @param sessionId Id of audio session the AudioTrack must be attached to















     * @throws java.lang.IllegalArgumentException















     */













    // add {@link AudioFormat#ENCODING_PCM_FLOAT} to audioFormat section above, when @hide removed















    public AudioTrack(int streamType, int sampleRateInHz, int channelConfig, int audioFormat,















            int bufferSizeInBytes, int mode, int sessionId)















    throws IllegalArgumentException {










@@ -469,7 +469,7 @@ public class AudioTrack













        default:















            throw new IllegalArgumentException("Unsupported sample encoding."















                + " Should be ENCODING_PCM_8BIT or ENCODING_PCM_16BIT"













             // + " or ENCODING_PCM_FLOAT" when @hide removed













                + " or ENCODING_PCM_FLOAT"















                + ".");















        }


























@@ -730,12 +730,12 @@ public class AudioTrack













     *   {@link AudioFormat#CHANNEL_OUT_STEREO}















     * @param audioFormat the format in which the audio data is represented.















     *   See {@link AudioFormat#ENCODING_PCM_16BIT} and













     *   {@link AudioFormat#ENCODING_PCM_8BIT}













     *   {@link AudioFormat#ENCODING_PCM_8BIT},













     *   and {@link AudioFormat#ENCODING_PCM_FLOAT}.















     * @return {@link #ERROR_BAD_VALUE} if an invalid parameter was passed,















     *   or {@link #ERROR} if unable to query for output properties,















     *   or the minimum buffer size expressed in bytes.















     */













    // add {@link AudioFormat#ENCODING_PCM_FLOAT} to audioFormat section above, when @hide removed















    static public int getMinBufferSize(int sampleRateInHz, int channelConfig, int audioFormat) {















        int channelCount = 0;















        switch(channelConfig) {










@@ -1259,7 +1259,6 @@ public class AudioTrack













     * @return the number of floats that were written, or {@link #ERROR_INVALID_OPERATION}















     *    if the object wasn't properly initialized, or {@link #ERROR_BAD_VALUE} if















     *    the parameters don't resolve to valid data and indexes.













     * @hide candidate for public API















     */















    public int write(float[] audioData, int offsetInFloats, int sizeInFloats,















            @WriteMode int writeMode) {