Merge "Add ATSC support in the vts" into android12-tests-dev am: 333df15518
am: 368ca264f2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2471289 Change-Id: I384cfc0e1dc70275f87e10997a29b14225690105 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
fee45b6dbb
1 changed files with 9 additions and 0 deletions
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue