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

Commit 3b169aab authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "VolumeShaper: Make initialization consistent" into sc-dev

parents 1cdf387f e15409e6

aidl/android/media/InterpolatorConfig.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ import android.media.InterpolatorType; 
 * {@hide}

 * {@hide}

 */

 */

parcelable InterpolatorConfig {

parcelable InterpolatorConfig {

    InterpolatorType type;

    InterpolatorType type = InterpolatorType.CUBIC;

    /** For cubic interpolation, the boundary conditions in slope. */

    /** For cubic interpolation, the boundary conditions in slope. */

    float firstSlope;

    float firstSlope;

    float lastSlope;

    float lastSlope;

aidl/android/media/VolumeShaperConfiguration.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ import android.media.VolumeShaperConfigurationType; 
 * {@hide}

 * {@hide}

 */

 */

parcelable VolumeShaperConfiguration {

parcelable VolumeShaperConfiguration {

    VolumeShaperConfigurationType type;

    VolumeShaperConfigurationType type = VolumeShaperConfigurationType.ID;

    int id;

    int id;

    /** Bitmask, indexed by VolumeShaperConfigurationOptionFlag. */

    /** Bitmask, indexed by VolumeShaperConfigurationOptionFlag. */

    int optionFlags;

    int optionFlags;

include/media/Interpolator.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ public: 
    using InterpolatorType  = media::InterpolatorType;

    using InterpolatorType  = media::InterpolatorType;





    explicit Interpolator(

    explicit Interpolator(

            InterpolatorType interpolatorType = InterpolatorType::LINEAR,

            InterpolatorType interpolatorType = InterpolatorType::CUBIC,

            bool cache = true)

            bool cache = true)

        : mCache(cache)

        : mCache(cache)

        , mFirstSlope(0)

        , mFirstSlope(0)