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

Commit 0f04c453 authored by Amy Zhang's avatar Amy Zhang
Browse files

Add aidl interfaces for Frontend Settings and Frontend Callbacks 

Test: make mediatuner
Bug: 172079283
Change-Id: I7c23b04872346f9c517d101321d2e915a3f2c47d
parent a71f8a2a

services/tuner/Android.bp

+18 −1
Original line number Diff line number Diff line 
filegroup {

    name: "tv_tuner_aidl",

    srcs: [

        "aidl/android/media/tv/tuner/ITunerFrontend.aidl",

        "aidl/android/media/tv/tuner/ITunerFrontendCallback.aidl",

        "aidl/android/media/tv/tuner/ITunerService.aidl",

        "aidl/android/media/tv/tuner/TunerAtsc3PlpInfo.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendAnalogCapabilities.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendAtscCapabilities.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendAtsc3Capabilities.aidl",
@@ -12,6 +15,19 @@ filegroup { 
        "aidl/android/media/tv/tuner/TunerFrontendIsdbsCapabilities.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendIsdbs3Capabilities.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendIsdbtCapabilities.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendAnalogSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendAtsc3PlpSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendAtsc3Settings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendAtscSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendCableSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendDvbsCodeRate.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendDvbsSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendDvbtSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendIsdbs3Settings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendIsdbsSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendIsdbtSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendSettings.aidl",

        "aidl/android/media/tv/tuner/TunerFrontendStatus.aidl",

        "aidl/android/media/tv/tuner/TunerServiceFrontendInfo.aidl",

    ],

    path: "aidl",
@@ -31,6 +47,7 @@ cc_library { 


    srcs: [

        "TunerService.cpp",

        "TunerFrontend.cpp"

    ],



    shared_libs: [

services/tuner/TunerFrontend.cpp

0 → 100644
+463 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tuner/TunerFrontend.h

0 → 100644
+87 −0

File added.

Preview size limit exceeded, changes collapsed.

services/tuner/TunerService.cpp

+26 −21

File changed.

Preview size limit exceeded, changes collapsed.

services/tuner/TunerService.h

+8 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


using Status = ::ndk::ScopedAStatus;

using ::aidl::android::media::tv::tuner::BnTunerService;

using ::aidl::android::media::tv::tuner::ITunerFrontend;

using ::aidl::android::media::tv::tuner::TunerServiceFrontendInfo;

using ::android::hardware::tv::tuner::V1_0::FrontendInfo;

using ::android::hardware::tv::tuner::V1_0::ITuner;
@@ -36,13 +37,19 @@ public: 
    static void instantiate();

    TunerService();

    virtual ~TunerService();



    static int getResourceIdFromHandle(int resourceHandle) {

        return (resourceHandle & 0x00ff0000) >> 16;

    }



    Status getFrontendIds(std::vector<int32_t>* ids, int32_t* _aidl_return) override;

    Status getFrontendInfo(int32_t frontendHandle, TunerServiceFrontendInfo* _aidl_return) override;

    Status openFrontend(

            int32_t frontendHandle, std::shared_ptr<ITunerFrontend>* _aidl_return) override;



private:

    static sp<ITuner> mTuner;



    int getResourceIdFromHandle(int resourceHandle);

    TunerServiceFrontendInfo convertToAidlFrontendInfo(int feId, FrontendInfo halInfo);

};