Merge "SpatializerHelper: Fix device compatibility with spatial audio" am: fe4b37a3ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2209998

Change-Id: Ic566e0fc5fd9ab05992795176137a799052cb5fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Hung
2022-09-08 17:51:03 +00:00
committed by Automerger Merge Worker

View File

@@ -709,8 +709,11 @@ public class SpatializerHelper {
} }
private boolean isDeviceCompatibleWithSpatializationModes(@NonNull AudioDeviceAttributes ada) { private boolean isDeviceCompatibleWithSpatializationModes(@NonNull AudioDeviceAttributes ada) {
// modeForDevice will be neither transaural or binaural for devices that do not support
// spatial audio. For instance mono devices like earpiece, speaker safe or sco must
// not be included.
final byte modeForDevice = (byte) SPAT_MODE_FOR_DEVICE_TYPE.get(ada.getType(), final byte modeForDevice = (byte) SPAT_MODE_FOR_DEVICE_TYPE.get(ada.getType(),
/*default when type not found*/ SpatializationMode.SPATIALIZER_BINAURAL); /*default when type not found*/ -1);
if ((modeForDevice == SpatializationMode.SPATIALIZER_BINAURAL && mBinauralSupported) if ((modeForDevice == SpatializationMode.SPATIALIZER_BINAURAL && mBinauralSupported)
|| (modeForDevice == SpatializationMode.SPATIALIZER_TRANSAURAL || (modeForDevice == SpatializationMode.SPATIALIZER_TRANSAURAL
&& mTransauralSupported)) { && mTransauralSupported)) {