Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add additional DVBT settings to TunerTestingConfig

Browse Source 
Test: atest VtsHalTvTunerV1_0TargetTest

Change-Id: I486ccad855662e6b9fa7cd1be3eb3949356d6a1f
Merged-In: I58bd8b941f6340d9e69153702b5269cc35c646da
This commit is contained in:
Gareth Fenn
2021-04-30 16:31:02 +01:00
committed by Henry Fang
parent 75d7e5de7c
commit 8fa4cff4ce
3 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tv/tuner/config/TunerTestingConfigReader.h
View File

@@ -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::FrontendDvbtConstellation;
using android::hardware::tv::tuner::V1_0::FrontendDvbtGuardInterval; using android::hardware::tv::tuner::V1_0::FrontendDvbtGuardInterval;
using android::hardware::tv::tuner::V1_0::FrontendDvbtHierarchy; 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::FrontendDvbtSettings;
using android::hardware::tv::tuner::V1_0::FrontendDvbtStandard; using android::hardware::tv::tuner::V1_0::FrontendDvbtStandard;
using android::hardware::tv::tuner::V1_0::FrontendDvbtTransmissionMode; using android::hardware::tv::tuner::V1_0::FrontendDvbtTransmissionMode;
@@ -572,8 +573,26 @@ struct TunerTestingConfigReader {
feConfig.getFirstDvbtFrontendSettings_optional()->getTransmissionMode()); feConfig.getFirstDvbtFrontendSettings_optional()->getTransmissionMode());
dvbtSettings.bandwidth = static_cast<FrontendDvbtBandwidth>( dvbtSettings.bandwidth = static_cast<FrontendDvbtBandwidth>(
feConfig.getFirstDvbtFrontendSettings_optional()->getBandwidth()); feConfig.getFirstDvbtFrontendSettings_optional()->getBandwidth());
dvbtSettings.constellation = static_cast<FrontendDvbtConstellation>(
feConfig.getFirstDvbtFrontendSettings_optional()->getConstellation());
dvbtSettings.hierarchy = static_cast<FrontendDvbtHierarchy>(
feConfig.getFirstDvbtFrontendSettings_optional()->getHierarchy());
dvbtSettings.hpCoderate = static_cast<FrontendDvbtCoderate>(
feConfig.getFirstDvbtFrontendSettings_optional()->getHpCoderate());
dvbtSettings.lpCoderate = static_cast<FrontendDvbtCoderate>(
feConfig.getFirstDvbtFrontendSettings_optional()->getLpCoderate());
dvbtSettings.guardInterval = static_cast<FrontendDvbtGuardInterval>(
feConfig.getFirstDvbtFrontendSettings_optional()->getGuardInterval());
dvbtSettings.isHighPriority = dvbtSettings.isHighPriority =
feConfig.getFirstDvbtFrontendSettings_optional()->getIsHighPriority(); feConfig.getFirstDvbtFrontendSettings_optional()->getIsHighPriority();
dvbtSettings.standard = static_cast<FrontendDvbtStandard>(
feConfig.getFirstDvbtFrontendSettings_optional()->getStandard());
dvbtSettings.isMiso = feConfig.getFirstDvbtFrontendSettings_optional()->getIsMiso();
dvbtSettings.plpMode = static_cast<FrontendDvbtPlpMode>(
feConfig.getFirstDvbtFrontendSettings_optional()->getPlpMode());
dvbtSettings.plpId = feConfig.getFirstDvbtFrontendSettings_optional()->getPlpId();
dvbtSettings.plpGroupId = feConfig.getFirstDvbtFrontendSettings_optional()->getPlpGroupId();
return dvbtSettings; return dvbtSettings;
} }

20
tv/tuner/config/api/current.txt
View File

@@ -160,10 +160,30 @@ package android.media.tuner.testing.configuration.V1_0 {
public class DvbtFrontendSettings { public class DvbtFrontendSettings {
ctor public DvbtFrontendSettings(); ctor public DvbtFrontendSettings();
method @Nullable public java.math.BigInteger getBandwidth(); 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 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 @Nullable public java.math.BigInteger getTransmissionMode();
method public void setBandwidth(@Nullable java.math.BigInteger); 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 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); method public void setTransmissionMode(@Nullable java.math.BigInteger);
} }

12
tv/tuner/config/tuner_testing_dynamic_configuration.xsd
View File

@@ -52,8 +52,18 @@
<xs:complexType name="dvbtFrontendSettings"> <xs:complexType name="dvbtFrontendSettings">
<xs:attribute name="bandwidth" type="xs:nonNegativeInteger" use="required"/> <xs:attribute name="bandwidth" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="transmissionMode" type="xs:nonNegativeInteger" use="required"/> <xs:attribute name="constellation" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="guardInterval" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="hierarchy" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="hpCoderate" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="lpCoderate" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="isHighPriority" type="xs:nonNegativeInteger" use="required"/> <xs:attribute name="isHighPriority" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="isMiso" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="plpGroupId" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="plpId" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="plpMode" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="standard" type="xs:nonNegativeInteger" use="required"/>
<xs:attribute name="transmissionMode" type="xs:nonNegativeInteger" use="required"/>
</xs:complexType> </xs:complexType>
<xs:complexType name="dvbsFrontendSettings"> <xs:complexType name="dvbsFrontendSettings">
<xs:attribute name="inputStreamId" type="xs:nonNegativeInteger" use="required"/> <xs:attribute name="inputStreamId" type="xs:nonNegativeInteger" use="required"/>