Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 15:58:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add isHighPriority scan message type into Tuner HAL 1.1"

Browse Source
This commit is contained in:
Amy Zhang
2020-10-07 20:16:46 +00:00
committed by Android (Google) Code Review
parent 6708bf6ae5 7ec2b704fa
commit 99adeec067
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tv/tuner/1.1/default/Frontend.cpp
View File

@@ -122,9 +122,12 @@ Return<Result> Frontend::scan(const FrontendSettings& settings, FrontendScanType
V1_1::IFrontendCallback::castFrom(mCallback);
if (frontendCallback_v1_1 != NULL) {
V1_1::FrontendScanMessageExt1_1 msg;
msg.dvbc(FrontendDvbcModulation::MOD_16QAM);
msg.modulation().dvbc(FrontendDvbcModulation::MOD_16QAM);
frontendCallback_v1_1->onScanMessageExt1_1(V1_1::FrontendScanMessageTypeExt1_1::MODULATION,
msg);
msg.isHighPriority(true);
frontendCallback_v1_1->onScanMessageExt1_1(
V1_1::FrontendScanMessageTypeExt1_1::HIGH_PRIORITY, msg);
} else {
ALOGD("[Filter] Couldn't cast to V1_1 IFrontendCallback");
}

7
tv/tuner/1.1/types.hal
View File

@@ -555,6 +555,11 @@ safe_union FrontendStatusExt1_1 {
enum FrontendScanMessageTypeExt1_1 : uint32_t {
MODULATION = @1.0::FrontendScanMessageType:ATSC3_PLP_INFO + 1,
HIGH_PRIORITY,
};
typedef FrontendModulation FrontendScanMessageExt1_1;
safe_union FrontendScanMessageExt1_1 {
FrontendModulation modulation;
bool isHighPriority;
};

9
tv/tuner/1.1/vts/functional/FrontendTests.cpp
View File

@@ -51,9 +51,12 @@ Return<void> FrontendCallback::onScanMessageExt1_1(FrontendScanMessageTypeExt1_1
const FrontendScanMessageExt1_1& message) {
android::Mutex::Autolock autoLock(mMsgLock);
ALOGD("[vts] frontend ext1_1 scan message. Type: %d", type);
switch (type) {
case FrontendScanMessageTypeExt1_1::MODULATION:
readFrontendScanMessageExt1_1Modulation(message);
switch (message.getDiscriminator()) {
case FrontendScanMessageExt1_1::hidl_discriminator::modulation:
readFrontendScanMessageExt1_1Modulation(message.modulation());
break;
case FrontendScanMessageExt1_1::hidl_discriminator::isHighPriority:
ALOGD("[vts] frontend ext1_1 scan message high priority: %d", message.isHighPriority());
break;
default:
break;