diff options
author | Sharad Sangle <assangle@codeaurora.org> | 2015-07-25 00:32:13 +0530 |
---|---|---|
committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:29:23 -0600 |
commit | 6081af49142af715a7d5ead12a48820d6c2c65da (patch) | |
tree | c4dcda36cb4d1eb43d3293eb90197c9d87e0487c | |
parent | 01223d41d21a616555e11dc09008190b263c4b88 (diff) | |
download | android_system_media-6081af49142af715a7d5ead12a48820d6c2c65da.tar.gz android_system_media-6081af49142af715a7d5ead12a48820d6c2c65da.tar.bz2 android_system_media-6081af49142af715a7d5ead12a48820d6c2c65da.zip |
audio: add ALAC/APE/WMA format in audio.h
add ALAC/APE/ALAC as a valid audio format in audio.h
add field for bit width in offload structure
Change-Id: I35bba7a608f636337d4c8b4afd4cdf9fe476018a
-rw-r--r-- | audio/include/system/audio.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/audio/include/system/audio.h b/audio/include/system/audio.h index 3b101925..500ac644 100644 --- a/audio/include/system/audio.h +++ b/audio/include/system/audio.h @@ -263,7 +263,11 @@ typedef enum { AUDIO_FORMAT_E_AC3 = 0x0A000000UL, AUDIO_FORMAT_DTS = 0x0B000000UL, AUDIO_FORMAT_DTS_HD = 0x0C000000UL, + AUDIO_FORMAT_WMA = 0x13000000UL, + AUDIO_FORMAT_WMA_PRO = 0x14000000UL, AUDIO_FORMAT_FLAC = 0x1D000000UL, + AUDIO_FORMAT_ALAC = 0x1F000000UL, + AUDIO_FORMAT_APE = 0x20000000UL, AUDIO_FORMAT_MAIN_MASK = 0xFF000000UL, AUDIO_FORMAT_SUB_MASK = 0x00FFFFFFUL, @@ -784,6 +788,7 @@ typedef struct { int64_t duration_us; // duration in microseconds, -1 if unknown bool has_video; // true if stream is tied to a video stream bool is_streaming; // true if streaming, false if local playback + uint32_t bit_width; } audio_offload_info_t; #define AUDIO_MAKE_OFFLOAD_INFO_VERSION(maj,min) \ @@ -1377,6 +1382,10 @@ static inline bool audio_is_valid_format(audio_format_t format) case AUDIO_FORMAT_DTS: case AUDIO_FORMAT_DTS_HD: case AUDIO_FORMAT_FLAC: + case AUDIO_FORMAT_ALAC: + case AUDIO_FORMAT_APE: + case AUDIO_FORMAT_WMA: + case AUDIO_FORMAT_WMA_PRO: return true; case AUDIO_FORMAT_PCM_OFFLOAD: if (format != AUDIO_FORMAT_PCM_16_BIT_OFFLOAD && |