From 42caff499e908d4f043d69d48a2011f4ebbd54f4 Mon Sep 17 00:00:00 2001 From: Frankie Lizcano Date: Fri, 22 Jul 2022 20:30:46 +0000 Subject: [PATCH] Improve Tuner VTS: Add DVBS Settings This CL expands the settings and specs that can be added by vendors to DVBS frontend types. It also updates the value expectations to model the format present in the other types. Bug: b/239968750 Test: vts-tradefed run vts --module VtsHalTvTunerTargetTest Change-Id: Ifd4a97ce71cfea11e4f5c1293a6342e337cb5699 --- .../config/TunerTestingConfigAidlReaderV1_0.h | 20 +++++++++---------- tv/tuner/config/api/current.txt | 12 +++++++++++ .../sample_tuner_vts_config_aidl_V1.xml | 3 ++- .../tuner_testing_dynamic_configuration.xsd | 10 ++++++++-- 4 files changed, 32 insertions(+), 13 deletions(-) diff --git a/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h b/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h index 7c757b4ebb..d1e876233f 100644 --- a/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h +++ b/tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h @@ -737,17 +737,17 @@ struct TunerTestingConfigAidlReader1_0 { ALOGW("[ConfigReader] no more dvbs settings"); return dvbsSettings; } - dvbsSettings.symbolRate = static_cast( - feConfig.getFirstDvbsFrontendSettings_optional()->getSymbolRate()); - dvbsSettings.inputStreamId = static_cast( - feConfig.getFirstDvbsFrontendSettings_optional()->getInputStreamId()); auto dvbs = feConfig.getFirstDvbsFrontendSettings_optional(); - if (dvbs->hasScanType()) { - dvbsSettings.scanType = static_cast(dvbs->getScanType()); - } - if (dvbs->hasIsDiseqcRxMessage()) { - dvbsSettings.isDiseqcRxMessage = dvbs->getIsDiseqcRxMessage(); - } + dvbsSettings.symbolRate = static_cast(dvbs->getSymbolRate()); + dvbsSettings.inputStreamId = static_cast(dvbs->getInputStreamId()); + dvbsSettings.scanType = static_cast(dvbs->getScanType()); + dvbsSettings.isDiseqcRxMessage = dvbs->getIsDiseqcRxMessage(); + dvbsSettings.inversion = static_cast(dvbs->getInversion()); + dvbsSettings.modulation = static_cast(dvbs->getModulation()); + dvbsSettings.rolloff = static_cast(dvbs->getRolloff()); + dvbsSettings.pilot = static_cast(dvbs->getPilot()); + dvbsSettings.standard = static_cast(dvbs->getStandard()); + dvbsSettings.vcmMode = static_cast(dvbs->getVcmMode()); return dvbsSettings; } diff --git a/tv/tuner/config/api/current.txt b/tv/tuner/config/api/current.txt index 9b500c3cab..8653c1c611 100644 --- a/tv/tuner/config/api/current.txt +++ b/tv/tuner/config/api/current.txt @@ -181,13 +181,25 @@ package android.media.tuner.testing.configuration.V1_0 { public class DvbsFrontendSettings { ctor public DvbsFrontendSettings(); method @Nullable public java.math.BigInteger getInputStreamId(); + method @Nullable public java.math.BigInteger getInversion(); method @Nullable public boolean getIsDiseqcRxMessage(); + method @Nullable public java.math.BigInteger getModulation(); + method @Nullable public java.math.BigInteger getPilot(); + method @Nullable public java.math.BigInteger getRolloff(); method @Nullable public android.media.tuner.testing.configuration.V1_0.DvbsScanType getScanType(); + method @Nullable public java.math.BigInteger getStandard(); method @Nullable public java.math.BigInteger getSymbolRate(); + method @Nullable public java.math.BigInteger getVcmMode(); method public void setInputStreamId(@Nullable java.math.BigInteger); + method public void setInversion(@Nullable java.math.BigInteger); method public void setIsDiseqcRxMessage(@Nullable boolean); + method public void setModulation(@Nullable java.math.BigInteger); + method public void setPilot(@Nullable java.math.BigInteger); + method public void setRolloff(@Nullable java.math.BigInteger); method public void setScanType(@Nullable android.media.tuner.testing.configuration.V1_0.DvbsScanType); + method public void setStandard(@Nullable java.math.BigInteger); method public void setSymbolRate(@Nullable java.math.BigInteger); + method public void setVcmMode(@Nullable java.math.BigInteger); } public enum DvbsScanType { diff --git a/tv/tuner/config/sample_tuner_vts_config_aidl_V1.xml b/tv/tuner/config/sample_tuner_vts_config_aidl_V1.xml index 90f3c9b501..1a148a4224 100644 --- a/tv/tuner/config/sample_tuner_vts_config_aidl_V1.xml +++ b/tv/tuner/config/sample_tuner_vts_config_aidl_V1.xml @@ -68,7 +68,8 @@ - + - - + + + + + + + +