diff options
| -rw-r--r-- | media/java/android/media/AudioDeviceInfo.java | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/media/java/android/media/AudioDeviceInfo.java b/media/java/android/media/AudioDeviceInfo.java index b41f40f412d2..5689df0784f0 100644 --- a/media/java/android/media/AudioDeviceInfo.java +++ b/media/java/android/media/AudioDeviceInfo.java @@ -548,8 +548,45 @@ public final class AudioDeviceInfo { return counts; } + /** @hide */ + @IntDef(flag = true, prefix = "AudioFormat.CHANNEL_OUT_", value = { + AudioFormat.CHANNEL_INVALID, + AudioFormat.CHANNEL_OUT_DEFAULT, + AudioFormat.CHANNEL_OUT_FRONT_LEFT, + AudioFormat.CHANNEL_OUT_FRONT_RIGHT, + AudioFormat.CHANNEL_OUT_FRONT_CENTER, + AudioFormat.CHANNEL_OUT_LOW_FREQUENCY, + AudioFormat.CHANNEL_OUT_BACK_LEFT, + AudioFormat.CHANNEL_OUT_BACK_RIGHT, + AudioFormat.CHANNEL_OUT_FRONT_LEFT_OF_CENTER, + AudioFormat.CHANNEL_OUT_FRONT_RIGHT_OF_CENTER, + AudioFormat.CHANNEL_OUT_BACK_CENTER, + AudioFormat.CHANNEL_OUT_SIDE_LEFT, + AudioFormat.CHANNEL_OUT_SIDE_RIGHT, + AudioFormat.CHANNEL_OUT_TOP_CENTER, + AudioFormat.CHANNEL_OUT_TOP_FRONT_LEFT, + AudioFormat.CHANNEL_OUT_TOP_FRONT_CENTER, + AudioFormat.CHANNEL_OUT_TOP_FRONT_RIGHT, + AudioFormat.CHANNEL_OUT_TOP_BACK_LEFT, + AudioFormat.CHANNEL_OUT_TOP_BACK_CENTER, + AudioFormat.CHANNEL_OUT_TOP_BACK_RIGHT, + AudioFormat.CHANNEL_OUT_TOP_SIDE_LEFT, + AudioFormat.CHANNEL_OUT_TOP_SIDE_RIGHT, + AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_LEFT, + AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_CENTER, + AudioFormat.CHANNEL_OUT_BOTTOM_FRONT_RIGHT, + AudioFormat.CHANNEL_OUT_LOW_FREQUENCY_2, + AudioFormat.CHANNEL_OUT_FRONT_WIDE_LEFT, + AudioFormat.CHANNEL_OUT_FRONT_WIDE_RIGHT} + ) + @Retention(RetentionPolicy.SOURCE) + @FlaggedApi(FLAG_SPEAKER_LAYOUT_API) + public @interface SpeakerLayoutChannelMask {} + /** - * @return A ChannelMask representing the physical output speaker layout of the device. + * @return A ChannelMask representing the speaker layout of a TYPE_BUILTIN_SPEAKER device. + * + * Valid only for speakers built-in to the device. * * The layout channel mask only indicates which speaker channels are present, the * physical layout of the speakers should be informed by a standard for multi-channel @@ -557,6 +594,7 @@ public final class AudioDeviceInfo { * @see AudioFormat */ @FlaggedApi(FLAG_SPEAKER_LAYOUT_API) + @SpeakerLayoutChannelMask public int getSpeakerLayoutChannelMask() { return mPort.speakerLayoutChannelMask(); } |