diff options
| author | Nick Chalko <nchalko@google.com> | 2017-10-03 10:16:37 -0700 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2017-10-04 13:48:13 +0000 |
| commit | 6ebde20b03db4c0d57f67acaac11832b610b966b (patch) | |
| tree | d31e2adc1f9cce4f27ca07d30bee921032e33a3c /jni/DvbManager.h | |
| parent | ee027a576ddebaf1ae739219be01b0240b15f80c (diff) | |
| download | TV-6ebde20b03db4c0d57f67acaac11832b610b966b.tar.gz | |
Sync to match Live Channels 1.15(ncis)oreo-mr1-dev
aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad
Bug: 64021596
Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0
(cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d)
Diffstat (limited to 'jni/DvbManager.h')
| -rw-r--r-- | jni/DvbManager.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/jni/DvbManager.h b/jni/DvbManager.h index 7475bd41..2252332c 100644 --- a/jni/DvbManager.h +++ b/jni/DvbManager.h @@ -31,6 +31,9 @@ class DvbManager { static const int DVB_TUNE_STOP_DELAY_MS = 100 * 1000; static const int FE_POLL_TIMEOUT_MS = 100; static const int PAT_PID = 0; + static const int DVB_API_VERSION_UNDEFINED = -1; + static const int DVB_API_VERSION3 = 3; + static const int DVB_API_VERSION5 = 5; static const int FILTER_TYPE_OTHER = com_android_tv_tuner_TunerHal_FILTER_TYPE_OTHER; @@ -41,10 +44,28 @@ class DvbManager { static const int FILTER_TYPE_PCR = com_android_tv_tuner_TunerHal_FILTER_TYPE_PCR; + static const int DELIVERY_SYSTEM_UNDEFINED = + com_android_tv_tuner_TunerHal_DELIVERY_SYSTEM_UNDEFINED; + static const int DELIVERY_SYSTEM_ATSC = + com_android_tv_tuner_TunerHal_DELIVERY_SYSTEM_ATSC; + static const int DELIVERY_SYSTEM_DVBC = + com_android_tv_tuner_TunerHal_DDELIVERY_SYSTEM_DVBC; + static const int DELIVERY_SYSTEM_DVBS = + com_android_tv_tuner_TunerHal_DELIVERY_SYSTEM_DVBS; + static const int DELIVERY_SYSTEM_DVBS2 = + com_android_tv_tuner_TunerHal_DELIVERY_SYSTEM_DVBS2; + static const int DELIVERY_SYSTEM_DVBT = + com_android_tv_tuner_TunerHal_DELIVERY_SYSTEM_DVBT; + static const int DELIVERY_SYSTEM_DVBT2 = + com_android_tv_tuner_TunerHal_DELIVERY_SYSTEM_DVBT2; + + int mFeFd; int mDemuxFd; int mDvrFd; int mPatFilterFd; + int mDvbApiVersion; + int mDeliverySystemType; bool mFeHasLock; // Flag for pending tune request. Used for canceling the current tune operation. bool volatile mHasPendingTune; @@ -65,6 +86,7 @@ public: int startTsPidFilter(JNIEnv *env, jobject thiz, int pid, int filterType); void closeAllDvbPidFilter(); void setHasPendingTune(bool hasPendingTune); + int getDeliverySystemType(JNIEnv *env, jobject thiz); private: int openDvbFe(JNIEnv *env, jobject thiz); |