Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518 am: 368ca264f2 am: fee45b6dbb am: 546704447e

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

Change-Id: Id84b2996b171486d1a80976d26897580d6fda7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-03-15 01:41:03 +00:00 committed by Automerger Merge Worker
commit a34a7b7550

View file

@ -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();