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

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

Merge "Fix VolumeShaper unducking for OpenSLES playback" into sc-dev

parents d709755d 71455ba2

aidl/android/media/VolumeShaperConfiguration.aidl

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ parcelable VolumeShaperConfiguration { 
    /** Bitmask, indexed by VolumeShaperConfigurationOptionFlag. */

    int optionFlags;

    double durationMs;

    InterpolatorConfig interpolatorConfig;

    @nullable InterpolatorConfig interpolatorConfig; // null if type == ID

}

include/media/VolumeShaper.h

+6 −3
Original line number Diff line number Diff line
@@ -302,7 +302,8 @@ public: 
            if (mType != TYPE_ID) {

                parcelable->optionFlags = getOptionFlagsAsAidl();

                parcelable->durationMs = getDurationMs();

                Interpolator<S, T>::writeToConfig(&parcelable->interpolatorConfig);

                parcelable->interpolatorConfig.emplace(); // create value in std::optional

                Interpolator<S, T>::writeToConfig(&*parcelable->interpolatorConfig);

            }

        }
@@ -319,7 +320,9 @@ public: 
                      ? NO_ERROR

                      : setOptionFlagsFromAidl(parcelable.optionFlags)

                        ?: setDurationMs(parcelable.durationMs)

                           ?: Interpolator<S, T>::readFromConfig(parcelable.interpolatorConfig)

                           ?: !parcelable.interpolatorConfig  // check std::optional for value

                               ? BAD_VALUE // must be nonnull.

                               : Interpolator<S, T>::readFromConfig(*parcelable.interpolatorConfig)

                                   ?: checkCurve();

        }