Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44c294e6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Id027b742,I486ccad8 

* changes:
  Add additional DVBT settings example usage to sample_tuner_vts_config.xml
  Add additional DVBT settings to TunerTestingConfig
parents 9f7a1e83 b9722f12

tv/tuner/config/TunerTestingConfigReader.h

+19 −0
Original line number Diff line number Diff line
@@ -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<FrontendDvbtBandwidth>(

                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 =

                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;

    }

tv/tuner/config/api/current.txt

+20 −0
Original line number Diff line number Diff line
@@ -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);

  }

tv/tuner/config/sample_tuner_vts_config.xml

+4 −1
Original line number Diff line number Diff line
@@ -54,7 +54,10 @@ 
        <frontends>

            <frontend id="FE_DEFAULT" type="DVBT" isSoftwareFrontend="true"

                      connectToCicamId="0" frequency="578000" endFrequency="800000">

                <dvbtFrontendSettings bandwidth="8" transmissionMode="1" isHighPriority="1"/>

                <dvbtFrontendSettings bandwidth="8" transmissionMode="1" isHighPriority="1"

                                      constellation="1" hierarchy="1" hpCoderate="1" lpCoderate="1"

                                      guardInterval="1" standard="1" isMiso="0" plpMode="1"

                                      plpId="0" plpGroupId="0"/>

            </frontend>

            <frontend id="FE_DVBS_0" type="DVBS" isSoftwareFrontend="true"

                      connectToCicamId="0" frequency="578000" endFrequency="800000">

tv/tuner/config/tuner_testing_dynamic_configuration.xsd

+11 −1
Original line number Diff line number Diff line
@@ -52,8 +52,18 @@ 


    <xs:complexType name="dvbtFrontendSettings">

        <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="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 name="dvbsFrontendSettings">

        <xs:attribute name="inputStreamId" type="xs:nonNegativeInteger" use="required"/>