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

Merge "Fix bug for none fe test case" am: 7dc7626822

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

Change-Id: I524a4703b634115a890813f7196a758d0398469d
This commit is contained in:
Treehugger Robot
2021-05-11 00:16:49 +00:00
committed by Automerger Merge Worker
parent 68d5aacea7 7dc7626822
commit 62069b5509
4 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tv/tuner/1.0/vts/functional/DescramblerTests.cpp
View File

@@ -53,12 +53,15 @@ AssertionResult DescramblerTests::openCasSession(TunerKeyToken& sessionId,
return failure();
}
auto status = mCas->setSessionPrivateData(sessionId, hidlPvtData);
if (status != android::hardware::cas::V1_0::Status::OK) {
ALOGW("[vts] Failed to set session private data");
mCas->closeSession(sessionId);
return failure();
if (hidlPvtData.size() > 0) {
auto status = mCas->setSessionPrivateData(sessionId, hidlPvtData);
if (status != android::hardware::cas::V1_0::Status::OK) {
ALOGW("[vts] Failed to set session private data");
mCas->closeSession(sessionId);
return failure();
}
}
return success();
}

15
tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp
View File

@@ -267,7 +267,9 @@ void TunerRecordHidlTest::attachSingleFilterToRecordDvrTest(FilterConfig filterC
uint32_t demuxId;
sp<IDemux> demux;
ASSERT_TRUE(mDemuxTests.openDemux(demux, demuxId));
mDvrTests.setDemux(demux);
DvrConfig dvrSourceConfig;
if (record.hasFrontendConnection) {
uint32_t feId;
mFrontendTests.getFrontendIdByType(frontendConf.type, feId);
@@ -275,13 +277,17 @@ void TunerRecordHidlTest::attachSingleFilterToRecordDvrTest(FilterConfig filterC
ASSERT_TRUE(mFrontendTests.openFrontendById(feId));
ASSERT_TRUE(mFrontendTests.setFrontendCallback());
ASSERT_TRUE(mDemuxTests.setDemuxFrontendDataSource(feId));
} else {
dvrSourceConfig = dvrMap[record.dvrSourceId];
ASSERT_TRUE(mDvrTests.openDvrInDemux(dvrSourceConfig.type, dvrSourceConfig.bufferSize));
ASSERT_TRUE(mDvrTests.configDvrPlayback(dvrSourceConfig.settings));
ASSERT_TRUE(mDvrTests.getDvrPlaybackMQDescriptor());
}
uint32_t filterId;
sp<IFilter> filter;
mFilterTests.setDemux(demux);
mDvrTests.setDemux(demux);
ASSERT_TRUE(mDvrTests.openDvrInDemux(dvrConf.type, dvrConf.bufferSize));
ASSERT_TRUE(mDvrTests.configDvrRecord(dvrConf.settings));
ASSERT_TRUE(mDvrTests.getDvrRecordMQDescriptor());
@@ -327,6 +333,7 @@ void TunerDescramblerHidlTest::scrambledBroadcastTest(set<struct FilterConfig> m
mFrontendTests.setDemux(demux);
} else {
dvrSourceConfig = dvrMap[descrambling.dvrSourceId];
mDvrTests.setDemux(demux);
ASSERT_TRUE(mDvrTests.openDvrInDemux(dvrSourceConfig.type, dvrSourceConfig.bufferSize));
ASSERT_TRUE(mDvrTests.configDvrPlayback(dvrSourceConfig.settings));
ASSERT_TRUE(mDvrTests.getDvrPlaybackMQDescriptor());
@@ -641,7 +648,7 @@ TEST_P(TunerRecordHidlTest, RecordDataFlowWithTsRecordFilterTest) {
TEST_P(TunerRecordHidlTest, LnbRecordDataFlowWithTsRecordFilterTest) {
description("Feed ts data from Fe with Lnb to recording and test with ts record filter");
if (lnbRecord.support) {
if (!lnbRecord.support) {
return;
}
recordSingleFilterTestWithLnb(filterMap[lnbRecord.recordFilterId],
@@ -651,7 +658,7 @@ TEST_P(TunerRecordHidlTest, LnbRecordDataFlowWithTsRecordFilterTest) {
TEST_P(TunerDescramblerHidlTest, CreateDescrambler) {
description("Create Descrambler");
if (descrambling.support) {
if (!descrambling.support) {
return;
}
uint32_t demuxId;
@@ -678,7 +685,7 @@ TEST_P(TunerDescramblerHidlTest, CreateDescrambler) {
TEST_P(TunerDescramblerHidlTest, ScrambledBroadcastDataFlowMediaFiltersTest) {
description("Test ts audio filter in scrambled broadcast use case");
if (descrambling.support) {
if (!descrambling.support) {
return;
}
set<FilterConfig> filterConfs;

6
tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h
View File

@@ -214,8 +214,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 &= playback.support
? (filterMap.find(playback.audioFilterId) != filterMap.end() &&
filterMap.find(playback.videoFilterId) != filterMap.end())

6
tv/tuner/config/TunerTestingConfigReader.h
View File

@@ -368,8 +368,6 @@ struct TunerTestingConfigReader {
int size = privateData.size();
descramblerMap[id].hidlPvtData.resize(size);
memcpy(descramblerMap[id].hidlPvtData.data(), privateData.data(), size);
} else {
descramblerMap[id].hidlPvtData.resize(256);
}
}
}
@@ -468,7 +466,6 @@ struct TunerTestingConfigReader {
return;
}
auto recordConfig = *dataFlow.getFirstDvrRecord();
record.frontendId = recordConfig.getFrontendConnection();
record.recordFilterId = recordConfig.getRecordFilterConnection();
record.dvrRecordId = recordConfig.getDvrRecordConnection();
if (recordConfig.hasDvrSoftwareFeConnection()) {
@@ -477,6 +474,7 @@ struct TunerTestingConfigReader {
if (recordConfig.getHasFrontendConnection()) {
record.hasFrontendConnection = true;
record.dvrSourceId = emptyHardwareId;
record.frontendId = recordConfig.getFrontendConnection();
} else {
record.hasFrontendConnection = false;
record.dvrSourceId = recordConfig.getDvrSourceConnection();
@@ -492,7 +490,6 @@ struct TunerTestingConfigReader {
return;
}
auto descConfig = *dataFlow.getFirstDescrambling();
descrambling.frontendId = descConfig.getFrontendConnection();
descrambling.descramblerId = descConfig.getDescramblerConnection();
descrambling.audioFilterId = descConfig.getAudioFilterConnection();
descrambling.videoFilterId = descConfig.getVideoFilterConnection();
@@ -502,6 +499,7 @@ struct TunerTestingConfigReader {
if (descConfig.getHasFrontendConnection()) {
descrambling.hasFrontendConnection = true;
descrambling.dvrSourceId = emptyHardwareId;
descrambling.frontendId = descConfig.getFrontendConnection();
} else {
descrambling.hasFrontendConnection = false;
descrambling.dvrSourceId = descConfig.getDvrSourceConnection();