Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8af2e8d authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "SpatializerHelper: assimilate speaker safe to speaker device for SA... 

Merge "SpatializerHelper: assimilate speaker safe to speaker device for SA compatibility" into 24D1-dev
parents e0272690 25845858

services/core/java/com/android/server/audio/SpatializerHelper.java

+5 −1
Original line number Diff line number Diff line
@@ -88,6 +88,10 @@ public class SpatializerHelper { 
    /*package*/ static final SparseIntArray SPAT_MODE_FOR_DEVICE_TYPE = new SparseIntArray(14) {

        {

            append(AudioDeviceInfo.TYPE_BUILTIN_SPEAKER, Spatialization.Mode.TRANSAURAL);

            // Speaker safe is considered compatible with spatial audio because routing media usage

            // to speaker safe only happens in transient situations and should not affect app

            // decisions to play spatial audio content.

            append(AudioDeviceInfo.TYPE_BUILTIN_SPEAKER_SAFE, Spatialization.Mode.TRANSAURAL);

            append(AudioDeviceInfo.TYPE_WIRED_HEADSET, Spatialization.Mode.BINAURAL);

            append(AudioDeviceInfo.TYPE_WIRED_HEADPHONES, Spatialization.Mode.BINAURAL);

            // assumption for A2DP: mostly headsets
@@ -805,7 +809,7 @@ public class SpatializerHelper { 


    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

        // spatial audio. For instance mono devices like earpiece or sco must

        // not be included.

        final byte modeForDevice = (byte) SPAT_MODE_FOR_DEVICE_TYPE.get(ada.getType(),

                /*default when type not found*/ -1);