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

Commit 8d88c3a5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7343210 from c5dd9f43 to sc-release 

Change-Id: Id2e728f6945c1a6bcf31d255a30567e4b7f41c98
parents 2dd43dc6 c5dd9f43

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

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

 */

parcelable VolumeShaperConfiguration {

    VolumeShaperConfigurationType type;

    VolumeShaperConfigurationType type = VolumeShaperConfigurationType.ID;

    int id;

    /** Bitmask, indexed by VolumeShaperConfigurationOptionFlag. */

    int optionFlags;

    double durationMs;

    InterpolatorConfig interpolatorConfig;

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

}

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)

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();

        }

media/codec2/hidl/plugin/DefaultFilterPlugin.cpp

+9 −0
Original line number Diff line number Diff line
@@ -105,4 +105,13 @@ bool DefaultFilterPlugin::isFilteringEnabled(const std::shared_ptr<C2ComponentIn 
    return mPlugin->isFilteringEnabled(intf);

}



c2_status_t DefaultFilterPlugin::queryParamsForPreviousComponent(

        const std::shared_ptr<C2ComponentInterface> &intf,

        std::vector<std::unique_ptr<C2Param>> *params) {

    if (mInit != OK) {

        return C2_NO_INIT;

    }

    return mPlugin->queryParamsForPreviousComponent(intf, params);

}



}  // namespace android