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

Commit c8839750 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move implementation to TouchVideoFrame.cpp"

parents e4e4116e 26cf29d7

include/input/TouchVideoFrame.h

+6 −14
Original line number Diff line number Diff line
@@ -31,37 +31,29 @@ namespace android { 
class TouchVideoFrame {

public:

    TouchVideoFrame(uint32_t width, uint32_t height, std::vector<int16_t> data,

            const struct timeval& timestamp) :

            mWidth(width), mHeight(height), mData(std::move(data)), mTimestamp(timestamp) {

    }

            const struct timeval& timestamp);



    bool operator==(const TouchVideoFrame& rhs) const {

        return mWidth == rhs.mWidth

                && mHeight == rhs.mHeight

                && mData == rhs.mData

                && mTimestamp.tv_sec == rhs.mTimestamp.tv_sec

                && mTimestamp.tv_usec == rhs.mTimestamp.tv_usec;

    }

    bool operator==(const TouchVideoFrame& rhs) const;



    /**

     * Width of the frame

     */

    uint32_t getWidth() const { return mWidth; }

    uint32_t getWidth() const;

    /**

     * Height of the frame

     */

    uint32_t getHeight() const { return mHeight; }

    uint32_t getHeight() const;

    /**

     * The touch strength data.

     * The array is a 2-D row-major matrix, with dimensions (height, width).

     * Total size of the array should equal getHeight() * getWidth().

     * Data is allowed to be negative.

     */

    const std::vector<int16_t>& getData() const { return mData; }

    const std::vector<int16_t>& getData() const;

    /**

     * Time at which the heatmap was taken.

     */

    const struct timeval& getTimestamp() const { return mTimestamp; }

    const struct timeval& getTimestamp() const;



private:

    uint32_t mWidth;

libs/input/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ cc_library { 
        "KeyCharacterMap.cpp",

        "KeyLayoutMap.cpp",

        "VirtualKeyMap.cpp",

        "TouchVideoFrame.cpp",

    ],



    clang: true,

libs/input/TouchVideoFrame.cpp

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

 * Copyright (C) 2019 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 <input/TouchVideoFrame.h>



namespace android {



TouchVideoFrame::TouchVideoFrame(uint32_t width, uint32_t height, std::vector<int16_t> data,

        const struct timeval& timestamp) :

        mWidth(width), mHeight(height), mData(std::move(data)), mTimestamp(timestamp) {

}



bool TouchVideoFrame::operator==(const TouchVideoFrame& rhs) const {

    return mWidth == rhs.mWidth

            && mHeight == rhs.mHeight

            && mData == rhs.mData

            && mTimestamp.tv_sec == rhs.mTimestamp.tv_sec

            && mTimestamp.tv_usec == rhs.mTimestamp.tv_usec;

}



uint32_t TouchVideoFrame::getWidth() const { return mWidth; }



uint32_t TouchVideoFrame::getHeight() const { return mHeight; }



const std::vector<int16_t>& TouchVideoFrame::getData() const { return mData; }



const struct timeval& TouchVideoFrame::getTimestamp() const { return mTimestamp; }



} // namespace android