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

Commit e0561c59 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9434809 from 76820d67 to udc-release 

Change-Id: Ifef1ae20075b7ca330c9e6deac8b96e26cfca22d
parents e5f3acf6 76820d67

audio/aidl/aidl_api/android.hardware.audio.effect/current/android/hardware/audio/effect/Visualizer.aidl

+6 −6
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ union Visualizer { 
  android.hardware.audio.effect.VendorExtension vendor;

  android.hardware.audio.effect.Visualizer.GetOnlyParameters getOnlyParameters;

  android.hardware.audio.effect.Visualizer.SetOnlyParameters setOnlyParameters;

  int captureSizeBytes;

  int captureSamples;

  android.hardware.audio.effect.Visualizer.ScalingMode scalingMode;

  android.hardware.audio.effect.Visualizer.MeasurementMode measurementMode;

  @VintfStability
@@ -52,12 +52,12 @@ union Visualizer { 
  parcelable Capability {

    android.hardware.audio.effect.VendorExtension extension;

    int maxLatencyMs;

    android.hardware.audio.effect.Visualizer.CaptureSizeRange captureSizeRange;

    android.hardware.audio.effect.Visualizer.CaptureSamplesRange captureSampleRange;

  }

  @VintfStability

  parcelable CaptureSizeRange {

    int minBytes;

    int maxBytes;

  parcelable CaptureSamplesRange {

    int min;

    int max;

  }

  @VintfStability

  enum ScalingMode {
@@ -72,7 +72,7 @@ union Visualizer { 
  @VintfStability

  union GetOnlyParameters {

    android.hardware.audio.effect.Visualizer.GetOnlyParameters.Measurement measurement;

    byte[] captureBytes;

    byte[] captureSampleBuffer;

    @VintfStability

    parcelable Measurement {

      int rms;

audio/aidl/android/hardware/audio/effect/IEffect.aidl

+4 −6
Original line number Diff line number Diff line
@@ -34,12 +34,10 @@ interface IEffect { 
        /**

         * One of Binder STATUS_* statuses:

         *  - STATUS_OK: the command has completed successfully;

         *  - STATUS_BAD_VALUE: invalid value in the 'Command' structure;

         *  - STATUS_INVALID_OPERATION: the mix port is not connected

         *                              to any producer or consumer, thus

         *                              positions can not be reported;

         *  - STATUS_NOT_ENOUGH_DATA: a read or write error has

         *                            occurred for the 'audio.fmq' queue;

         *  - STATUS_BAD_VALUE: invalid parameters or state detected in effects;

         *  - STATUS_INVALID_OPERATION: an internal error happens in effect audio buffer processing;

         *  - STATUS_NOT_ENOUGH_DATA: a read or write error has occurred for the 'inputDataMQ' or

         * 'outputDataMQ';

         *

         */

        int status;

audio/aidl/android/hardware/audio/effect/Visualizer.aidl

+9 −9
Original line number Diff line number Diff line
@@ -63,16 +63,16 @@ union Visualizer { 
        /**

         *  Capture size range.

         */

        CaptureSizeRange captureSizeRange;

        CaptureSamplesRange captureSampleRange;

    }



    /**

     * Supported capture size range in bytes.

     * Supported capture size range in samples.

     */

    @VintfStability

    parcelable CaptureSizeRange {

        int minBytes;

        int maxBytes;

    parcelable CaptureSamplesRange {

        int min;

        int max;

    }



    /**
@@ -131,9 +131,9 @@ union Visualizer { 
        Measurement measurement;



        /**

         * Gets the latest PCM capture, size of returned vector equals to @c captureSize.

         * Get the latest captureSamples of PCM samples (8 bits per sample).

         */

        byte[] captureBytes;

        byte[] captureSampleBuffer;

    }

    GetOnlyParameters getOnlyParameters;
@@ -152,10 +152,10 @@ union Visualizer { 
    SetOnlyParameters setOnlyParameters;



    /**

     * Current capture size in bytes. The capture size must be a power of 2 in the range

     * Current capture size in number of samples. The capture size must be inside

     * Capability.captureSizeRange.

     */

    int captureSizeBytes;

    int captureSamples;

    /**

     * Visualizer capture mode

     */

audio/aidl/default/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ cc_binary { 
        "libpresetreverbsw",

        "libtinyxml2",

        "libvirtualizersw",

        "libvisualizersw",

        "libvisualizeraidl",

        "libvolumesw",

    ],

    srcs: [

audio/aidl/default/EffectImpl.cpp

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 


using aidl::android::hardware::audio::effect::IEffect;

using aidl::android::hardware::audio::effect::State;

using aidl::android::media::audio::common::PcmType;



extern "C" binder_exception_t destroyEffect(const std::shared_ptr<IEffect>& instanceSp) {

    State state;
@@ -40,6 +41,10 @@ ndk::ScopedAStatus EffectImpl::open(const Parameter::Common& common, 
                                    const std::optional<Parameter::Specific>& specific,

                                    OpenEffectReturn* ret) {

    LOG(DEBUG) << __func__;

    // effect only support 32bits float

    RETURN_IF(common.input.base.format.pcm != common.output.base.format.pcm ||

                      common.input.base.format.pcm != PcmType::FLOAT_32_BIT,

              EX_ILLEGAL_ARGUMENT, "dataMustBe32BitsFloat");

    RETURN_OK_IF(mState != State::INIT);

    auto context = createContext(common);

    RETURN_IF(!context, EX_NULL_POINTER, "createContextFailed");