From d4dcef21e7a84ab4c0b1d0e0b3703555a98bbb57 Mon Sep 17 00:00:00 2001 From: Wei Date: Mon, 6 Mar 2023 15:30:27 +0800 Subject: [PATCH] Add ATSC support in the vts ATSC configuration isn't supported in current config reader. Add it in this CL. Bug: 271933206 Test: manual Change-Id: I7a1f5356c33d6576d6ae6c71fd4af171b5ad30ac --- tv/tuner/config/TunerTestingConfigReaderV1_0.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tv/tuner/config/TunerTestingConfigReaderV1_0.h b/tv/tuner/config/TunerTestingConfigReaderV1_0.h index d049b07232..fb76de7af4 100644 --- a/tv/tuner/config/TunerTestingConfigReaderV1_0.h +++ b/tv/tuner/config/TunerTestingConfigReaderV1_0.h @@ -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();