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

Commit 8a978a12 authored by Hongguang Chen's avatar Hongguang Chen Committed by Android (Google) Code Review
Browse files

Merge "TV Input 2.0 JNI"

parents 34f0af63 412ff42f

services/core/jni/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ cc_library_static { 
        "BroadcastRadio/convert.cpp",

        "BroadcastRadio/regions.cpp",

        "stats/SurfaceFlingerPuller.cpp",

        "tvinput/BufferProducerThread.cpp",

        "tvinput/JTvInputHal.cpp",

        "tvinput/TvInputHal_hidl.cpp",

        "com_android_server_adb_AdbDebuggingManager.cpp",

        "com_android_server_am_BatteryStatsService.cpp",

        "com_android_server_biometrics_SurfaceToNativeHandleConverter.cpp",
@@ -150,6 +153,7 @@ cc_defaults { 
        "libdataloader",

        "libincfs",

        "android.hardware.audio.common@2.0",

        "android.media.audio.common.types-V1-ndk",

        "android.hardware.broadcastradio@1.0",

        "android.hardware.broadcastradio@1.1",

        "android.hardware.contexthub@1.0",
@@ -176,6 +180,7 @@ cc_defaults { 
        "android.hardware.power.stats-V1-ndk",

        "android.hardware.thermal@1.0",

        "android.hardware.tv.input@1.0",

        "android.hardware.tv.input-V1-ndk",

        "android.hardware.vibrator-V2-cpp",

        "android.hardware.vibrator@1.0",

        "android.hardware.vibrator@1.1",
@@ -197,6 +202,7 @@ cc_defaults { 


    static_libs: [

        "android.hardware.broadcastradio@common-utils-1x-lib",

        "libaidlcommonsupport",

    ],



    product_variables: {

services/core/jni/com_android_server_tv_TvInputHal.cpp

+6 −568

File changed.

Preview size limit exceeded, changes collapsed.

services/core/jni/tvinput/BufferProducerThread.cpp

0 → 100644
+147 −0

File added.

Preview size limit exceeded, changes collapsed.

services/core/jni/tvinput/BufferProducerThread.h

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

 * Copyright 2022 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.

 */



#pragma once



#include <gui/Surface.h>

#include <hardware/tv_input.h>

#include <utils/Thread.h>



namespace android {



class BufferProducerThread : public Thread {

public:

    BufferProducerThread(tv_input_device_t* device, int deviceId, const tv_stream_t* stream);



    virtual status_t readyToRun();



    void setSurface(const sp<Surface>& surface);

    void onCaptured(uint32_t seq, bool succeeded);

    void shutdown();



private:

    Mutex mLock;

    Condition mCondition;

    sp<Surface> mSurface;

    tv_input_device_t* mDevice;

    int mDeviceId;

    tv_stream_t mStream;

    sp<ANativeWindowBuffer_t> mBuffer;

    enum {

        CAPTURING,

        CAPTURED,

        RELEASED,

    } mBufferState;

    uint32_t mSeq;

    bool mShutdown;



    virtual bool threadLoop();



    void setSurfaceLocked(const sp<Surface>& surface);

};



} // namespace android

services/core/jni/tvinput/JTvInputHal.cpp

0 → 100644
+378 −0

File added.

Preview size limit exceeded, changes collapsed.