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

Commit 317510ff authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Add AudioFormat.ENCODING_PCM_FLOAT"

parents c9e7b1e3 313f5988

core/jni/android_media_AudioFormat.h

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
// keep these values in sync with AudioFormat.java

#define ENCODING_PCM_16BIT 2

#define ENCODING_PCM_8BIT  3

#define ENCODING_PCM_FLOAT 4



static inline audio_format_t audioFormatToNative(int audioFormat)

{
@@ -30,6 +31,8 @@ static inline audio_format_t audioFormatToNative(int audioFormat) 
        return AUDIO_FORMAT_PCM_16_BIT;

    case ENCODING_PCM_8BIT:

        return AUDIO_FORMAT_PCM_8_BIT;

    case ENCODING_PCM_FLOAT:

        return AUDIO_FORMAT_PCM_FLOAT;

    default:

        return AUDIO_FORMAT_INVALID;

    }

media/java/android/media/AudioFormat.java

+3 −1
Original line number Diff line number Diff line
@@ -32,11 +32,13 @@ public class AudioFormat { 
    /** Default audio data format */

    public static final int ENCODING_DEFAULT = 1;



    // These two values must be kept in sync with core/jni/android_media_AudioFormat.h

    // These values must be kept in sync with core/jni/android_media_AudioFormat.h

    /** Audio data format: PCM 16 bit per sample. Guaranteed to be supported by devices. */

    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 */

    public static final int ENCODING_PCM_FLOAT = 4;



    /** Invalid audio channel configuration */

    /** @deprecated use CHANNEL_INVALID instead  */