diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-15 00:01:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-15 00:01:42 +0000 |
| commit | 368ca264f28d91f961335a67e657f0473b7ee59f (patch) | |
| tree | 97a4ed1d461d37ab1b4018f2d581c730cf318b90 | |
| parent | 18738f2a5c0104cd664aa31f418e36fca9be36d3 (diff) | |
| parent | 333df15518a9e0d5203235f2459231d5c9da6570 (diff) | |
Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289
Change-Id: If47be0aaa310c6e3bbcddeffcc1c2a201654a0f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tv/tuner/config/TunerTestingConfigReaderV1_0.h | 9 |
1 files changed, 9 insertions, 0 deletions
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(); |