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

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

Merge "Spatializer: update getSupportedHeadTrackingModes()" into tm-dev

parents 3c6e4eae 3815d85e

media/libaudioclient/aidl/android/media/ISpatializer.aidl

+4 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,10 @@ interface ISpatializer { 
    boolean isHeadTrackingSupported();

    boolean isHeadTrackingSupported();





    /** Reports the list of supported head tracking modes (see SpatializerHeadTrackingMode.aidl).

    /** Reports the list of supported head tracking modes (see SpatializerHeadTrackingMode.aidl).

     * The list can be empty if the spatializer implementation does not support head tracking or if

     * The list always contains SpatializerHeadTrackingMode.DISABLED and can include other modes

     * no head tracking sensor is registered (see setHeadSensor() and setScreenSensor()).

     * if the spatializer effect implementation supports head tracking.

     * The result does not depend on currently connected sensors but reflects the capabilities

     * when sensors are available.

     */

     */

    SpatializerHeadTrackingMode[] getSupportedHeadTrackingModes();

    SpatializerHeadTrackingMode[] getSupportedHeadTrackingModes();

services/audiopolicy/service/Spatializer.cpp

+1 −6
Original line number Original line Diff line number Diff line
@@ -342,12 +342,7 @@ Status Spatializer::getSupportedHeadTrackingModes( 




    modes->push_back(SpatializerHeadTrackingMode::DISABLED);

    modes->push_back(SpatializerHeadTrackingMode::DISABLED);

    if (mSupportsHeadTracking) {

    if (mSupportsHeadTracking) {

        if (mHeadSensor != SpatializerPoseController::INVALID_SENSOR) {

        modes->push_back(SpatializerHeadTrackingMode::RELATIVE_WORLD);

        modes->push_back(SpatializerHeadTrackingMode::RELATIVE_WORLD);

            if (mScreenSensor != SpatializerPoseController::INVALID_SENSOR) {

                modes->push_back(SpatializerHeadTrackingMode::RELATIVE_SCREEN);

            }

        }

    }

    }

    return Status::ok();

    return Status::ok();

}

}