tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add fix vts fail when configureMonitorEvent am: b79cbf50f1

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

Change-Id: I48d3c2ecee071096c1b94c94293bb9b1cc39f839
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
mike liao 2023-06-29 23:22:37 +00:00 committed by Automerger Merge Worker
commit d8baeb3916
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tv/tuner/1.1/vts/functional/FilterTests.cpp
View file

@ -306,12 +306,6 @@ AssertionResult FilterTests::configureMonitorEvent(uint64_t filterId, uint32_t m
android::hardware::tv::tuner::V1_1::IFilter::castFrom(mFilters[filterId]);
if (filter_v1_1 != NULL) {
status = filter_v1_1->configureMonitorEvent(monitorEventTypes);
if (monitorEventTypes & DemuxFilterMonitorEventType::SCRAMBLING_STATUS) {
mFilterCallbacks[filterId]->testFilterScramblingEvent();
}
if (monitorEventTypes & DemuxFilterMonitorEventType::IP_CID_CHANGE) {
mFilterCallbacks[filterId]->testFilterIpCidEvent();
}
} else {
ALOGW("[vts] Can't cast IFilter into v1_1.");
return failure();
@ -319,6 +313,17 @@ AssertionResult FilterTests::configureMonitorEvent(uint64_t filterId, uint32_t m
return AssertionResult(status == Result::SUCCESS);
}
AssertionResult FilterTests::testMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes) {
EXPECT_TRUE(mFilterCallbacks[filterId]) << "Test with getNewlyOpenedFilterId first.";
if (monitorEventTypes & DemuxFilterMonitorEventType::SCRAMBLING_STATUS) {
mFilterCallbacks[filterId]->testFilterScramblingEvent();
}
if (monitorEventTypes & DemuxFilterMonitorEventType::IP_CID_CHANGE) {
mFilterCallbacks[filterId]->testFilterIpCidEvent();
}
return AssertionResult(true);
}
AssertionResult FilterTests::startIdTest(uint64_t filterId) {
EXPECT_TRUE(mFilterCallbacks[filterId]) << "Test with getNewlyOpenedFilterId first.";
mFilterCallbacks[filterId]->testStartIdAfterReconfigure();

1
tv/tuner/1.1/vts/functional/FilterTests.h
View file

@ -162,6 +162,7 @@ class FilterTests {
AssertionResult configAvFilterStreamType(AvStreamType type, uint64_t filterId);
AssertionResult configIpFilterCid(uint32_t ipCid, uint64_t filterId);
AssertionResult configureMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes);
AssertionResult testMonitorEvent(uint64_t filterId, uint32_t monitorEventTypes);
AssertionResult getFilterMQDescriptor(uint64_t filterId, bool getMqDesc);
AssertionResult startFilter(uint64_t filterId);
AssertionResult stopFilter(uint64_t filterId);

5
tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.cpp
View file

@ -48,6 +48,11 @@ void TunerFilterHidlTest::configSingleFilterInDemuxTest(FilterConfig1_1 filterCo
}
ASSERT_TRUE(mFilterTests.getFilterMQDescriptor(filterId, filterConf.config1_0.getMqDesc));
ASSERT_TRUE(mFilterTests.startFilter(filterId));
ASSERT_TRUE(mFrontendTests.tuneFrontend(frontendConf, true /*testWithDemux*/));
if (filterConf.monitorEventTypes > 0) {
ASSERT_TRUE(mFilterTests.testMonitorEvent(filterId, filterConf.monitorEventTypes));
}
ASSERT_TRUE(mFrontendTests.stopTuneFrontend(true /*testWithDemux*/));
ASSERT_TRUE(mFilterTests.stopFilter(filterId));
ASSERT_TRUE(mFilterTests.closeFilter(filterId));
ASSERT_TRUE(mDemuxTests.closeDemux());