commit 093c5f34fad4cf9daf2f7821a6c1574a9e7314e8
author Hongguang <hgchen@google.com> Mon Aug 09 19:46:34 2021 -0700
committer Hongguang <hgchen@google.com> Thu Aug 19 19:41:40 2021 -0700
tree 52eade6994198f8b0e39b415c6904d587ae01df4
parent 83b6427a7e35b81d8b341d0f125c4da72f24fc97

Add tuner legacy HIDL HAL support.

The AIDL HAL based solution will be the default implementation. The
tuner service will only create the legacy HIDL HAL based implementation
when the HIDL HAL is available.

Bug: 191825295
Test: atest android.media.tv.tuner.cts on both AIDL and HIDL HAL.
Test: sampletunertvinput
Change-Id: I8436ae80721ad943c60b5814b535f3b87a54ccda

services/tuner/TunerService.h

diff --git a/services/tuner/TunerService.h b/services/tuner/TunerService.h
index 164bef8..159e53e 100644
--- a/services/tuner/TunerService.h
+++ b/services/tuner/TunerService.h
@@ -17,20 +17,24 @@
 #ifndef ANDROID_MEDIA_TUNERSERVICE_H
 #define ANDROID_MEDIA_TUNERSERVICE_H
 
-#include <aidl/android/hardware/tv/tuner/BnFilterCallback.h>
 #include <aidl/android/hardware/tv/tuner/DemuxFilterEvent.h>
 #include <aidl/android/hardware/tv/tuner/DemuxFilterStatus.h>
 #include <aidl/android/hardware/tv/tuner/ITuner.h>
 #include <aidl/android/media/tv/tuner/BnTunerService.h>
-#include <aidl/android/media/tv/tunerresourcemanager/ITunerResourceManager.h>
+#include <aidl/android/media/tv/tunerresourcemanager/TunerFrontendInfo.h>
 
-using ::aidl::android::hardware::tv::tuner::BnFilterCallback;
+#include "TunerHelper.h"
+
 using ::aidl::android::hardware::tv::tuner::DemuxCapabilities;
 using ::aidl::android::hardware::tv::tuner::DemuxFilterEvent;
 using ::aidl::android::hardware::tv::tuner::DemuxFilterStatus;
 using ::aidl::android::hardware::tv::tuner::FrontendInfo;
 using ::aidl::android::hardware::tv::tuner::ITuner;
-using ::aidl::android::media::tv::tunerresourcemanager::ITunerResourceManager;
+using ::aidl::android::media::tv::tuner::BnTunerService;
+using ::aidl::android::media::tv::tuner::ITunerDemux;
+using ::aidl::android::media::tv::tuner::ITunerFrontend;
+using ::aidl::android::media::tv::tuner::ITunerLnb;
+using ::aidl::android::media::tv::tunerresourcemanager::TunerFrontendInfo;
 
 using namespace std;
 
@@ -40,32 +44,6 @@
 namespace tv {
 namespace tuner {
 
-const static int TUNER_HAL_VERSION_UNKNOWN = 0;
-const static int TUNER_HAL_VERSION_1_0 = 1 << 16;
-const static int TUNER_HAL_VERSION_1_1 = (1 << 16) | 1;
-const static int TUNER_HAL_VERSION_2_0 = 2 << 16;
-// System Feature defined in PackageManager
-static const ::android::String16 FEATURE_TUNER(::android::String16("android.hardware.tv.tuner"));
-
-typedef enum {
-    FRONTEND,
-    LNB,
-    DEMUX,
-    DESCRAMBLER,
-} TunerResourceType;
-
-struct FilterCallback : public BnFilterCallback {
-    ~FilterCallback() {}
-    virtual ::ndk::ScopedAStatus onFilterEvent(
-            const vector<DemuxFilterEvent>& /* events */) override {
-        return ::ndk::ScopedAStatus::ok();
-    }
-
-    virtual ::ndk::ScopedAStatus onFilterStatus(const DemuxFilterStatus /*status*/) override {
-        return ::ndk::ScopedAStatus::ok();
-    }
-};
-
 class TunerService : public BnTunerService {
 public:
     static char const *getServiceName() { return "media.tuner"; }
@@ -89,28 +67,13 @@
                                          shared_ptr<ITunerDescrambler>* _aidl_return) override;
     ::ndk::ScopedAStatus getTunerHalVersion(int32_t* _aidl_return) override;
 
-    // TODO: create a map between resource id and handles.
-    static int getResourceIdFromHandle(int resourceHandle, int /*type*/) {
-        return (resourceHandle & 0x00ff0000) >> 16;
-    }
-
-    int getResourceHandleFromId(int id, int resourceType) {
-        // TODO: build up randomly generated id to handle mapping
-        return (resourceType & 0x000000ff) << 24
-                | (id << 16)
-                | (mResourceRequestCount++ & 0xffff);
-    }
-
 private:
     bool hasITuner();
     void updateTunerResources();
-    void updateFrontendResources();
-    void updateLnbResources();
-    vector<int32_t> getLnbHandles();
+    vector<TunerFrontendInfo> getTRMFrontendInfos();
+    vector<int32_t> getTRMLnbHandles();
 
     shared_ptr<ITuner> mTuner;
-    shared_ptr<ITunerResourceManager> mTunerResourceManager;
-    int mResourceRequestCount = 0;
     int mTunerVersion = TUNER_HAL_VERSION_UNKNOWN;
 };