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

Commit 1abccb81 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "VolumeShaper: Make initialization consistent" into sc-dev am: 3b169aab 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/14442676

Change-Id: I8640aa0be54a153d89e8cca88bdf62a4113088c6
parents 0f0a48a0 3b169aab

aidl/android/media/InterpolatorConfig.aidl

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

 */

parcelable InterpolatorConfig {

    InterpolatorType type;

    InterpolatorType type = InterpolatorType.CUBIC;

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

    float firstSlope;

    float lastSlope;

aidl/android/media/VolumeShaperConfiguration.aidl

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

 */

parcelable VolumeShaperConfiguration {

    VolumeShaperConfigurationType type;

    VolumeShaperConfigurationType type = VolumeShaperConfigurationType.ID;

    int id;

    /** Bitmask, indexed by VolumeShaperConfigurationOptionFlag. */

    int optionFlags;

include/media/Interpolator.h

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



    explicit Interpolator(

            InterpolatorType interpolatorType = InterpolatorType::LINEAR,

            InterpolatorType interpolatorType = InterpolatorType::CUBIC,

            bool cache = true)

        : mCache(cache)

        , mFirstSlope(0)