commit b5809beb3dbadea9a771ac516efa0ebfe9308ad4
author Amy Zhang <amyjojo@google.com> Tue Jan 26 16:27:23 2021 -0800
committer Amy Zhang <amyjojo@google.com> Fri Jan 29 21:59:26 2021 +0000
tree f21ef9da2db2c27736df9b521ebc6e857e97bd3f
parent 34b2197e34a8f6f12cd4c44230c71de91357bd14

Connect MediaEvents core path between TunerService and TunerClient

Test: tuner sample tis on cuttlefish
Bug: 174095851
Change-Id: I21148772d1ae1b53860c68ee47b7a27929629fce
Merged-In: I21148772d1ae1b53860c68ee47b7a27929629fce

media/jni/tuner/DemuxClient.cpp

diff --git a/media/jni/tuner/DemuxClient.cpp b/media/jni/tuner/DemuxClient.cpp
index e290c60..1a2f8c0 100644
--- a/media/jni/tuner/DemuxClient.cpp
+++ b/media/jni/tuner/DemuxClient.cpp
@@ -142,7 +142,16 @@
 }
 
 sp<DvrClient> DemuxClient::openDvr(DvrType dvbType, int bufferSize, sp<DvrClientCallback> cb) {
-    // TODO: pending aidl interface
+    if (mTunerDemux != NULL) {
+        shared_ptr<ITunerDvr> tunerDvr;
+        shared_ptr<TunerDvrCallback> callback =
+                ::ndk::SharedRefBase::make<TunerDvrCallback>(cb);
+        Status s = mTunerDemux->openDvr((int)dvbType, bufferSize, callback, &tunerDvr);
+        if (ClientHelper::getServiceSpecificErrorCode(s) != Result::SUCCESS) {
+            return NULL;
+        }
+        return new DvrClient(tunerDvr);
+    }
 
     if (mDemux != NULL) {
         sp<HidlDvrCallback> callback = new HidlDvrCallback(cb);
@@ -178,7 +187,10 @@
 }
 
 Result DemuxClient::close() {
-    // TODO: pending aidl interface
+    if (mTunerDemux != NULL) {
+        Status s = mTunerDemux->close();
+        return ClientHelper::getServiceSpecificErrorCode(s);
+    }
 
     if (mDemux != NULL) {
         Result res = mDemux->close();