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

Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854112

Change-Id: I1092479277df8a9da366a8b609eb234f33ceb984
This commit is contained in:
Hayden Gomes
2020-06-18 14:24:40 +00:00
committed by Automerger Merge Worker
parent a4b75fcbf4 ee67875159
commit ecea6e9950
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android_media_AudioFormat.h
View File

@@ -47,6 +47,7 @@
#define CHANNEL_INVALID 0 #define CHANNEL_INVALID 0
#define CHANNEL_OUT_DEFAULT 1 #define CHANNEL_OUT_DEFAULT 1
#define CHANNEL_IN_DEFAULT 1
static inline audio_format_t audioFormatToNative(int audioFormat) static inline audio_format_t audioFormatToNative(int audioFormat)
{ {
@@ -196,12 +197,22 @@ static inline int outChannelMaskFromNative(audio_channel_mask_t nativeMask)
static inline audio_channel_mask_t inChannelMaskToNative(int channelMask) static inline audio_channel_mask_t inChannelMaskToNative(int channelMask)
{ {
return (audio_channel_mask_t)channelMask; switch (channelMask) {
case CHANNEL_IN_DEFAULT:
return AUDIO_CHANNEL_NONE;
default:
return (audio_channel_mask_t)channelMask;
}
} }
static inline int inChannelMaskFromNative(audio_channel_mask_t nativeMask) static inline int inChannelMaskFromNative(audio_channel_mask_t nativeMask)
{ {
return (int)nativeMask; switch (nativeMask) {
case AUDIO_CHANNEL_NONE:
return CHANNEL_IN_DEFAULT;
default:
return (int)nativeMask;
}
} }
#endif // ANDROID_MEDIA_AUDIOFORMAT_H #endif // ANDROID_MEDIA_AUDIOFORMAT_H