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

Commit 06871bb3 authored by jiabin's avatar jiabin
Browse files

Add function for scaling haptic data. 

The function was in AudioMixer. With adding haptic-generating effect,
there will be more than one place calling the scaling function. In that
case, it makes more sense to put the scaling function in vibrator
library.

Bug: 136490803
Test: play audio-coupled-haptic files
Test: play audio with attaching haptic-generating effect
Change-Id: Ia7f88463e2d2b7f11954ab9bb6aeff8191c78894
parent 779db167

libs/vibrator/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 


cc_library_shared {

    name: "libvibrator",

    vendor_available: true,

    double_loadable: true,



    shared_libs: [

        "libbinder",

libs/vibrator/ExternalVibrationUtils.cpp

0 → 100644
+91 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#include <cstring>



#include <math.h>



#include <vibrator/ExternalVibrationUtils.h>



namespace android::os {



namespace {

static constexpr float HAPTIC_SCALE_VERY_LOW_RATIO = 2.0f / 3.0f;

static constexpr float HAPTIC_SCALE_LOW_RATIO = 3.0f / 4.0f;

static constexpr float HAPTIC_MAX_AMPLITUDE_FLOAT = 1.0f;



float getHapticScaleGamma(HapticScale scale) {

    switch (scale) {

    case HapticScale::VERY_LOW:

        return 2.0f;

    case HapticScale::LOW:

        return 1.5f;

    case HapticScale::HIGH:

        return 0.5f;

    case HapticScale::VERY_HIGH:

        return 0.25f;

    default:

        return 1.0f;

    }

}



float getHapticMaxAmplitudeRatio(HapticScale scale) {

    switch (scale) {

    case HapticScale::VERY_LOW:

        return HAPTIC_SCALE_VERY_LOW_RATIO;

    case HapticScale::LOW:

        return HAPTIC_SCALE_LOW_RATIO;

    case HapticScale::NONE:

    case HapticScale::HIGH:

    case HapticScale::VERY_HIGH:

        return 1.0f;

    default:

        return 0.0f;

    }

}



} // namespace



bool isValidHapticScale(HapticScale scale) {

    switch (scale) {

    case HapticScale::MUTE:

    case HapticScale::VERY_LOW:

    case HapticScale::LOW:

    case HapticScale::NONE:

    case HapticScale::HIGH:

    case HapticScale::VERY_HIGH:

        return true;

    }

    return false;

}



void scaleHapticData(float* buffer, size_t length, HapticScale scale) {

    if (!isValidHapticScale(scale) || scale == HapticScale::NONE) {

        return;

    }

    if (scale == HapticScale::MUTE) {

        memset(buffer, 0, length * sizeof(float));

        return;

    }

    float gamma = getHapticScaleGamma(scale);

    float maxAmplitudeRatio = getHapticMaxAmplitudeRatio(scale);

    for (size_t i = 0; i < length; i++) {

        float sign = buffer[i] >= 0 ? 1.0 : -1.0;

        buffer[i] = powf(fabsf(buffer[i] / HAPTIC_MAX_AMPLITUDE_FLOAT), gamma)

                * maxAmplitudeRatio * HAPTIC_MAX_AMPLITUDE_FLOAT * sign;

    }

}



} // namespace android::os

libs/vibrator/include/vibrator/ExternalVibrationUtils.h

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#ifndef ANDROID_EXTERNAL_VIBRATION_UTILS_H

#define ANDROID_EXTERNAL_VIBRATION_UTILS_H



#include <android/os/IExternalVibratorService.h>



namespace android::os {



enum class HapticScale {

    MUTE = IExternalVibratorService::SCALE_MUTE,

    VERY_LOW = IExternalVibratorService::SCALE_VERY_LOW,

    LOW = IExternalVibratorService::SCALE_LOW,

    NONE = IExternalVibratorService::SCALE_NONE,

    HIGH = IExternalVibratorService::SCALE_HIGH,

    VERY_HIGH = IExternalVibratorService::SCALE_VERY_HIGH,

};



bool isValidHapticScale(HapticScale scale);



void scaleHapticData(float* buffer, size_t length, HapticScale scale);



} // namespace android::os



#endif // ANDROID_EXTERNAL_VIBRATION_UTILS_H