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

Commit ab839a87 authored by Henry Fang's avatar Henry Fang Committed by Android (Google) Code Review
Browse files

Merge "Add more configure items for DVBT" into sc-dev

parents 76a507f2 0d591fd0

tv/tuner/config/TunerTestingConfigReaderV1_0.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,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;
@@ -593,6 +594,16 @@ struct TunerTestingConfigReader1_0 { 
        }

        }

        dvbtSettings.bandwidth = static_cast<FrontendDvbtBandwidth>(dvbt->getBandwidth());

        dvbtSettings.bandwidth = static_cast<FrontendDvbtBandwidth>(dvbt->getBandwidth());

        dvbtSettings.isHighPriority = dvbt->getIsHighPriority();

        dvbtSettings.isHighPriority = dvbt->getIsHighPriority();

        dvbtSettings.hierarchy = static_cast<FrontendDvbtHierarchy>(dvbt->getHierarchy());

        dvbtSettings.hpCoderate = static_cast<FrontendDvbtCoderate>(dvbt->getHpCoderate());

        dvbtSettings.lpCoderate = static_cast<FrontendDvbtCoderate>(dvbt->getLpCoderate());

        dvbtSettings.guardInterval =

                static_cast<FrontendDvbtGuardInterval>(dvbt->getGuardInterval());

        dvbtSettings.standard = static_cast<FrontendDvbtStandard>(dvbt->getStandard());

        dvbtSettings.isMiso = dvbt->getIsMiso();

        dvbtSettings.plpMode = static_cast<FrontendDvbtPlpMode>(dvbt->getPlpMode());

        dvbtSettings.plpId = dvbt->getPlpId();

        dvbtSettings.plpGroupId = dvbt->getPlpGroupId();

        if (dvbt->hasConstellation()) {

        if (dvbt->hasConstellation()) {

            dvbtSettings.constellation =

            dvbtSettings.constellation =

                    static_cast<FrontendDvbtConstellation>(dvbt->getConstellation());

                    static_cast<FrontendDvbtConstellation>(dvbt->getConstellation());

tv/tuner/config/api/current.txt

+18 −0
Original line number Original line Diff line number Diff line
@@ -180,11 +180,29 @@ package android.media.tuner.testing.configuration.V1_0 { 
    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 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 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);

  }

  }

tv/tuner/config/sample_tuner_vts_config_1_0.xml

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

        <frontends>

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

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

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

                      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>

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

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

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

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

tv/tuner/config/tuner_testing_dynamic_configuration.xsd

+11 −2
Original line number Original line Diff line number Diff line
@@ -61,9 +61,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="constellation" type="xs:nonNegativeInteger" use="optional"/>

        <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"/>