Support combined vibration effects with input device.
Support combined vibration effects with multi-channel FF effect input
device.
Bug: 161629089
Test: atest InputDeviceVibratorTest
Change-Id: I566f6cdd601f716b34c2f70e3705340ef8906897
diff --git a/services/inputflinger/VibrationElement.cpp b/services/inputflinger/VibrationElement.cpp
index aaf5834..17e1ad4 100644
--- a/services/inputflinger/VibrationElement.cpp
+++ b/services/inputflinger/VibrationElement.cpp
@@ -24,13 +24,28 @@
using android::base::StringPrintf;
namespace android {
+// VibrationElement implementations
+VibrationElement::VibrationElement(size_t channelNum) {
+ channels.reserve(channelNum);
+}
+
+VibrationElement::VibrationElement(const VibrationElement& other) {
+ duration = other.duration;
+ channels.resize(other.channels.size());
+ for (size_t i = 0; i < other.channels.size(); i++) {
+ channels[i].first = other.channels[i].first;
+ channels[i].second = other.channels[i].second;
+ }
+}
const std::string VibrationElement::toString() const {
std::string dump;
dump += StringPrintf("[duration=%lldms, channels=[", duration.count());
for (auto it = channels.begin(); it != channels.end(); ++it) {
- dump += std::to_string(*it);
+ dump += std::to_string(it->first);
+ dump += " : ";
+ dump += std::to_string(it->second);
if (std::next(it) != channels.end()) {
dump += ", ";
}
@@ -40,17 +55,79 @@
return dump;
}
-uint16_t VibrationElement::getMagnitude(size_t channelIdx) const {
- if (channelIdx >= channels.size()) {
+uint16_t VibrationElement::getMagnitude(int32_t vibratorId) const {
+ auto it =
+ std::find_if(channels.begin(), channels.end(),
+ [vibratorId](const std::pair<int32_t /*vibratorId*/, uint8_t /*amplitude*/>
+ pair) { return pair.first == vibratorId; });
+ if (it == channels.end()) {
return 0;
}
// convert range [0,255] to [0,65535] (android framework to linux ff ranges)
- return static_cast<uint16_t>(channels[channelIdx]) << 8;
+ return static_cast<uint16_t>(it->second) << 8;
}
bool VibrationElement::isOn() const {
return std::any_of(channels.begin(), channels.end(),
- [](uint16_t channel) { return channel != 0; });
+ [](const auto& channel) { return channel.second != 0; });
+}
+
+void VibrationElement::addChannel(int32_t vibratorId, uint8_t amplitude) {
+ channels.push_back(std::make_pair(vibratorId, amplitude));
+}
+
+bool VibrationElement::operator==(const VibrationElement& other) const {
+ if (duration != other.duration || channels.size() != other.channels.size()) {
+ return false;
+ }
+ for (size_t i = 0; i < CHANNEL_SIZE; i++) {
+ if (channels[i] != other.channels[i]) {
+ return false;
+ }
+ }
+ return true;
+}
+
+bool VibrationElement::operator!=(const VibrationElement& other) const {
+ return !(*this == other);
+}
+
+// VibrationSequence implementations
+VibrationSequence::VibrationSequence(size_t length) {
+ pattern.reserve(length);
+}
+
+void VibrationSequence::operator=(const VibrationSequence& other) {
+ pattern = other.pattern;
+}
+
+bool VibrationSequence::operator==(const VibrationSequence& other) const {
+ if (pattern.size() != other.pattern.size()) {
+ return false;
+ }
+ for (size_t i = 0; i < pattern.size(); i++) {
+ if (pattern[i] != other.pattern[i]) {
+ return false;
+ }
+ }
+ return true;
+}
+
+void VibrationSequence::addElement(VibrationElement element) {
+ pattern.push_back(element);
+}
+
+const std::string VibrationSequence::toString() const {
+ std::string dump;
+ dump += "[";
+
+ for (const auto& element : pattern) {
+ dump += element.toString();
+ dump += " ";
+ }
+
+ dump += "]";
+ return dump;
}
} // namespace android