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

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

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

Change-Id: Ia88959055ee9a35b95e7635d0a63bb934a8942b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Andy Hung
2022-09-08 19:07:11 +00:00
committed by Automerger Merge Worker
parent 41bd2e1eb7 ef3ecceecd
commit 5fc8a5a576
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/audio/SpatializerHelper.java
View File

@@ -713,8 +713,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)) {
@@ -1539,8 +1542,8 @@ public class SpatializerHelper {
@Override @Override
public String toString() { public String toString() {
return "type:" + mDeviceType + " addr:" + mDeviceAddress + " enabled:" + mEnabled return "type: " + mDeviceType + " addr: " + mDeviceAddress + " enabled: " + mEnabled
+ " HT:" + mHasHeadTracker + " HTenabled:" + mHeadTrackerEnabled; + " HT: " + mHasHeadTracker + " HTenabled: " + mHeadTrackerEnabled;
} }
String toPersistableString() { String toPersistableString() {