Merge "Support enable/disable Frontends." (72e00255) · Commits · e / os / android_frameworks_av

services/tuner/TunerService.cpp

+22 −0

Original line number	Diff line number	Diff line
		@@ -270,6 +270,28 @@ bool TunerService::hasITuner() {
		return mTuner->setLna(bEnable);
		}

		::ndk::ScopedAStatus TunerService::setMaxNumberOfFrontends(FrontendType in_frontendType,
		int32_t in_maxNumber) {
		if (!hasITuner()) {
		ALOGD("get ITuner failed");
		return ::ndk::ScopedAStatus::fromServiceSpecificError(
		static_cast<int32_t>(Result::UNAVAILABLE));
		}

		return mTuner->setMaxNumberOfFrontends(in_frontendType, in_maxNumber);
		}

		::ndk::ScopedAStatus TunerService::getMaxNumberOfFrontends(FrontendType in_frontendType,
		int32_t* _aidl_return) {
		if (!hasITuner()) {
		ALOGD("get ITuner failed");
		return ::ndk::ScopedAStatus::fromServiceSpecificError(
		static_cast<int32_t>(Result::UNAVAILABLE));
		}

		return mTuner->getMaxNumberOfFrontends(in_frontendType, _aidl_return);
		}

		string TunerService::addFilterToShared(const shared_ptr<TunerFilter>& sharedFilter) {
		Mutex::Autolock _l(mSharedFiltersLock);

+5 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ 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::FrontendType;
		using ::aidl::android::hardware::tv::tuner::ITuner;
		using ::aidl::android::media::tv::tuner::BnTunerService;
		using ::aidl::android::media::tv::tuner::ITunerDemux;
		@@ -77,6 +78,10 @@ public:
		const shared_ptr<ITunerFilterCallback>& in_cb,
		shared_ptr<ITunerFilter>* _aidl_return) override;
		::ndk::ScopedAStatus setLna(bool in_bEnable) override;
		::ndk::ScopedAStatus setMaxNumberOfFrontends(FrontendType in_frontendType,
		int32_t in_maxNumber) override;
		::ndk::ScopedAStatus getMaxNumberOfFrontends(FrontendType in_frontendType,
		int32_t* _aidl_return) override;

		string addFilterToShared(const shared_ptr<TunerFilter>& sharedFilter);
		void removeSharedFilter(const shared_ptr<TunerFilter>& sharedFilter);

+19 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.media.tv.tuner;

		import android.hardware.tv.tuner.DemuxCapabilities;
		import android.hardware.tv.tuner.FrontendInfo;
		import android.hardware.tv.tuner.FrontendType;
		import android.media.tv.tuner.ITunerDemux;
		import android.media.tv.tuner.ITunerDescrambler;
		import android.media.tv.tuner.ITunerFilter;
		@@ -111,4 +112,22 @@ interface ITunerService {
		* @param bEnable enable Lna or not.
		*/
		void setLna(in boolean bEnable);

		/**
		* Set the maximum usable frontends number of a given frontend type. It's used by client
		* to enable or disable frontends when cable connection status is changed by user.
		*
		* @param frontendType the frontend type which the maximum usable number will be set.
		* @param maxNumber the new maximum usable number.
		*/
		void setMaxNumberOfFrontends(in FrontendType frontendType, in int maxNumber);

		/**
		* Get the maximum usable frontends number of a given frontend type.
		*
		* @param frontendType the frontend type which the maximum usable number will be queried.
		*
		* @return the maximum usable number of the queried frontend type.
		*/
		int getMaxNumberOfFrontends(in FrontendType frontendType);
		}

+13 −0

Original line number	Diff line number	Diff line
		@@ -387,6 +387,19 @@ bool TunerHidlService::hasITuner_1_1() {
		return ::ndk::ScopedAStatus::ok();
		}

		::ndk::ScopedAStatus TunerHidlService::setMaxNumberOfFrontends(FrontendType /* in_frontendType */,
		int32_t /* in_maxNumber */) {
		return ::ndk::ScopedAStatus::fromServiceSpecificError(
		static_cast<int32_t>(Result::UNAVAILABLE));
		}

		::ndk::ScopedAStatus TunerHidlService::getMaxNumberOfFrontends(FrontendType /* in_frontendType */,
		int32_t* _aidl_return) {
		*_aidl_return = -1;
		return ::ndk::ScopedAStatus::fromServiceSpecificError(
		static_cast<int32_t>(Result::UNAVAILABLE));
		}

		string TunerHidlService::addFilterToShared(const shared_ptr<TunerHidlFilter>& sharedFilter) {
		Mutex::Autolock _l(mSharedFiltersLock);

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ 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::FrontendType;
		using ::aidl::android::media::tv::tuner::ITunerDemux;
		using ::aidl::android::media::tv::tuner::ITunerDescrambler;
		using ::aidl::android::media::tv::tuner::ITunerFrontend;
		@@ -89,6 +90,10 @@ public:
		const shared_ptr<ITunerFilterCallback>& in_cb,
		shared_ptr<ITunerFilter>* _aidl_return) override;
		::ndk::ScopedAStatus setLna(bool in_bEnable) override;
		::ndk::ScopedAStatus setMaxNumberOfFrontends(FrontendType in_frontendType,
		int32_t in_maxNumber) override;
		::ndk::ScopedAStatus getMaxNumberOfFrontends(FrontendType in_frontendType,
		int32_t* _aidl_return) override;

		string addFilterToShared(const shared_ptr<TunerHidlFilter>& sharedFilter);
		void removeSharedFilter(const shared_ptr<TunerHidlFilter>& sharedFilter);