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

Commit 368ca264 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df155 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289



Change-Id: If47be0aaa310c6e3bbcddeffcc1c2a201654a0f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18738f2a 333df155

tv/tuner/config/TunerTestingConfigReaderV1_0.h

+9 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ using android::hardware::tv::tuner::V1_0::LnbTone; 
using android::hardware::tv::tuner::V1_0::LnbVoltage;

using android::hardware::tv::tuner::V1_0::PlaybackSettings;

using android::hardware::tv::tuner::V1_0::RecordSettings;

using android::hardware::tv::tuner::V1_0::FrontendAtscSettings;



const string emptyHardwareId = "";
@@ -241,6 +242,7 @@ struct TunerTestingConfigReader1_0 { 
                        break;

                    case FrontendTypeEnum::ATSC:

                        type = FrontendType::ATSC;

                        frontendMap[id].settings.atsc(readAtscFrontendSettings(feConfig));

                        break;

                    case FrontendTypeEnum::ATSC3:

                        type = FrontendType::ATSC3;
@@ -627,6 +629,13 @@ struct TunerTestingConfigReader1_0 { 
        return dvbsSettings;

    }



    static FrontendAtscSettings readAtscFrontendSettings(Frontend feConfig) {

        FrontendAtscSettings atscSettings{

            .frequency = (uint32_t)feConfig.getFrequency(),

        };

        return atscSettings;

    }



    static bool readFilterTypeAndSettings(Filter filterConfig, DemuxFilterType& type,

                                          DemuxFilterSettings& settings) {

        auto mainType = filterConfig.getMainType();