diff --git a/tv/tuner/config/TunerTestingConfigReader.h b/tv/tuner/config/TunerTestingConfigReader.h index e6aba2cff7..e1f5695bbb 100644 --- a/tv/tuner/config/TunerTestingConfigReader.h +++ b/tv/tuner/config/TunerTestingConfigReader.h @@ -50,6 +50,7 @@ using android::hardware::tv::tuner::V1_0::FrontendDvbtCoderate; using android::hardware::tv::tuner::V1_0::FrontendDvbtConstellation; using android::hardware::tv::tuner::V1_0::FrontendDvbtGuardInterval; using android::hardware::tv::tuner::V1_0::FrontendDvbtHierarchy; +using android::hardware::tv::tuner::V1_0::FrontendDvbtPlpMode; using android::hardware::tv::tuner::V1_0::FrontendDvbtSettings; using android::hardware::tv::tuner::V1_0::FrontendDvbtStandard; using android::hardware::tv::tuner::V1_0::FrontendDvbtTransmissionMode; @@ -572,8 +573,26 @@ struct TunerTestingConfigReader { feConfig.getFirstDvbtFrontendSettings_optional()->getTransmissionMode()); dvbtSettings.bandwidth = static_cast( feConfig.getFirstDvbtFrontendSettings_optional()->getBandwidth()); + dvbtSettings.constellation = static_cast( + feConfig.getFirstDvbtFrontendSettings_optional()->getConstellation()); + dvbtSettings.hierarchy = static_cast( + feConfig.getFirstDvbtFrontendSettings_optional()->getHierarchy()); + dvbtSettings.hpCoderate = static_cast( + feConfig.getFirstDvbtFrontendSettings_optional()->getHpCoderate()); + dvbtSettings.lpCoderate = static_cast( + feConfig.getFirstDvbtFrontendSettings_optional()->getLpCoderate()); + dvbtSettings.guardInterval = static_cast( + feConfig.getFirstDvbtFrontendSettings_optional()->getGuardInterval()); dvbtSettings.isHighPriority = feConfig.getFirstDvbtFrontendSettings_optional()->getIsHighPriority(); + dvbtSettings.standard = static_cast( + feConfig.getFirstDvbtFrontendSettings_optional()->getStandard()); + dvbtSettings.isMiso = feConfig.getFirstDvbtFrontendSettings_optional()->getIsMiso(); + dvbtSettings.plpMode = static_cast( + feConfig.getFirstDvbtFrontendSettings_optional()->getPlpMode()); + dvbtSettings.plpId = feConfig.getFirstDvbtFrontendSettings_optional()->getPlpId(); + dvbtSettings.plpGroupId = feConfig.getFirstDvbtFrontendSettings_optional()->getPlpGroupId(); + return dvbtSettings; } diff --git a/tv/tuner/config/api/current.txt b/tv/tuner/config/api/current.txt index abd7155ef1..3476414b16 100644 --- a/tv/tuner/config/api/current.txt +++ b/tv/tuner/config/api/current.txt @@ -160,10 +160,30 @@ package android.media.tuner.testing.configuration.V1_0 { public class DvbtFrontendSettings { ctor public DvbtFrontendSettings(); method @Nullable public java.math.BigInteger getBandwidth(); + method @Nullable public java.math.BigInteger getConstellation(); + method @Nullable public java.math.BigInteger getGuardInterval(); + method @Nullable public java.math.BigInteger getHierarchy(); + method @Nullable public java.math.BigInteger getHpCoderate(); method @Nullable public java.math.BigInteger getIsHighPriority(); + method @Nullable public java.math.BigInteger getIsMiso(); + method @Nullable public java.math.BigInteger getLpCoderate(); + method @Nullable public java.math.BigInteger getPlpGroupId(); + method @Nullable public java.math.BigInteger getPlpId(); + method @Nullable public java.math.BigInteger getPlpMode(); + method @Nullable public java.math.BigInteger getStandard(); method @Nullable public java.math.BigInteger getTransmissionMode(); method public void setBandwidth(@Nullable java.math.BigInteger); + method public void setConstellation(@Nullable java.math.BigInteger); + method public void setGuardInterval(@Nullable java.math.BigInteger); + method public void setHierarchy(@Nullable java.math.BigInteger); + method public void setHpCoderate(@Nullable java.math.BigInteger); method public void setIsHighPriority(@Nullable java.math.BigInteger); + method public void setIsMiso(@Nullable java.math.BigInteger); + method public void setLpCoderate(@Nullable java.math.BigInteger); + method public void setPlpGroupId(@Nullable java.math.BigInteger); + method public void setPlpId(@Nullable java.math.BigInteger); + method public void setPlpMode(@Nullable java.math.BigInteger); + method public void setStandard(@Nullable java.math.BigInteger); method public void setTransmissionMode(@Nullable java.math.BigInteger); } diff --git a/tv/tuner/config/sample_tuner_vts_config.xml b/tv/tuner/config/sample_tuner_vts_config.xml index 26240765d6..347e98442b 100644 --- a/tv/tuner/config/sample_tuner_vts_config.xml +++ b/tv/tuner/config/sample_tuner_vts_config.xml @@ -54,7 +54,10 @@ - + diff --git a/tv/tuner/config/tuner_testing_dynamic_configuration.xsd b/tv/tuner/config/tuner_testing_dynamic_configuration.xsd index e0c3e33353..7f31a11535 100644 --- a/tv/tuner/config/tuner_testing_dynamic_configuration.xsd +++ b/tv/tuner/config/tuner_testing_dynamic_configuration.xsd @@ -52,8 +52,18 @@ - + + + + + + + + + + +