From ab5c4492277c93489f719ca58f0bfa07bd1bca37 Mon Sep 17 00:00:00 2001 From: junchao yuan Date: Wed, 20 Jul 2022 16:13:38 +0800 Subject: [PATCH] tunerhal:set default frontend to DVBS [1/1] bug:239667706 Problem: test tunerhal vts fail with DVBS; Solution: set defualt frontend to DVBS; Verify: s905X4/ohm Change-Id: I79386738783309b917ec5cff89c48b2bdc99bd7c --- .../VtsHalTvTunerV1_0TestConfigurations.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h index aecc391dab..2f40eed857 100644 --- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h +++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h @@ -43,6 +43,8 @@ using android::hardware::tv::tuner::V1_0::FrontendDvbtHierarchy; using android::hardware::tv::tuner::V1_0::FrontendDvbtSettings; using android::hardware::tv::tuner::V1_0::FrontendDvbtStandard; using android::hardware::tv::tuner::V1_0::FrontendDvbtTransmissionMode; +using android::hardware::tv::tuner::V1_0::FrontendDvbsModulation; +using android::hardware::tv::tuner::V1_0::FrontendDvbsStandard; using android::hardware::tv::tuner::V1_0::FrontendSettings; using android::hardware::tv::tuner::V1_0::FrontendStatus; using android::hardware::tv::tuner::V1_0::FrontendStatusType; @@ -116,6 +118,7 @@ typedef enum { typedef enum { SCAN_DVBT, + SCAN_DVBS, SCAN_MAX, } FrontendScan; @@ -192,8 +195,8 @@ static DemuxFilterType filterLinkageTypes[LINKAGE_DIR][FILTER_MAIN_TYPE_BIT_COUN static DvrConfig dvrArray[DVR_MAX]; static DescramblerConfig descramblerArray[DESC_MAX]; static vector goldenOutputFiles; -static int defaultFrontend = DVBT; -static int defaultScanFrontend = SCAN_DVBT; +static int defaultFrontend = DVBS; +static int defaultScanFrontend = SCAN_DVBS; /** Configuration array for the frontend tune test */ inline void initFrontendConfig() { @@ -240,6 +243,14 @@ inline void initFrontendScanConfig() { .isHighPriority = true, .standard = FrontendDvbtStandard::T, }); + + frontendScanArray[SCAN_DVBS].type = FrontendType::DVBS; + frontendScanArray[SCAN_DVBS].settings.dvbs({ + .frequency = 1000000, + .symbolRate = 27500, + .modulation = FrontendDvbsModulation::MOD_QPSK, + .standard = FrontendDvbsStandard::S, + }); }; /** Configuration array for the Lnb test */