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

Merge "Add AudioFormat.ENCODING_PCM_FLOAT"

Browse Source
This commit is contained in:
Glenn Kasten
2014-05-07 00:28:06 +00:00
committed by Android (Google) Code Review
parent c9e7b1e3da 313f59887b
commit 317510ff30
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/android_media_AudioFormat.h
View File

@@ -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;
}

4
media/java/android/media/AudioFormat.java
View File

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