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

Commit 1fd52970 authored by Frankie Lizcano's avatar Frankie Lizcano
Browse files

Improve Tuner VTS Configuration: Enable TimeFilter Configuration 

This CL allows vendors to configure the Time Filter data flow and
hardware unit in their configuration files for the Tuner Hardware. Their connections were
checked to ensure their validity.

Bug: b/182519645

Test: vts-tradefed run vts --module VtsHalTvTunerTargetTest
Change-Id: I5a458e3db626aa647c1a5e30b12d02df07631d66
parent 677a1f84

tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ bool initConfiguration() { 
    initFrontendConfig();

    initFilterConfig();

    initDvrConfig();

    initTimeFilterConfig();

    connectHardwaresToTestCases();

    if (!validateConnections()) {

        ALOGW("[vts] failed to validate connections.");

tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h

+15 −0
Original line number Diff line number Diff line
@@ -162,11 +162,17 @@ inline void initDvrConfig() { 
    TunerTestingConfigAidlReader1_0::readDvrConfig1_0(dvrMap);

};



inline void initTimeFilterConfig() {

    // Read customized config

    TunerTestingConfigAidlReader1_0::readTimeFilterConfig1_0(timeFilterMap);

};



/** Read the vendor configurations of which hardware to use for each test cases/data flows */

inline void connectHardwaresToTestCases() {

    TunerTestingConfigAidlReader1_0::connectLiveBroadcast(live);

    TunerTestingConfigAidlReader1_0::connectScan(scan);

    TunerTestingConfigAidlReader1_0::connectDvrRecord(record);

    TunerTestingConfigAidlReader1_0::connectTimeFilter(timeFilter);

};



inline bool validateConnections() {
@@ -221,5 +227,14 @@ inline bool validateConnections() { 
        return false;

    }



    bool timeFilterIsValid =

            timeFilter.support ? timeFilterMap.find(timeFilter.timeFilterId) != timeFilterMap.end()

                               : true;



    if (!timeFilterIsValid) {

        ALOGW("[vts config] dynamic config time filter connection is invalid.");

        return false;

    }



    return true;

}

tv/tuner/config/sample_tuner_vts_config_aidl_V1.xml

+64 −15
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!-- The Sample Tuner Testing Configuration.

    Name the customized xml with "tuner_vts_config.xml" and push into the device

    "/vendor/etc" path. Please use "tuner_testing_dynamic_configuration.xsd" to verify the xml.
@@ -32,7 +28,6 @@ 
                - The default settings can be found in the sample_tuner_vts_configurations.xml.

                - The users can also override the default frontend settings using id="FE_DEFAULT".

                - The users can configure 1 or more frontend elements in the frontends sections.



            Each frontend element contain the following attributes:

                "id": unique id of the frontend that could be used to connect to the test the

                    "dataFlowConfiguration"
@@ -46,7 +41,6 @@ 
                    output. Supported in Tuner 2.0 or higher.

                "frequency": the frequency used to configure tune and scan.

                "endFrequency": the end frequency of scan. Supported in Tuner 1.1 or higher.



            Each frontend element also contains one and only one type-related "frontendSettings".

                - The settings type should match the frontend "type" attribute.

                - For example, when frontend type="DVBT", dvbtFrontendSettings can be configured.
@@ -54,14 +48,35 @@ 
                    config only to the hal.

        -->

        <frontends>

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

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

                      connectToCicamId="0" removeOutputPid="10" frequency="578000000"

                      endFrequency="800000000">

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

              <isdbsFrontendSettings streamId="0" symbolRate="0" streamIdType="0" modulation="0" coderate="0" rolloff="0"/>

            </frontend>

            <frontend id="FE_ATSC_0" type="ATSC" isSoftwareFrontend="true"

                      connectToCicamId="0" removeOutputPid="10" frequency="578000000"

                      endFrequency="800000000">

              <atscFrontendSettings inversion="0" modulation="0"/>

            </frontend>

            <frontend id="FE_ISDBT_0" type="ISDBT" isSoftwareFrontend="true"

                      connectToCicamId="0" removeOutputPid="10" frequency="578000000"

                      endFrequency="800000000">

              <isdbtFrontendSettings serviceAreaId="0" inversion="0" bandwidth="0" mode="0" guardInterval="0" partialReceptionFlag="0">

                <FrontendIsdbtLayerSettings modulation="0" coderate="0" timeInterleave="0" numOfSegment="0"/>

              </isdbtFrontendSettings>

            </frontend>

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

                      connectToCicamId="0" removeOutputPid="10" frequency="578000000"

                      endFrequency="800000000">

              <dvbsFrontendSettings inputStreamId="0" symbolRate="0"/>

            </frontend>

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

                      connectToCicamId="0" removeOutputPid="10" frequency="578000000"

                      endFrequency="800000000">

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

        </frontends>

        <!-- Filter section:
@@ -71,7 +86,6 @@ 
                - The users can also override the default filter settings using

                - id="FILTER_AUDIO_DEFAULT" or "FILTER_VIDEO_DEFAULT".

                - The users can configure 1 or more filter elements in the filters sections.



            Each filter element contain the following attributes:

                "id": unique id of the filter that could be used to connect to the test the

                    "dataFlowConfiguration"
@@ -80,7 +94,6 @@ 
                "bufferSize": the buffer size of the filter in hex.

                "pid": the pid that would be used to configure the filter.

                "useFMQ": if the filter uses FMQ.



            Each filter element also contains at most one type-related "filterSettings".

                - The settings type should match the filter "subType" attribute.

                - For example, when filter subType is audio or video, the avFilterSettings can be
@@ -89,6 +102,9 @@ 
                    only to the hal.

        -->

        <filters>

            <filter id="FILTER_SECTION_DEFAULT" mainType="TS" subType="SECTION"

              bufferSize="16777216" pid="257" useFMQ="false" monitorEventTypes="3">

          </filter>

            <filter id="FILTER_AUDIO_DEFAULT" mainType="TS" subType="AUDIO"

                    bufferSize="16777216" pid="257" useFMQ="false" monitorEventTypes="3">

                <avFilterSettings isPassthrough="false" isSecureMemory="false">
@@ -116,7 +132,6 @@ 
            This section contains configurations of all the dvrs that would be used in the tests.

                - This section is optional and can be skipped if DVR is not supported.

                - The users can configure 1 or more dvr elements in the dvrs sections.



            Each dvr element contain the following attributes:

                "id": unique id of the dvr that could be used to connect to the test the

                    "dataFlowConfiguration"
@@ -140,8 +155,21 @@ 
                 statusMask="15" lowThreshold="4096" highThreshold="32767"

                 dataFormat="ES" packetSize="188" inputFilePath="/data/local/tmp/test.es"/>

        </dvrs>

        <descramblers>

            <descrambler id="DESCRAMBLER_0" casSystemId="63192"/>

        </descramblers>

        <timeFilters>

            <timeFilter id="TIME_FILTER_0" timeStamp="1"/>

        </timeFilters>

        <diseqcMessages>

            <diseqcMessage msgName="DISEQC_POWER_ON" msgBody="14 0 0 0 0 3"/>

        </diseqcMessages>

        <lnbs>

            <lnb id="LNB_0" voltage="VOLTAGE_12V" tone="NONE" position="UNDEFINED"/>

            <lnb id="LNB_1" name="default_lnb_external" voltage="VOLTAGE_5V"

                            tone="NONE" position="UNDEFINED"/>

        </lnbs>

    </hardwareConfiguration>



    <!-- Data flow configuration section connects each data flow under test to the ids of the

        hardwares that would be used during the tests. -->

    <dataFlowConfiguration>
@@ -151,13 +179,34 @@ 
                            ipFilterConnection="FILTER_IP_IP_0"

                            dvrSoftwareFeConnection="DVR_PLAYBACK_1"/>

        <scan frontendConnection="FE_DEFAULT"/>

        <dvrPlayback dvrConnection="DVR_PLAYBACK_1"

                     audioFilterConnection="FILTER_AUDIO_DEFAULT"

                     videoFilterConnection="FILTER_VIDEO_DEFAULT"/>

        <dvrRecord hasFrontendConnection="true"

                   frontendConnection="FE_DEFAULT"

                   recordFilterConnection="FILTER_TS_RECORD_0"

                   dvrRecordConnection="DVR_RECORD_0"

                   dvrSoftwareFeConnection="DVR_PLAYBACK_1"/>

        <dvrPlayback dvrConnection="DVR_PLAYBACK_1"

                     audioFilterConnection="FILTER_AUDIO_DEFAULT"

                     videoFilterConnection="FILTER_VIDEO_DEFAULT"

                     sectionFilterConnection="FILTER_SECTION_DEFAULT"/>

        <descrambling hasFrontendConnection="true"

                      frontendConnection="FE_DEFAULT"

                      descramblerConnection="DESCRAMBLER_0"

                      audioFilterConnection="FILTER_AUDIO_DEFAULT"

                      videoFilterConnection="FILTER_VIDEO_DEFAULT"

                      dvrSoftwareFeConnection="DVR_PLAYBACK_0"

                      dvrSourceConnection="DVR_PLAYBACK_1">

                      <optionalFilters>FILTER_TS_RECORD_0 FILTER_IP_IP_0</optionalFilters>

        </descrambling>

        <timeFilter timeFilterConnection="TIME_FILTER_0"/>

        <lnbLive frontendConnection="FE_DVBS_0"

                 audioFilterConnection="FILTER_AUDIO_DEFAULT"

                 videoFilterConnection="FILTER_VIDEO_DEFAULT"

                 lnbConnection="LNB_1"

                 diseqcMsgSender="DISEQC_POWER_ON"/>

        <lnbRecord frontendConnection="FE_DVBS_0"

                   recordFilterConnection="FILTER_TS_RECORD_0"

                   dvrRecordConnection="DVR_RECORD_0"

                   lnbConnection="LNB_0"

                   diseqcMsgSender="DISEQC_POWER_ON"/>

    </dataFlowConfiguration>

</TunerConfiguration>