Connect existed TunerFilter/TunerDemux AIDL apis to TunerClient
This CL also resolved some TODO to handle aidl error messages
Test: make
Bug: 159067322
Change-Id: I6da66d1fa3989a501ec58bf1e0553f85a13e18db
diff --git a/media/jni/tuner/DemuxClient.h b/media/jni/tuner/DemuxClient.h
index 2950dd4..ead61301 100644
--- a/media/jni/tuner/DemuxClient.h
+++ b/media/jni/tuner/DemuxClient.h
@@ -17,10 +17,11 @@
#ifndef _ANDROID_MEDIA_TV_DEMUX_CLIENT_H_
#define _ANDROID_MEDIA_TV_DEMUX_CLIENT_H_
-//#include <aidl/android/media/tv/tuner/ITunerDemux.h>
+#include <aidl/android/media/tv/tuner/ITunerDemux.h>
#include <android/hardware/tv/tuner/1.0/IDemux.h>
#include <android/hardware/tv/tuner/1.1/types.h>
+#include "ClientHelper.h"
#include "DvrClient.h"
#include "DvrClientCallback.h"
#include "FilterClient.h"
@@ -28,7 +29,8 @@
#include "FrontendClient.h"
#include "TimeFilterClient.h"
-//using ::aidl::android::media::tv::tuner::ITunerDemux;
+using Status = ::ndk::ScopedAStatus;
+using ::aidl::android::media::tv::tuner::ITunerDemux;
using ::android::hardware::tv::tuner::V1_0::DemuxFilterType;
using ::android::hardware::tv::tuner::V1_0::DvrType;
@@ -42,7 +44,7 @@
struct DemuxClient : public RefBase {
public:
- DemuxClient();
+ DemuxClient(shared_ptr<ITunerDemux> tunerDemux);
~DemuxClient();
// TODO: remove after migration to Tuner Service is done.
@@ -100,13 +102,13 @@
sp<IFilter> openHidlFilter(DemuxFilterType type, int bufferSize, sp<HidlFilterCallback> cb);
sp<ITimeFilter> openHidlTimeFilter();
sp<IDvr> openHidlDvr(DvrType type, int bufferSize, sp<HidlDvrCallback> cb);
+ int getSubType(DemuxFilterType filterType);
/**
* An AIDL Tuner Demux Singleton assigned at the first time the Tuner Client
* opens a demux. Default null when demux is not opened.
*/
- // TODO: pending on aidl interface
- //shared_ptr<ITunerDemux> mTunerDemux;
+ shared_ptr<ITunerDemux> mTunerDemux;
/**
* A Demux HAL interface that is ready before migrating to the TunerDemux.
