commit ae56a2e800c5222d95d49f1f8ca31d6f5228948d
author shubang <shubang@google.com> Thu Jan 21 07:29:55 2021 -0800
committer shubang <shubang@google.com> Thu Jan 21 07:38:58 2021 -0800
tree 00a9d75eb67b0c90ccf63f2bebd58c0092e9bf61
parent ee1d5e1974853d26a4f00209b136e1d3c7aecc74

TunerService: create TunerFilter and TunerDemux

Bug: 177529575
Bug: 177530961
Test: make
Change-Id: I228d6b1fe5a3e6552fda4290a37f036eeee1d85a

services/tuner/TunerService.h

diff --git a/services/tuner/TunerService.h b/services/tuner/TunerService.h
index 82b6fcd..197e4f3 100644
--- a/services/tuner/TunerService.h
+++ b/services/tuner/TunerService.h
@@ -27,6 +27,7 @@
 using ::aidl::android::hardware::common::fmq::MQDescriptor;
 using ::aidl::android::hardware::common::fmq::SynchronizedReadWrite;
 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::tuner::TunerFrontendInfo;
@@ -101,6 +102,7 @@
             MQDescriptor<int8_t, SynchronizedReadWrite>* mqDesc, bool* _aidl_return) override;
     Status openLnb(int lnbHandle, shared_ptr<ITunerLnb>* _aidl_return) override;
     Status openLnbByName(const string& lnbName, shared_ptr<ITunerLnb>* _aidl_return) override;
+    Status openDemux(int32_t demuxHandle, std::shared_ptr<ITunerDemux>* _aidl_return) override;
 
 private:
     template <typename HidlPayload, typename AidlPayload, typename AidlFlavor>
@@ -109,12 +111,10 @@
             MQDescriptor<AidlPayload, AidlFlavor>* aidl);
 
     bool getITuner();
-    Result openFilter();
-    Result openDemux();
     Result configFilter();
 
     sp<ITuner> mTuner;
-    sp<IDemux> mDemux;
+    std::shared_ptr<ITunerDemux> mDemux;
     sp<IFilter> mFilter;
     AidlMessageQueue* mAidlMq;
     MQDescriptorSync<uint8_t> mFilterMQDesc;