diff options
author | 2018-06-08 15:11:57 -0700 | |
---|---|---|
committer | 2018-06-08 15:11:57 -0700 | |
commit | f11e2bd016d886a333345dea853ebda23a408d5c (patch) | |
tree | 905bd4d25d6ab2b046620ff459777d8dcfa5d7de /libs/input | |
parent | aabd6b7fa343654cd85b3b2da392e424d037d15a (diff) | |
parent | 5c947cdf72270fd1f766b2248d526ebc8c7227f6 (diff) |
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I6d6bee71b9424eb478780bbfc06b830eb8ded342
Diffstat (limited to 'libs/input')
-rw-r--r-- | libs/input/InputTransport.cpp | 68 | ||||
-rw-r--r-- | libs/input/KeyCharacterMap.cpp | 3 | ||||
-rw-r--r-- | libs/input/Keyboard.cpp | 12 | ||||
-rw-r--r-- | libs/input/VelocityTracker.cpp | 212 | ||||
-rw-r--r-- | libs/input/tests/Android.bp | 2 | ||||
-rw-r--r-- | libs/input/tests/InputChannel_test.cpp | 16 | ||||
-rw-r--r-- | libs/input/tests/InputPublisherAndConsumer_test.cpp | 25 | ||||
-rw-r--r-- | libs/input/tests/VelocityTracker_test.cpp | 664 |
8 files changed, 944 insertions, 58 deletions
diff --git a/libs/input/InputTransport.cpp b/libs/input/InputTransport.cpp index 905d336bfe..aa0bf17ca3 100644 --- a/libs/input/InputTransport.cpp +++ b/libs/input/InputTransport.cpp @@ -99,34 +99,34 @@ size_t InputMessage::size() const { // --- InputChannel --- -InputChannel::InputChannel(const String8& name, int fd) : +InputChannel::InputChannel(const std::string& name, int fd) : mName(name), mFd(fd) { #if DEBUG_CHANNEL_LIFECYCLE ALOGD("Input channel constructed: name='%s', fd=%d", - mName.string(), fd); + mName.c_str(), fd); #endif int result = fcntl(mFd, F_SETFL, O_NONBLOCK); LOG_ALWAYS_FATAL_IF(result != 0, "channel '%s' ~ Could not make socket " - "non-blocking. errno=%d", mName.string(), errno); + "non-blocking. errno=%d", mName.c_str(), errno); } InputChannel::~InputChannel() { #if DEBUG_CHANNEL_LIFECYCLE ALOGD("Input channel destroyed: name='%s', fd=%d", - mName.string(), mFd); + mName.c_str(), mFd); #endif ::close(mFd); } -status_t InputChannel::openInputChannelPair(const String8& name, +status_t InputChannel::openInputChannelPair(const std::string& name, sp<InputChannel>& outServerChannel, sp<InputChannel>& outClientChannel) { int sockets[2]; if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sockets)) { status_t result = -errno; ALOGE("channel '%s' ~ Could not create socket pair. errno=%d", - name.string(), errno); + name.c_str(), errno); outServerChannel.clear(); outClientChannel.clear(); return result; @@ -138,12 +138,12 @@ status_t InputChannel::openInputChannelPair(const String8& name, setsockopt(sockets[1], SOL_SOCKET, SO_SNDBUF, &bufferSize, sizeof(bufferSize)); setsockopt(sockets[1], SOL_SOCKET, SO_RCVBUF, &bufferSize, sizeof(bufferSize)); - String8 serverChannelName = name; - serverChannelName.append(" (server)"); + std::string serverChannelName = name; + serverChannelName += " (server)"; outServerChannel = new InputChannel(serverChannelName, sockets[0]); - String8 clientChannelName = name; - clientChannelName.append(" (client)"); + std::string clientChannelName = name; + clientChannelName += " (client)"; outClientChannel = new InputChannel(clientChannelName, sockets[1]); return OK; } @@ -158,7 +158,7 @@ status_t InputChannel::sendMessage(const InputMessage* msg) { if (nWrite < 0) { int error = errno; #if DEBUG_CHANNEL_MESSAGES - ALOGD("channel '%s' ~ error sending message of type %d, errno=%d", mName.string(), + ALOGD("channel '%s' ~ error sending message of type %d, errno=%d", mName.c_str(), msg->header.type, error); #endif if (error == EAGAIN || error == EWOULDBLOCK) { @@ -173,13 +173,13 @@ status_t InputChannel::sendMessage(const InputMessage* msg) { if (size_t(nWrite) != msgLength) { #if DEBUG_CHANNEL_MESSAGES ALOGD("channel '%s' ~ error sending message type %d, send was incomplete", - mName.string(), msg->header.type); + mName.c_str(), msg->header.type); #endif return DEAD_OBJECT; } #if DEBUG_CHANNEL_MESSAGES - ALOGD("channel '%s' ~ sent message of type %d", mName.string(), msg->header.type); + ALOGD("channel '%s' ~ sent message of type %d", mName.c_str(), msg->header.type); #endif return OK; } @@ -193,7 +193,7 @@ status_t InputChannel::receiveMessage(InputMessage* msg) { if (nRead < 0) { int error = errno; #if DEBUG_CHANNEL_MESSAGES - ALOGD("channel '%s' ~ receive message failed, errno=%d", mName.string(), errno); + ALOGD("channel '%s' ~ receive message failed, errno=%d", mName.c_str(), errno); #endif if (error == EAGAIN || error == EWOULDBLOCK) { return WOULD_BLOCK; @@ -206,20 +206,20 @@ status_t InputChannel::receiveMessage(InputMessage* msg) { if (nRead == 0) { // check for EOF #if DEBUG_CHANNEL_MESSAGES - ALOGD("channel '%s' ~ receive message failed because peer was closed", mName.string()); + ALOGD("channel '%s' ~ receive message failed because peer was closed", mName.c_str()); #endif return DEAD_OBJECT; } if (!msg->isValid(nRead)) { #if DEBUG_CHANNEL_MESSAGES - ALOGD("channel '%s' ~ received invalid message", mName.string()); + ALOGD("channel '%s' ~ received invalid message", mName.c_str()); #endif return BAD_VALUE; } #if DEBUG_CHANNEL_MESSAGES - ALOGD("channel '%s' ~ received message of type %d", mName.string(), msg->header.type); + ALOGD("channel '%s' ~ received message of type %d", mName.c_str(), msg->header.type); #endif return OK; } @@ -254,8 +254,8 @@ status_t InputPublisher::publishKeyEvent( #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' publisher ~ publishKeyEvent: seq=%u, deviceId=%d, source=0x%x, " "action=0x%x, flags=0x%x, keyCode=%d, scanCode=%d, metaState=0x%x, repeatCount=%d," - "downTime=%lld, eventTime=%lld", - mChannel->getName().string(), seq, + "downTime=%" PRId64 ", eventTime=%" PRId64, + mChannel->getName().c_str(), seq, deviceId, source, action, flags, keyCode, scanCode, metaState, repeatCount, downTime, eventTime); #endif @@ -305,9 +305,9 @@ status_t InputPublisher::publishMotionEvent( ALOGD("channel '%s' publisher ~ publishMotionEvent: seq=%u, deviceId=%d, source=0x%x, " "action=0x%x, actionButton=0x%08x, flags=0x%x, edgeFlags=0x%x, " "metaState=0x%x, buttonState=0x%x, xOffset=%f, yOffset=%f, " - "xPrecision=%f, yPrecision=%f, downTime=%lld, eventTime=%lld, " + "xPrecision=%f, yPrecision=%f, downTime=%" PRId64 ", eventTime=%" PRId64 ", " "pointerCount=%" PRIu32, - mChannel->getName().string(), seq, + mChannel->getName().c_str(), seq, deviceId, source, action, actionButton, flags, edgeFlags, metaState, buttonState, xOffset, yOffset, xPrecision, yPrecision, downTime, eventTime, pointerCount); #endif @@ -319,7 +319,7 @@ status_t InputPublisher::publishMotionEvent( if (pointerCount > MAX_POINTERS || pointerCount < 1) { ALOGE("channel '%s' publisher ~ Invalid number of pointers provided: %" PRIu32 ".", - mChannel->getName().string(), pointerCount); + mChannel->getName().c_str(), pointerCount); return BAD_VALUE; } @@ -352,7 +352,7 @@ status_t InputPublisher::publishMotionEvent( status_t InputPublisher::receiveFinishedSignal(uint32_t* outSeq, bool* outHandled) { #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' publisher ~ receiveFinishedSignal", - mChannel->getName().string()); + mChannel->getName().c_str()); #endif InputMessage msg; @@ -364,7 +364,7 @@ status_t InputPublisher::receiveFinishedSignal(uint32_t* outSeq, bool* outHandle } if (msg.header.type != InputMessage::TYPE_FINISHED) { ALOGE("channel '%s' publisher ~ Received unexpected message of type %d from consumer", - mChannel->getName().string(), msg.header.type); + mChannel->getName().c_str(), msg.header.type); return UNKNOWN_ERROR; } *outSeq = msg.body.finished.seq; @@ -401,8 +401,8 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, bool consumeBatches, nsecs_t frameTime, uint32_t* outSeq, InputEvent** outEvent, int32_t* displayId) { #if DEBUG_TRANSPORT_ACTIONS - ALOGD("channel '%s' consumer ~ consume: consumeBatches=%s, frameTime=%lld", - mChannel->getName().string(), consumeBatches ? "true" : "false", frameTime); + ALOGD("channel '%s' consumer ~ consume: consumeBatches=%s, frameTime=%" PRId64, + mChannel->getName().c_str(), consumeBatches ? "true" : "false", frameTime); #endif *outSeq = 0; @@ -426,7 +426,7 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, if (*outEvent) { #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' consumer ~ consumed batch event, seq=%u", - mChannel->getName().string(), *outSeq); + mChannel->getName().c_str(), *outSeq); #endif break; } @@ -445,7 +445,7 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, *outEvent = keyEvent; #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' consumer ~ consumed key event, seq=%u", - mChannel->getName().string(), *outSeq); + mChannel->getName().c_str(), *outSeq); #endif break; } @@ -458,7 +458,7 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, batch.samples.push(mMsg); #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' consumer ~ appended to batch event", - mChannel->getName().string()); + mChannel->getName().c_str()); #endif break; } else { @@ -474,7 +474,7 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' consumer ~ consumed batch event and " "deferred current event, seq=%u", - mChannel->getName().string(), *outSeq); + mChannel->getName().c_str(), *outSeq); #endif break; } @@ -488,7 +488,7 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, batch.samples.push(mMsg); #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' consumer ~ started batch event", - mChannel->getName().string()); + mChannel->getName().c_str()); #endif break; } @@ -503,14 +503,14 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, *displayId = mMsg.body.motion.displayId; #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' consumer ~ consumed motion event, seq=%u", - mChannel->getName().string(), *outSeq); + mChannel->getName().c_str(), *outSeq); #endif break; } default: ALOGE("channel '%s' consumer ~ Received unexpected message of type %d", - mChannel->getName().string(), mMsg.header.type); + mChannel->getName().c_str(), mMsg.header.type); return UNKNOWN_ERROR; } } @@ -841,7 +841,7 @@ bool InputConsumer::shouldResampleTool(int32_t toolType) { status_t InputConsumer::sendFinishedSignal(uint32_t seq, bool handled) { #if DEBUG_TRANSPORT_ACTIONS ALOGD("channel '%s' consumer ~ sendFinishedSignal: seq=%u, handled=%s", - mChannel->getName().string(), seq, handled ? "true" : "false"); + mChannel->getName().c_str(), seq, handled ? "true" : "false"); #endif if (!seq) { diff --git a/libs/input/KeyCharacterMap.cpp b/libs/input/KeyCharacterMap.cpp index 0627ca6d6f..cba1111606 100644 --- a/libs/input/KeyCharacterMap.cpp +++ b/libs/input/KeyCharacterMap.cpp @@ -824,6 +824,9 @@ status_t KeyCharacterMap::Parser::parseType() { } else if (typeToken == "FULL") { type = KEYBOARD_TYPE_FULL; } else if (typeToken == "SPECIAL_FUNCTION") { + ALOGW("The SPECIAL_FUNCTION type is now declared in the device's IDC file, please set " + "the property 'keyboard.specialFunction' to '1' there instead."); + // TODO: return BAD_VALUE here in Q type = KEYBOARD_TYPE_SPECIAL_FUNCTION; } else if (typeToken == "OVERLAY") { type = KEYBOARD_TYPE_OVERLAY; diff --git a/libs/input/Keyboard.cpp b/libs/input/Keyboard.cpp index 07f2289785..11842ee7ff 100644 --- a/libs/input/Keyboard.cpp +++ b/libs/input/Keyboard.cpp @@ -148,9 +148,19 @@ String8 KeyMap::getPath(const InputDeviceIdentifier& deviceIdentifier, // --- Global functions --- +bool isKeyboardSpecialFunction(const PropertyMap* config) { + if (config == nullptr) { + return false; + } + bool isSpecialFunction = false; + config->tryGetProperty(String8("keyboard.specialFunction"), isSpecialFunction); + return isSpecialFunction; +} + bool isEligibleBuiltInKeyboard(const InputDeviceIdentifier& deviceIdentifier, const PropertyMap* deviceConfiguration, const KeyMap* keyMap) { - if (!keyMap->haveKeyCharacterMap() + // TODO: remove the third OR statement (SPECIAL_FUNCTION) in Q + if (!keyMap->haveKeyCharacterMap() || isKeyboardSpecialFunction(deviceConfiguration) || keyMap->keyCharacterMap->getKeyboardType() == KeyCharacterMap::KEYBOARD_TYPE_SPECIAL_FUNCTION) { return false; diff --git a/libs/input/VelocityTracker.cpp b/libs/input/VelocityTracker.cpp index 62acea360e..c07a81245a 100644 --- a/libs/input/VelocityTracker.cpp +++ b/libs/input/VelocityTracker.cpp @@ -75,7 +75,9 @@ static std::string vectorToString(const float* a, uint32_t m) { str += " ]"; return str; } +#endif +#if DEBUG_STRATEGY static std::string matrixToString(const float* a, uint32_t m, uint32_t n, bool rowMajor) { std::string str; str = "["; @@ -141,6 +143,11 @@ bool VelocityTracker::configureStrategy(const char* strategy) { } VelocityTrackerStrategy* VelocityTracker::createStrategy(const char* strategy) { + if (!strcmp("impulse", strategy)) { + // Physical model of pushing an object. Quality: VERY GOOD. + // Works with duplicate coordinates, unclean finger liftoff. + return new ImpulseVelocityTrackerStrategy(); + } if (!strcmp("lsq1", strategy)) { // 1st order least squares. Quality: POOR. // Frequently underfits the touch data especially when the finger accelerates @@ -318,8 +325,8 @@ void VelocityTracker::addMovement(const MotionEvent* event) { eventTime = event->getHistoricalEventTime(h); for (size_t i = 0; i < pointerCount; i++) { uint32_t index = pointerIndex[i]; - positions[index].x = event->getHistoricalX(i, h); - positions[index].y = event->getHistoricalY(i, h); + positions[index].x = event->getHistoricalRawX(i, h); + positions[index].y = event->getHistoricalRawY(i, h); } addMovement(eventTime, idBits, positions); } @@ -327,8 +334,8 @@ void VelocityTracker::addMovement(const MotionEvent* event) { eventTime = event->getEventTime(); for (size_t i = 0; i < pointerCount; i++) { uint32_t index = pointerIndex[i]; - positions[index].x = event->getX(i); - positions[index].y = event->getY(i); + positions[index].x = event->getRawX(i); + positions[index].y = event->getRawY(i); } addMovement(eventTime, idBits, positions); } @@ -352,9 +359,6 @@ bool VelocityTracker::getEstimator(uint32_t id, Estimator* outEstimator) const { // --- LeastSquaresVelocityTrackerStrategy --- -const nsecs_t LeastSquaresVelocityTrackerStrategy::HORIZON; -const uint32_t LeastSquaresVelocityTrackerStrategy::HISTORY_SIZE; - LeastSquaresVelocityTrackerStrategy::LeastSquaresVelocityTrackerStrategy( uint32_t degree, Weighting weighting) : mDegree(degree), mWeighting(weighting) { @@ -863,10 +867,6 @@ void IntegratingVelocityTrackerStrategy::populateEstimator(const State& state, // --- LegacyVelocityTrackerStrategy --- -const nsecs_t LegacyVelocityTrackerStrategy::HORIZON; -const uint32_t LegacyVelocityTrackerStrategy::HISTORY_SIZE; -const nsecs_t LegacyVelocityTrackerStrategy::MIN_DURATION; - LegacyVelocityTrackerStrategy::LegacyVelocityTrackerStrategy() { clear(); } @@ -979,4 +979,194 @@ bool LegacyVelocityTrackerStrategy::getEstimator(uint32_t id, return true; } +// --- ImpulseVelocityTrackerStrategy --- + +ImpulseVelocityTrackerStrategy::ImpulseVelocityTrackerStrategy() { + clear(); +} + +ImpulseVelocityTrackerStrategy::~ImpulseVelocityTrackerStrategy() { +} + +void ImpulseVelocityTrackerStrategy::clear() { + mIndex = 0; + mMovements[0].idBits.clear(); +} + +void ImpulseVelocityTrackerStrategy::clearPointers(BitSet32 idBits) { + BitSet32 remainingIdBits(mMovements[mIndex].idBits.value & ~idBits.value); + mMovements[mIndex].idBits = remainingIdBits; +} + +void ImpulseVelocityTrackerStrategy::addMovement(nsecs_t eventTime, BitSet32 idBits, + const VelocityTracker::Position* positions) { + if (++mIndex == HISTORY_SIZE) { + mIndex = 0; + } + + Movement& movement = mMovements[mIndex]; + movement.eventTime = eventTime; + movement.idBits = idBits; + uint32_t count = idBits.count(); + for (uint32_t i = 0; i < count; i++) { + movement.positions[i] = positions[i]; + } +} + +/** + * Calculate the total impulse provided to the screen and the resulting velocity. + * + * The touchscreen is modeled as a physical object. + * Initial condition is discussed below, but for now suppose that v(t=0) = 0 + * + * The kinetic energy of the object at the release is E=0.5*m*v^2 + * Then vfinal = sqrt(2E/m). The goal is to calculate E. + * + * The kinetic energy at the release is equal to the total work done on the object by the finger. + * The total work W is the sum of all dW along the path. + * + * dW = F*dx, where dx is the piece of path traveled. + * Force is change of momentum over time, F = dp/dt = m dv/dt. + * Then substituting: + * dW = m (dv/dt) * dx = m * v * dv + * + * Summing along the path, we get: + * W = sum(dW) = sum(m * v * dv) = m * sum(v * dv) + * Since the mass stays constant, the equation for final velocity is: + * vfinal = sqrt(2*sum(v * dv)) + * + * Here, + * dv : change of velocity = (v[i+1]-v[i]) + * dx : change of distance = (x[i+1]-x[i]) + * dt : change of time = (t[i+1]-t[i]) + * v : instantaneous velocity = dx/dt + * + * The final formula is: + * vfinal = sqrt(2) * sqrt(sum((v[i]-v[i-1])*|v[i]|)) for all i + * The absolute value is needed to properly account for the sign. If the velocity over a + * particular segment descreases, then this indicates braking, which means that negative + * work was done. So for two positive, but decreasing, velocities, this contribution would be + * negative and will cause a smaller final velocity. + * + * Initial condition + * There are two ways to deal with initial condition: + * 1) Assume that v(0) = 0, which would mean that the screen is initially at rest. + * This is not entirely accurate. We are only taking the past X ms of touch data, where X is + * currently equal to 100. However, a touch event that created a fling probably lasted for longer + * than that, which would mean that the user has already been interacting with the touchscreen + * and it has probably already been moving. + * 2) Assume that the touchscreen has already been moving at a certain velocity, calculate this + * initial velocity and the equivalent energy, and start with this initial energy. + * Consider an example where we have the following data, consisting of 3 points: + * time: t0, t1, t2 + * x : x0, x1, x2 + * v : 0 , v1, v2 + * Here is what will happen in each of these scenarios: + * 1) By directly applying the formula above with the v(0) = 0 boundary condition, we will get + * vfinal = sqrt(2*(|v1|*(v1-v0) + |v2|*(v2-v1))). This can be simplified since v0=0 + * vfinal = sqrt(2*(|v1|*v1 + |v2|*(v2-v1))) = sqrt(2*(v1^2 + |v2|*(v2 - v1))) + * since velocity is a real number + * 2) If we treat the screen as already moving, then it must already have an energy (per mass) + * equal to 1/2*v1^2. Then the initial energy should be 1/2*v1*2, and only the second segment + * will contribute to the total kinetic energy (since we can effectively consider that v0=v1). + * This will give the following expression for the final velocity: + * vfinal = sqrt(2*(1/2*v1^2 + |v2|*(v2-v1))) + * This analysis can be generalized to an arbitrary number of samples. + * + * + * Comparing the two equations above, we see that the only mathematical difference + * is the factor of 1/2 in front of the first velocity term. + * This boundary condition would allow for the "proper" calculation of the case when all of the + * samples are equally spaced in time and distance, which should suggest a constant velocity. + * + * Note that approach 2) is sensitive to the proper ordering of the data in time, since + * the boundary condition must be applied to the oldest sample to be accurate. + */ +static float kineticEnergyToVelocity(float work) { + static constexpr float sqrt2 = 1.41421356237; + return (work < 0 ? -1.0 : 1.0) * sqrtf(fabsf(work)) * sqrt2; +} + +static float calculateImpulseVelocity(const nsecs_t* t, const float* x, size_t count) { + // The input should be in reversed time order (most recent sample at index i=0) + // t[i] is in nanoseconds, but due to FP arithmetic, convert to seconds inside this function + static constexpr float SECONDS_PER_NANO = 1E-9; + + if (count < 2) { + return 0; // if 0 or 1 points, velocity is zero + } + if (t[1] > t[0]) { // Algorithm will still work, but not perfectly + ALOGE("Samples provided to calculateImpulseVelocity in the wrong order"); + } + if (count == 2) { // if 2 points, basic linear calculation + if (t[1] == t[0]) { + ALOGE("Events have identical time stamps t=%" PRId64 ", setting velocity = 0", t[0]); + return 0; + } + return (x[1] - x[0]) / (SECONDS_PER_NANO * (t[1] - t[0])); + } + // Guaranteed to have at least 3 points here + float work = 0; + for (size_t i = count - 1; i > 0 ; i--) { // start with the oldest sample and go forward in time + if (t[i] == t[i-1]) { + ALOGE("Events have identical time stamps t=%" PRId64 ", skipping sample", t[i]); + continue; + } + float vprev = kineticEnergyToVelocity(work); // v[i-1] + float vcurr = (x[i] - x[i-1]) / (SECONDS_PER_NANO * (t[i] - t[i-1])); // v[i] + work += (vcurr - vprev) * fabsf(vcurr); + if (i == count - 1) { + work *= 0.5; // initial condition, case 2) above + } + } + return kineticEnergyToVelocity(work); +} + +bool ImpulseVelocityTrackerStrategy::getEstimator(uint32_t id, + VelocityTracker::Estimator* outEstimator) const { + outEstimator->clear(); + + // Iterate over movement samples in reverse time order and collect samples. + float x[HISTORY_SIZE]; + float y[HISTORY_SIZE]; + nsecs_t time[HISTORY_SIZE]; + size_t m = 0; // number of points that will be used for fitting + size_t index = mIndex; + const Movement& newestMovement = mMovements[mIndex]; + do { + const Movement& movement = mMovements[index]; + if (!movement.idBits.hasBit(id)) { + break; + } + + nsecs_t age = newestMovement.eventTime - movement.eventTime; + if (age > HORIZON) { + break; + } + + const VelocityTracker::Position& position = movement.getPosition(id); + x[m] = position.x; + y[m] = position.y; + time[m] = movement.eventTime; + index = (index == 0 ? HISTORY_SIZE : index) - 1; + } while (++m < HISTORY_SIZE); + + if (m == 0) { + return false; // no data + } + outEstimator->xCoeff[0] = 0; + outEstimator->yCoeff[0] = 0; + outEstimator->xCoeff[1] = calculateImpulseVelocity(time, x, m); + outEstimator->yCoeff[1] = calculateImpulseVelocity(time, y, m); + outEstimator->xCoeff[2] = 0; + outEstimator->yCoeff[2] = 0; + outEstimator->time = newestMovement.eventTime; + outEstimator->degree = 2; // similar results to 2nd degree fit + outEstimator->confidence = 1; +#if DEBUG_STRATEGY + ALOGD("velocity: (%f, %f)", outEstimator->xCoeff[1], outEstimator->yCoeff[1]); +#endif + return true; +} + } // namespace android diff --git a/libs/input/tests/Android.bp b/libs/input/tests/Android.bp index 8137e3dbf6..aca9521c76 100644 --- a/libs/input/tests/Android.bp +++ b/libs/input/tests/Android.bp @@ -6,6 +6,7 @@ cc_test { "InputChannel_test.cpp", "InputEvent_test.cpp", "InputPublisherAndConsumer_test.cpp", + "VelocityTracker_test.cpp", ], cflags: [ "-Wall", @@ -19,6 +20,7 @@ cc_test { "libutils", "libbinder", "libui", + "libbase", ] } diff --git a/libs/input/tests/InputChannel_test.cpp b/libs/input/tests/InputChannel_test.cpp index e71ebe2a1d..96c165cac2 100644 --- a/libs/input/tests/InputChannel_test.cpp +++ b/libs/input/tests/InputChannel_test.cpp @@ -41,9 +41,9 @@ TEST_F(InputChannelTest, ConstructorAndDestructor_TakesOwnershipOfFileDescriptor // of a pipe and to check for EPIPE on the other end after the channel is destroyed. Pipe pipe; - sp<InputChannel> inputChannel = new InputChannel(String8("channel name"), pipe.sendFd); + sp<InputChannel> inputChannel = new InputChannel("channel name", pipe.sendFd); - EXPECT_STREQ("channel name", inputChannel->getName().string()) + EXPECT_STREQ("channel name", inputChannel->getName().c_str()) << "channel should have provided name"; EXPECT_EQ(pipe.sendFd, inputChannel->getFd()) << "channel should have provided fd"; @@ -60,16 +60,16 @@ TEST_F(InputChannelTest, ConstructorAndDestructor_TakesOwnershipOfFileDescriptor TEST_F(InputChannelTest, OpenInputChannelPair_ReturnsAPairOfConnectedChannels) { sp<InputChannel> serverChannel, clientChannel; - status_t result = InputChannel::openInputChannelPair(String8("channel name"), + status_t result = InputChannel::openInputChannelPair("channel name", serverChannel, clientChannel); ASSERT_EQ(OK, result) << "should have successfully opened a channel pair"; // Name - EXPECT_STREQ("channel name (server)", serverChannel->getName().string()) + EXPECT_STREQ("channel name (server)", serverChannel->getName().c_str()) << "server channel should have suffixed name"; - EXPECT_STREQ("channel name (client)", clientChannel->getName().string()) + EXPECT_STREQ("channel name (client)", clientChannel->getName().c_str()) << "client channel should have suffixed name"; // Server->Client communication @@ -111,7 +111,7 @@ TEST_F(InputChannelTest, OpenInputChannelPair_ReturnsAPairOfConnectedChannels) { TEST_F(InputChannelTest, ReceiveSignal_WhenNoSignalPresent_ReturnsAnError) { sp<InputChannel> serverChannel, clientChannel; - status_t result = InputChannel::openInputChannelPair(String8("channel name"), + status_t result = InputChannel::openInputChannelPair("channel name", serverChannel, clientChannel); ASSERT_EQ(OK, result) @@ -125,7 +125,7 @@ TEST_F(InputChannelTest, ReceiveSignal_WhenNoSignalPresent_ReturnsAnError) { TEST_F(InputChannelTest, ReceiveSignal_WhenPeerClosed_ReturnsAnError) { sp<InputChannel> serverChannel, clientChannel; - status_t result = InputChannel::openInputChannelPair(String8("channel name"), + status_t result = InputChannel::openInputChannelPair("channel name", serverChannel, clientChannel); ASSERT_EQ(OK, result) @@ -141,7 +141,7 @@ TEST_F(InputChannelTest, ReceiveSignal_WhenPeerClosed_ReturnsAnError) { TEST_F(InputChannelTest, SendSignal_WhenPeerClosed_ReturnsAnError) { sp<InputChannel> serverChannel, clientChannel; - status_t result = InputChannel::openInputChannelPair(String8("channel name"), + status_t result = InputChannel::openInputChannelPair("channel name", serverChannel, clientChannel); ASSERT_EQ(OK, result) diff --git a/libs/input/tests/InputPublisherAndConsumer_test.cpp b/libs/input/tests/InputPublisherAndConsumer_test.cpp index 34c52d03d1..c5322414fd 100644 --- a/libs/input/tests/InputPublisherAndConsumer_test.cpp +++ b/libs/input/tests/InputPublisherAndConsumer_test.cpp @@ -36,7 +36,7 @@ protected: PreallocatedInputEventFactory mEventFactory; virtual void SetUp() { - status_t result = InputChannel::openInputChannelPair(String8("channel name"), + status_t result = InputChannel::openInputChannelPair("channel name", serverChannel, clientChannel); mPublisher = new InputPublisher(serverChannel); @@ -254,19 +254,36 @@ TEST_F(InputPublisherAndConsumerTest, PublishMotionEvent_EndToEnd) { ASSERT_NO_FATAL_FAILURE(PublishAndConsumeMotionEvent()); } +TEST_F(InputPublisherAndConsumerTest, PublishMotionEvent_WhenSequenceNumberIsZero_ReturnsError) { + status_t status; + const size_t pointerCount = 1; + PointerProperties pointerProperties[pointerCount]; + PointerCoords pointerCoords[pointerCount]; + for (size_t i = 0; i < pointerCount; i++) { + pointerProperties[i].clear(); + pointerCoords[i].clear(); + } + + status = mPublisher->publishMotionEvent(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + pointerCount, pointerProperties, pointerCoords); + ASSERT_EQ(BAD_VALUE, status) + << "publisher publishMotionEvent should return BAD_VALUE"; +} + TEST_F(InputPublisherAndConsumerTest, PublishMotionEvent_WhenPointerCountLessThan1_ReturnsError) { status_t status; const size_t pointerCount = 0; PointerProperties pointerProperties[pointerCount]; PointerCoords pointerCoords[pointerCount]; - status = mPublisher->publishMotionEvent(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + status = mPublisher->publishMotionEvent(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, pointerCount, pointerProperties, pointerCoords); ASSERT_EQ(BAD_VALUE, status) << "publisher publishMotionEvent should return BAD_VALUE"; } -TEST_F(InputPublisherAndConsumerTest, PublishMotionEvent_WhenPointerCountGreaterThanMax_ReturnsError) { +TEST_F(InputPublisherAndConsumerTest, + PublishMotionEvent_WhenPointerCountGreaterThanMax_ReturnsError) { status_t status; const size_t pointerCount = MAX_POINTERS + 1; PointerProperties pointerProperties[pointerCount]; @@ -276,7 +293,7 @@ TEST_F(InputPublisherAndConsumerTest, PublishMotionEvent_WhenPointerCountGreater pointerCoords[i].clear(); } - status = mPublisher->publishMotionEvent(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + status = mPublisher->publishMotionEvent(1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, pointerCount, pointerProperties, pointerCoords); ASSERT_EQ(BAD_VALUE, status) << "publisher publishMotionEvent should return BAD_VALUE"; diff --git a/libs/input/tests/VelocityTracker_test.cpp b/libs/input/tests/VelocityTracker_test.cpp new file mode 100644 index 0000000000..43b6012e0d --- /dev/null +++ b/libs/input/tests/VelocityTracker_test.cpp @@ -0,0 +1,664 @@ +/* + * Copyright (C) 2017 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. + */ + +#define LOG_TAG "VelocityTracker_test" + +#include <math.h> + +#include <android-base/stringprintf.h> +#include <gtest/gtest.h> +#include <input/VelocityTracker.h> + +using android::base::StringPrintf; + +namespace android { + +constexpr int32_t DEFAULT_POINTER_ID = 0; // pointer ID used for manually defined tests + +// velocity must be in the range (1-tol)*EV <= velocity <= (1+tol)*EV +// here EV = expected value, tol = VELOCITY_TOLERANCE +constexpr float VELOCITY_TOLERANCE = 0.2; + +// --- VelocityTrackerTest --- +class VelocityTrackerTest : public testing::Test { }; + +static void checkVelocity(float Vactual, float Vtarget) { + // Compare directions + if ((Vactual > 0 && Vtarget <= 0) || (Vactual < 0 && Vtarget >= 0)) { + FAIL() << StringPrintf("Velocity %f does not have the same direction" + " as the target velocity %f", Vactual, Vtarget); + } + + // Compare magnitudes + const float Vlower = fabsf(Vtarget * (1 - VELOCITY_TOLERANCE)); + const float Vupper = fabsf(Vtarget * (1 + VELOCITY_TOLERANCE)); + if (fabsf(Vactual) < Vlower) { + FAIL() << StringPrintf("Velocity %f is more than %.0f%% below target velocity %f", + Vactual, VELOCITY_TOLERANCE * 100, Vtarget); + } + if (fabsf(Vactual) > Vupper) { + FAIL() << StringPrintf("Velocity %f is more than %.0f%% above target velocity %f", + Vactual, VELOCITY_TOLERANCE * 100, Vtarget); + } + SUCCEED() << StringPrintf("Velocity %f within %.0f%% of target %f)", + Vactual, VELOCITY_TOLERANCE * 100, Vtarget); +} + +void failWithMessage(std::string message) { + FAIL() << message; // cannot do this directly from a non-void function +} + +struct Position { + nsecs_t time; + float x; + float y; +}; + + +MotionEvent* createSimpleMotionEvent(const Position* positions, size_t numSamples) { + /** + * Only populate the basic fields of a MotionEvent, such as time and a single axis + * Designed for use with manually-defined tests. + * Create a new MotionEvent on the heap, caller responsible for destroying the object. + */ + if (numSamples < 1) { + failWithMessage(StringPrintf("Need at least 1 sample to create a MotionEvent." + " Received numSamples=%zu", numSamples)); + } + + MotionEvent* event = new MotionEvent(); + PointerCoords coords; + PointerProperties properties[1]; + + properties[0].id = DEFAULT_POINTER_ID; + properties[0].toolType = AMOTION_EVENT_TOOL_TYPE_FINGER; + + // First sample added separately with initialize + coords.setAxisValue(AMOTION_EVENT_AXIS_X, positions[0].x); + coords.setAxisValue(AMOTION_EVENT_AXIS_Y, positions[0].y); + event->initialize(0, AINPUT_SOURCE_TOUCHSCREEN, AMOTION_EVENT_ACTION_MOVE, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, positions[0].time, 1, properties, &coords); + + for (size_t i = 1; i < numSamples; i++) { + coords.setAxisValue(AMOTION_EVENT_AXIS_X, positions[i].x); + coords.setAxisValue(AMOTION_EVENT_AXIS_Y, positions[i].y); + event->addSample(positions[i].time, &coords); + } + return event; +} + +static void computeAndCheckVelocity(const Position* positions, size_t numSamples, + int32_t axis, float targetVelocity) { + VelocityTracker vt(nullptr); + float Vx, Vy; + + MotionEvent* event = createSimpleMotionEvent(positions, numSamples); + vt.addMovement(event); + + vt.getVelocity(DEFAULT_POINTER_ID, &Vx, &Vy); + + switch (axis) { + case AMOTION_EVENT_AXIS_X: + checkVelocity(Vx, targetVelocity); + break; + case AMOTION_EVENT_AXIS_Y: + checkVelocity(Vy, targetVelocity); + break; + default: + FAIL() << "Axis must be either AMOTION_EVENT_AXIS_X or AMOTION_EVENT_AXIS_Y"; + } + delete event; +} + +/* + * ================== VelocityTracker tests generated manually ===================================== + */ + // @todo Currently disabled, enable when switching away from lsq2 VelocityTrackerStrategy +TEST_F(VelocityTrackerTest, DISABLED_ThreePointsPositiveVelocityTest) { + // Same coordinate is reported 2 times in a row + // It is difficult to determine the correct answer here, but at least the direction + // of the reported velocity should be positive. + Position values[] = { + { 0, 273, NAN }, + { 12585000, 293, NAN }, + { 14730000, 293, NAN }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 1600); +} + +TEST_F(VelocityTrackerTest, ThreePointsZeroVelocityTest) { + // Same coordinate is reported 3 times in a row + Position values[] = { + { 0, 293, NAN }, + { 6132000, 293, NAN }, + { 11283000, 293, NAN }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 0); +} + +TEST_F(VelocityTrackerTest, ThreePointsLinearVelocityTest) { + // Fixed velocity at 5 points per 10 milliseconds + Position values[] = { + { 0, 0, NAN }, + { 10000000, 5, NAN }, + { 20000000, 10, NAN }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 500); +} + + +/** + * ================== VelocityTracker tests generated by recording real events ===================== + * + * To add a test, record the input coordinates and event times to all calls + * to void VelocityTracker::addMovement(const MotionEvent* event). + * Also record all calls to VelocityTracker::clear(). + * Finally, record the output of VelocityTracker::getVelocity(...) + * This will give you the necessary data to create a new test. + */ + +// --------------- Recorded by hand on swordfish --------------------------------------------------- +// @todo Currently disabled, enable when switching away from lsq2 VelocityTrackerStrategy +TEST_F(VelocityTrackerTest, DISABLED_SwordfishFlingDown) { + // Recording of a fling on Swordfish that could cause a fling in the wrong direction + Position values[] = { + { 0, 271, 96 }, + { 16071042, 269.786346, 106.922775 }, + { 35648403, 267.983063, 156.660034 }, + { 52313925, 262.638397, 220.339081 }, + { 68976522, 266.138824, 331.581116 }, + { 85639375, 274.79245, 428.113159 }, + { 96948871, 274.79245, 428.113159 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 623.577637); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 8523.348633); +} + +// --------------- Recorded by hand on sailfish, generated by a script ----------------------------- +// For some of these tests, the X-direction velocity checking has been removed, because the lsq2 +// and the impulse VelocityTrackerStrategies did not agree within 20%. +// Since the flings were recorded in the Y-direction, the intentional user action should only +// be relevant for the Y axis. +// There have been also cases where lsq2 and impulse disagreed more than 20% in the Y-direction. +// Those recordings have been discarded because we didn't feel one strategy's interpretation was +// more correct than another's but didn't want to increase the tolerance for the entire test suite. +// +// There are 18 tests total below: 9 in the positive Y direction and 9 in the opposite. +// The recordings were loosely binned into 3 categories - slow, faster, and fast, which roughly +// characterizes the velocity of the finger motion. +// These can be treated approximately as: +// slow - less than 1 page gets scrolled +// faster - more than 1 page gets scrolled, but less than 3 +// fast - entire list is scrolled (fling is done as hard as possible) + +TEST_F(VelocityTrackerTest, SailfishFlingUpSlow1) { + // Sailfish - fling up - slow - 1 + Position values[] = { + { 235089067457000, 528.00, 983.00 }, + { 235089084684000, 527.00, 981.00 }, + { 235089093349000, 527.00, 977.00 }, + { 235089095677625, 527.00, 975.93 }, + { 235089101859000, 527.00, 970.00 }, + { 235089110378000, 528.00, 960.00 }, + { 235089112497111, 528.25, 957.51 }, + { 235089118760000, 531.00, 946.00 }, + { 235089126686000, 535.00, 931.00 }, + { 235089129316820, 536.33, 926.02 }, + { 235089135199000, 540.00, 914.00 }, + { 235089144297000, 546.00, 896.00 }, + { 235089146136443, 547.21, 892.36 }, + { 235089152923000, 553.00, 877.00 }, + { 235089160784000, 559.00, 851.00 }, + { 235089162955851, 560.66, 843.82 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 872.794617); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 951.698181); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -3604.819336); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -3044.966064); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingUpSlow2) { + // Sailfish - fling up - slow - 2 + Position values[] = { + { 235110560704000, 522.00, 1107.00 }, + { 235110575764000, 522.00, 1107.00 }, + { 235110584385000, 522.00, 1107.00 }, + { 235110588421179, 521.52, 1106.52 }, + { 235110592830000, 521.00, 1106.00 }, + { 235110601385000, 520.00, 1104.00 }, + { 235110605088160, 519.14, 1102.27 }, + { 235110609952000, 518.00, 1100.00 }, + { 235110618353000, 517.00, 1093.00 }, + { 235110621755146, 516.60, 1090.17 }, + { 235110627010000, 517.00, 1081.00 }, + { 235110634785000, 518.00, 1063.00 }, + { 235110638422450, 518.87, 1052.58 }, + { 235110643161000, 520.00, 1039.00 }, + { 235110651767000, 524.00, 1011.00 }, + { 235110655089581, 525.54, 1000.19 }, + { 235110660368000, 530.00, 980.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -4096.583008); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -3455.094238); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingUpSlow3) { + // Sailfish - fling up - slow - 3 + Position values[] = { + { 792536237000, 580.00, 1317.00 }, + { 792541538987, 580.63, 1311.94 }, + { 792544613000, 581.00, 1309.00 }, + { 792552301000, 583.00, 1295.00 }, + { 792558362309, 585.13, 1282.92 }, + { 792560828000, 586.00, 1278.00 }, + { 792569446000, 589.00, 1256.00 }, + { 792575185095, 591.54, 1241.41 }, + { 792578491000, 593.00, 1233.00 }, + { 792587044000, 597.00, 1211.00 }, + { 792592008172, 600.28, 1195.92 }, + { 792594616000, 602.00, 1188.00 }, + { 792603129000, 607.00, 1167.00 }, + { 792608831290, 609.48, 1155.83 }, + { 792612321000, 611.00, 1149.00 }, + { 792620768000, 615.00, 1131.00 }, + { 792625653873, 617.32, 1121.73 }, + { 792629200000, 619.00, 1115.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 574.33429); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 617.40564); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -2361.982666); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -2500.055664); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingUpFaster1) { + // Sailfish - fling up - faster - 1 + Position values[] = { + { 235160420675000, 610.00, 1042.00 }, + { 235160428220000, 609.00, 1026.00 }, + { 235160436544000, 609.00, 1024.00 }, + { 235160441852394, 609.64, 1020.82 }, + { 235160444878000, 610.00, 1019.00 }, + { 235160452673000, 613.00, 1006.00 }, + { 235160458519743, 617.18, 992.06 }, + { 235160461061000, 619.00, 986.00 }, + { 235160469798000, 627.00, 960.00 }, + { 235160475186713, 632.22, 943.02 }, + { 235160478051000, 635.00, 934.00 }, + { 235160486489000, 644.00, 906.00 }, + { 235160491853697, 649.56, 890.56 }, + { 235160495177000, 653.00, 881.00 }, + { 235160504148000, 662.00, 858.00 }, + { 235160509231495, 666.81, 845.37 }, + { 235160512603000, 670.00, 837.00 }, + { 235160520366000, 679.00, 814.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 1274.141724); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 1438.53186); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -3877.35498); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -3695.859619); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingUpFaster2) { + // Sailfish - fling up - faster - 2 + Position values[] = { + { 847153808000, 576.00, 1264.00 }, + { 847171174000, 576.00, 1262.00 }, + { 847179640000, 576.00, 1257.00 }, + { 847185187540, 577.41, 1249.22 }, + { 847187487000, 578.00, 1246.00 }, + { 847195710000, 581.00, 1227.00 }, + { 847202027059, 583.93, 1209.40 }, + { 847204324000, 585.00, 1203.00 }, + { 847212672000, 590.00, 1176.00 }, + { 847218861395, 594.36, 1157.11 }, + { 847221190000, 596.00, 1150.00 }, + { 847230484000, 602.00, 1124.00 }, + { 847235701400, 607.56, 1103.83 }, + { 847237986000, 610.00, 1095.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -4280.07959); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -4241.004395); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingUpFaster3) { + // Sailfish - fling up - faster - 3 + Position values[] = { + { 235200532789000, 507.00, 1084.00 }, + { 235200549221000, 507.00, 1083.00 }, + { 235200557841000, 507.00, 1081.00 }, + { 235200558051189, 507.00, 1080.95 }, + { 235200566314000, 507.00, 1078.00 }, + { 235200574876586, 508.97, 1070.12 }, + { 235200575006000, 509.00, 1070.00 }, + { 235200582900000, 514.00, 1054.00 }, + { 235200591276000, 525.00, 1023.00 }, + { 235200591701829, 525.56, 1021.42 }, + { 235200600064000, 542.00, 976.00 }, + { 235200608519000, 563.00, 911.00 }, + { 235200608527086, 563.02, 910.94 }, + { 235200616933000, 590.00, 844.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -8715.686523); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -7639.026367); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingUpFast1) { + // Sailfish - fling up - fast - 1 + Position values[] = { + { 920922149000, 561.00, 1412.00 }, + { 920930185000, 559.00, 1377.00 }, + { 920930262463, 558.98, 1376.66 }, + { 920938547000, 559.00, 1371.00 }, + { 920947096857, 562.91, 1342.68 }, + { 920947302000, 563.00, 1342.00 }, + { 920955502000, 577.00, 1272.00 }, + { 920963931021, 596.87, 1190.54 }, + { 920963987000, 597.00, 1190.00 }, + { 920972530000, 631.00, 1093.00 }, + { 920980765511, 671.31, 994.68 }, + { 920980906000, 672.00, 993.00 }, + { 920989261000, 715.00, 903.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 5670.329102); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, 5991.866699); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -13021.101562); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -15093.995117); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingUpFast2) { + // Sailfish - fling up - fast - 2 + Position values[] = { + { 235247153233000, 518.00, 1168.00 }, + { 235247170452000, 517.00, 1167.00 }, + { 235247178908000, 515.00, 1159.00 }, + { 235247179556213, 514.85, 1158.39 }, + { 235247186821000, 515.00, 1125.00 }, + { 235247195265000, 521.00, 1051.00 }, + { 235247196389476, 521.80, 1041.15 }, + { 235247203649000, 538.00, 932.00 }, + { 235247212253000, 571.00, 794.00 }, + { 235247213222491, 574.72, 778.45 }, + { 235247220736000, 620.00, 641.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -20286.958984); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -20494.587891); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingUpFast3) { + // Sailfish - fling up - fast - 3 + Position values[] = { + { 235302568736000, 529.00, 1167.00 }, + { 235302576644000, 523.00, 1140.00 }, + { 235302579395063, 520.91, 1130.61 }, + { 235302585140000, 522.00, 1130.00 }, + { 235302593615000, 527.00, 1065.00 }, + { 235302596207444, 528.53, 1045.12 }, + { 235302602102000, 559.00, 872.00 }, + { 235302610545000, 652.00, 605.00 }, + { 235302613019881, 679.26, 526.73 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -39295.941406); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, -36461.421875); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownSlow1) { + // Sailfish - fling down - slow - 1 + Position values[] = { + { 235655749552755, 582.00, 432.49 }, + { 235655750638000, 582.00, 433.00 }, + { 235655758865000, 582.00, 440.00 }, + { 235655766221523, 581.16, 448.43 }, + { 235655767594000, 581.00, 450.00 }, + { 235655776044000, 580.00, 462.00 }, + { 235655782890696, 579.18, 474.35 }, + { 235655784360000, 579.00, 477.00 }, + { 235655792795000, 578.00, 496.00 }, + { 235655799559531, 576.27, 515.04 }, + { 235655800612000, 576.00, 518.00 }, + { 235655809535000, 574.00, 542.00 }, + { 235655816988015, 572.17, 564.86 }, + { 235655817685000, 572.00, 567.00 }, + { 235655825981000, 569.00, 595.00 }, + { 235655833808653, 566.26, 620.60 }, + { 235655834541000, 566.00, 623.00 }, + { 235655842893000, 563.00, 649.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -419.749695); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -398.303894); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 3309.016357); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 3969.099854); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownSlow2) { + // Sailfish - fling down - slow - 2 + Position values[] = { + { 235671152083370, 485.24, 558.28 }, + { 235671154126000, 485.00, 559.00 }, + { 235671162497000, 484.00, 566.00 }, + { 235671168750511, 483.27, 573.29 }, + { 235671171071000, 483.00, 576.00 }, + { 235671179390000, 482.00, 588.00 }, + { 235671185417210, 481.31, 598.98 }, + { 235671188173000, 481.00, 604.00 }, + { 235671196371000, 480.00, 624.00 }, + { 235671202084196, 479.27, 639.98 }, + { 235671204235000, 479.00, 646.00 }, + { 235671212554000, 478.00, 673.00 }, + { 235671219471011, 476.39, 697.12 }, + { 235671221159000, 476.00, 703.00 }, + { 235671229592000, 474.00, 734.00 }, + { 235671236281462, 472.43, 758.38 }, + { 235671238098000, 472.00, 765.00 }, + { 235671246532000, 470.00, 799.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -262.80426); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -243.665344); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 4215.682129); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 4587.986816); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownSlow3) { + // Sailfish - fling down - slow - 3 + Position values[] = { + { 170983201000, 557.00, 533.00 }, + { 171000668000, 556.00, 534.00 }, + { 171007359750, 554.73, 535.27 }, + { 171011197000, 554.00, 536.00 }, + { 171017660000, 552.00, 540.00 }, + { 171024201831, 549.97, 544.73 }, + { 171027333000, 549.00, 547.00 }, + { 171034603000, 545.00, 557.00 }, + { 171041043371, 541.98, 567.55 }, + { 171043147000, 541.00, 571.00 }, + { 171051052000, 536.00, 586.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -723.413513); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -651.038452); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 2091.502441); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 1934.517456); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownFaster1) { + // Sailfish - fling down - faster - 1 + Position values[] = { + { 235695280333000, 558.00, 451.00 }, + { 235695283971237, 558.43, 454.45 }, + { 235695289038000, 559.00, 462.00 }, + { 235695297388000, 561.00, 478.00 }, + { 235695300638465, 561.83, 486.25 }, + { 235695305265000, 563.00, 498.00 }, + { 235695313591000, 564.00, 521.00 }, + { 235695317305492, 564.43, 532.68 }, + { 235695322181000, 565.00, 548.00 }, + { 235695330709000, 565.00, 577.00 }, + { 235695333972227, 565.00, 588.10 }, + { 235695339250000, 565.00, 609.00 }, + { 235695347839000, 565.00, 642.00 }, + { 235695351313257, 565.00, 656.18 }, + { 235695356412000, 565.00, 677.00 }, + { 235695364899000, 563.00, 710.00 }, + { 235695368118682, 562.24, 722.52 }, + { 235695373403000, 564.00, 744.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 4254.639648); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 4698.415039); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownFaster2) { + // Sailfish - fling down - faster - 2 + Position values[] = { + { 235709624766000, 535.00, 579.00 }, + { 235709642256000, 534.00, 580.00 }, + { 235709643350278, 533.94, 580.06 }, + { 235709650760000, 532.00, 584.00 }, + { 235709658615000, 530.00, 593.00 }, + { 235709660170495, 529.60, 594.78 }, + { 235709667095000, 527.00, 606.00 }, + { 235709675616000, 524.00, 628.00 }, + { 235709676983261, 523.52, 631.53 }, + { 235709684289000, 521.00, 652.00 }, + { 235709692763000, 518.00, 682.00 }, + { 235709693804993, 517.63, 685.69 }, + { 235709701438000, 515.00, 709.00 }, + { 235709709830000, 512.00, 739.00 }, + { 235709710626776, 511.72, 741.85 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -430.440247); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -447.600311); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 3953.859375); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 4316.155273); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownFaster3) { + // Sailfish - fling down - faster - 3 + Position values[] = { + { 235727628927000, 540.00, 440.00 }, + { 235727636810000, 537.00, 454.00 }, + { 235727646176000, 536.00, 454.00 }, + { 235727653586628, 535.12, 456.65 }, + { 235727654557000, 535.00, 457.00 }, + { 235727663024000, 534.00, 465.00 }, + { 235727670410103, 533.04, 479.45 }, + { 235727670691000, 533.00, 480.00 }, + { 235727679255000, 531.00, 501.00 }, + { 235727687233704, 529.09, 526.73 }, + { 235727687628000, 529.00, 528.00 }, + { 235727696113000, 526.00, 558.00 }, + { 235727704057546, 523.18, 588.98 }, + { 235727704576000, 523.00, 591.00 }, + { 235727713099000, 520.00, 626.00 }, + { 235727720880776, 516.33, 655.36 }, + { 235727721580000, 516.00, 658.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 4484.617676); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 4927.92627); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownFast1) { + // Sailfish - fling down - fast - 1 + Position values[] = { + { 235762352849000, 467.00, 286.00 }, + { 235762360250000, 443.00, 344.00 }, + { 235762362787412, 434.77, 363.89 }, + { 235762368807000, 438.00, 359.00 }, + { 235762377220000, 425.00, 423.00 }, + { 235762379608561, 421.31, 441.17 }, + { 235762385698000, 412.00, 528.00 }, + { 235762394133000, 406.00, 648.00 }, + { 235762396429369, 404.37, 680.67 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 19084.931641); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 16064.685547); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownFast2) { + // Sailfish - fling down - fast - 2 + Position values[] = { + { 235772487188000, 576.00, 204.00 }, + { 235772495159000, 553.00, 236.00 }, + { 235772503568000, 551.00, 240.00 }, + { 235772508192247, 545.55, 254.17 }, + { 235772512051000, 541.00, 266.00 }, + { 235772520794000, 520.00, 337.00 }, + { 235772525015263, 508.92, 394.43 }, + { 235772529174000, 498.00, 451.00 }, + { 235772537635000, 484.00, 589.00 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 18660.048828); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 16918.439453); // lsq2 +} + + +TEST_F(VelocityTrackerTest, SailfishFlingDownFast3) { + // Sailfish - fling down - fast - 3 + Position values[] = { + { 507650295000, 628.00, 233.00 }, + { 507658234000, 605.00, 269.00 }, + { 507666784000, 601.00, 274.00 }, + { 507669660483, 599.65, 275.68 }, + { 507675427000, 582.00, 308.00 }, + { 507683740000, 541.00, 404.00 }, + { 507686506238, 527.36, 435.95 }, + { 507692220000, 487.00, 581.00 }, + { 507700707000, 454.00, 792.00 }, + { 507703352649, 443.71, 857.77 }, + }; + size_t count = sizeof(values) / sizeof(Position); + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -6772.508301); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_X, -6388.48877); // lsq2 + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 29765.908203); // impulse + computeAndCheckVelocity(values, count, AMOTION_EVENT_AXIS_Y, 28354.796875); // lsq2 +} + + +} // namespace android |