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

Commit b373305c authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "Visualizer : Add minimum and maximum capabilities for params." am: 54aa0f88 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2369277



Change-Id: I9a4ea0a33121ce462bada809f1149eb39e5e7c81
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81ab005a 54aa0f88

audio/aidl/default/visualizer/VisualizerSw.cpp

+33 −0
Original line number Diff line number Diff line
@@ -241,4 +241,37 @@ IEffect::Status VisualizerSw::effectProcessImpl(float* in, float* out, int sampl 
    return {STATUS_OK, samples, samples};

}



RetCode VisualizerSwContext::setVsCaptureSize(int captureSize) {

    if (captureSize < VisualizerSw::kCapability.captureSampleRange.min ||

        captureSize > VisualizerSw::kCapability.captureSampleRange.max) {

        LOG(ERROR) << __func__ << " invalid captureSize " << captureSize;

        return RetCode::ERROR_ILLEGAL_PARAMETER;

    }

    // TODO : Add implementation to apply new captureSize

    mCaptureSize = captureSize;

    return RetCode::SUCCESS;

}



RetCode VisualizerSwContext::setVsScalingMode(Visualizer::ScalingMode scalingMode) {

    // TODO : Add implementation to apply new scalingMode

    mScalingMode = scalingMode;

    return RetCode::SUCCESS;

}



RetCode VisualizerSwContext::setVsMeasurementMode(Visualizer::MeasurementMode measurementMode) {

    // TODO : Add implementation to apply new measurementMode

    mMeasurementMode = measurementMode;

    return RetCode::SUCCESS;

}



RetCode VisualizerSwContext::setVsLatency(int latency) {

    if (latency < 0 || latency > VisualizerSw::kCapability.maxLatencyMs) {

        LOG(ERROR) << __func__ << " invalid latency " << latency;

        return RetCode::ERROR_ILLEGAL_PARAMETER;

    }

    // TODO : Add implementation to modify latency

    mLatency = latency;

    return RetCode::SUCCESS;

}



}  // namespace aidl::android::hardware::audio::effect

audio/aidl/default/visualizer/VisualizerSw.h

+4 −28
Original line number Diff line number Diff line
@@ -38,40 +38,16 @@ class VisualizerSwContext final : public EffectContext { 
        fill(mCaptureSampleBuffer.begin(), mCaptureSampleBuffer.end(), 0x80);

    }



    RetCode setVsCaptureSize(int captureSize) {

        if (captureSize < kMinCaptureSize || captureSize > kMaxCaptureSize) {

            LOG(ERROR) << __func__ << " invalid captureSize " << captureSize;

            return RetCode::ERROR_ILLEGAL_PARAMETER;

        }

        // TODO : Add implementation to apply new captureSize

        mCaptureSize = captureSize;

        return RetCode::SUCCESS;

    }

    RetCode setVsCaptureSize(int captureSize);

    int getVsCaptureSize() const { return mCaptureSize; }



    RetCode setVsScalingMode(Visualizer::ScalingMode scalingMode) {

        // TODO : Add implementation to apply new scalingMode

        mScalingMode = scalingMode;

        return RetCode::SUCCESS;

    }

    RetCode setVsScalingMode(Visualizer::ScalingMode scalingMode);

    Visualizer::ScalingMode getVsScalingMode() const { return mScalingMode; }



    RetCode setVsMeasurementMode(Visualizer::MeasurementMode measurementMode) {

        // TODO : Add implementation to apply new measurementMode

        mMeasurementMode = measurementMode;

        return RetCode::SUCCESS;

    }

    RetCode setVsMeasurementMode(Visualizer::MeasurementMode measurementMode);

    Visualizer::MeasurementMode getVsMeasurementMode() const { return mMeasurementMode; }



    RetCode setVsLatency(int latency) {

        if (latency < 0 || latency > kMaxLatencyMs) {

            LOG(ERROR) << __func__ << " invalid latency " << latency;

            return RetCode::ERROR_ILLEGAL_PARAMETER;

        }

        // TODO : Add implementation to modify latency

        mLatency = latency;

        return RetCode::SUCCESS;

    }

    RetCode setVsLatency(int latency);



    Visualizer::GetOnlyParameters::Measurement getVsMeasurement() const { return mMeasurement; }

    std::vector<uint8_t> getVsCaptureSampleBuffer() const { return mCaptureSampleBuffer; }