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

Fix support for platforms without Frontends am: 9a8084505e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17573373

Change-Id: Ic853ab319c7af8af916d59736b8cdff2a72d99fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gareth Fenn
2022-04-04 23:59:06 +00:00
committed by Automerger Merge Worker
parent f07aadd038 9a8084505e
commit 742bb019a4
3 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp
View File

@@ -640,6 +640,48 @@ TEST_P(TunerFilterAidlTest, testTimeFilter) {
testTimeFilter(timeFilterMap[timeFilter.timeFilterId]);
}
static bool isEventProducingFilter(const FilterConfig& filterConfig) {
switch (filterConfig.type.mainType) {
case DemuxFilterMainType::TS: {
auto tsFilterType =
filterConfig.type.subType.get<DemuxFilterSubType::Tag::tsFilterType>();
return (tsFilterType == DemuxTsFilterType::SECTION ||
tsFilterType == DemuxTsFilterType::PES ||
tsFilterType == DemuxTsFilterType::AUDIO ||
tsFilterType == DemuxTsFilterType::VIDEO ||
tsFilterType == DemuxTsFilterType::RECORD ||
tsFilterType == DemuxTsFilterType::TEMI);
}
case DemuxFilterMainType::MMTP: {
auto mmtpFilterType =
filterConfig.type.subType.get<DemuxFilterSubType::Tag::mmtpFilterType>();
return (mmtpFilterType == DemuxMmtpFilterType::SECTION ||
mmtpFilterType == DemuxMmtpFilterType::PES ||
mmtpFilterType == DemuxMmtpFilterType::AUDIO ||
mmtpFilterType == DemuxMmtpFilterType::VIDEO ||
mmtpFilterType == DemuxMmtpFilterType::RECORD ||
mmtpFilterType == DemuxMmtpFilterType::DOWNLOAD);
}
case DemuxFilterMainType::IP: {
auto ipFilterType =
filterConfig.type.subType.get<DemuxFilterSubType::Tag::ipFilterType>();
return (ipFilterType == DemuxIpFilterType::SECTION);
}
case DemuxFilterMainType::TLV: {
auto tlvFilterType =
filterConfig.type.subType.get<DemuxFilterSubType::Tag::tlvFilterType>();
return (tlvFilterType == DemuxTlvFilterType::SECTION);
}
case DemuxFilterMainType::ALP: {
auto alpFilterType =
filterConfig.type.subType.get<DemuxFilterSubType::Tag::alpFilterType>();
return (alpFilterType == DemuxAlpFilterType::SECTION);
}
default:
return false;
}
}
static bool isMediaFilter(const FilterConfig& filterConfig) {
switch (filterConfig.type.mainType) {
case DemuxFilterMainType::TS: {
@@ -685,6 +727,12 @@ static int getDemuxFilterEventDataLength(const DemuxFilterEvent& event) {
// TODO: move boilerplate into text fixture
void TunerFilterAidlTest::testDelayHint(const FilterConfig& filterConf) {
if (!filterConf.timeDelayInMs && !filterConf.dataDelayInBytes) {
return;
}
if (!isEventProducingFilter(filterConf)) {
return;
}
int32_t feId;
int32_t demuxId;
std::shared_ptr<IDemux> demux;
@@ -707,11 +755,11 @@ void TunerFilterAidlTest::testDelayHint(const FilterConfig& filterConf) {
// startTime needs to be set before calling setDelayHint.
auto startTime = std::chrono::steady_clock::now();
auto timeDelayInMs = std::chrono::milliseconds(filterConf.timeDelayInMs);
if (timeDelayInMs.count() > 0) {
int timeDelayInMs = filterConf.timeDelayInMs;
if (timeDelayInMs > 0) {
FilterDelayHint delayHint;
delayHint.hintType = FilterDelayHintType::TIME_DELAY_IN_MS;
delayHint.hintValue = timeDelayInMs.count();
delayHint.hintValue = timeDelayInMs;
// setDelayHint should fail for media filters.
ASSERT_EQ(filter->setDelayHint(delayHint).isOk(), !mediaFilter);
@@ -733,6 +781,10 @@ void TunerFilterAidlTest::testDelayHint(const FilterConfig& filterConf) {
auto cb = mFilterTests.getFilterCallbacks().at(filterId);
auto future =
cb->verifyFilterCallback([](const std::vector<DemuxFilterEvent>&) { return true; });
// The configure stage can also produce events, so we should set the delay
// hint beforehand.
ASSERT_TRUE(mFilterTests.configFilter(filterConf.settings, filterId));
mFilterTests.startFilter(filterId);
auto timeout = std::chrono::seconds(30);
@@ -750,20 +802,16 @@ void TunerFilterAidlTest::testDelayHint(const FilterConfig& filterConf) {
return true;
});
// The configure stage can also produce events, so we should set the delay
// hint beforehand.
ASSERT_TRUE(mFilterTests.configFilter(filterConf.settings, filterId));
ASSERT_TRUE(mFilterTests.startFilter(filterId));
// block and wait for callback to be received.
ASSERT_EQ(future.wait_for(timeout), std::future_status::ready);
auto duration = std::chrono::steady_clock::now() - startTime;
bool delayHintTest = duration >= timeDelayInMs;
auto duration = std::chrono::steady_clock::now() - startTime;
bool delayHintTest = duration >= std::chrono::milliseconds(timeDelayInMs);
bool dataSizeTest = callbackSize >= dataDelayInBytes;
if (timeDelayInMs.count() > 0 && dataDelayInBytes > 0) {
if (timeDelayInMs > 0 && dataDelayInBytes > 0) {
ASSERT_TRUE(delayHintTest || dataSizeTest);
} else {
// if only one of time delay / data delay is configured, one of them
@@ -781,7 +829,9 @@ void TunerFilterAidlTest::testDelayHint(const FilterConfig& filterConf) {
TEST_P(TunerFilterAidlTest, FilterDelayHintTest) {
description("Test filter time delay hint.");
if (!live.hasFrontendConnection) {
return;
}
for (const auto& obj : filterMap) {
testDelayHint(obj.second);
}

17
tv/tuner/aidl/vts/functional/VtsHalTvTunerTestConfigurations.h
View File

@@ -175,9 +175,14 @@ inline bool validateConnections() {
ALOGW("[vts config] Record must support either a DVR source or a Frontend source.");
return false;
}
bool feIsValid = frontendMap.find(live.frontendId) != frontendMap.end() &&
frontendMap.find(scan.frontendId) != frontendMap.end();
feIsValid &= record.support ? frontendMap.find(record.frontendId) != frontendMap.end() : true;
bool feIsValid = live.hasFrontendConnection
? frontendMap.find(live.frontendId) != frontendMap.end()
: true;
feIsValid &= scan.hasFrontendConnection ? frontendMap.find(scan.frontendId) != frontendMap.end()
: true;
feIsValid &= record.support && record.hasFrontendConnection
? frontendMap.find(record.frontendId) != frontendMap.end()
: true;
if (!feIsValid) {
ALOGW("[vts config] dynamic config fe connection is invalid.");
@@ -204,8 +209,10 @@ inline bool validateConnections() {
return false;
}
bool filterIsValid = filterMap.find(live.audioFilterId) != filterMap.end() &&
filterMap.find(live.videoFilterId) != filterMap.end();
bool filterIsValid = (live.hasFrontendConnection)
? filterMap.find(live.audioFilterId) != filterMap.end() &&
filterMap.find(live.videoFilterId) != filterMap.end()
: true;
filterIsValid &=
record.support ? filterMap.find(record.recordFilterId) != filterMap.end() : true;

2
tv/tuner/config/TunerTestingConfigAidlReaderV1_0.h
View File

@@ -867,6 +867,8 @@ struct TunerTestingConfigAidlReader1_0 {
settings.set<DemuxFilterSettings::Tag::ip>(ip);
break;
case FilterSubTypeEnum::IP: {
type.subType.set<DemuxFilterSubType::Tag::ipFilterType>(
DemuxIpFilterType::IP);
ip.ipAddr = readIpAddress(filterConfig),
ip.filterSettings
.set<DemuxIpFilterSettingsFilterSettings::Tag::bPassthrough>(