Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0bc13d5 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "Fix bug for none fe test case" into sc-dev am: 5bae0d27 

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

Change-Id: I614253b86bf6fab59b5f6b2cc97af34985d711ed
parents b592224a 5bae0d27

tv/tuner/1.0/vts/functional/DescramblerTests.cpp

+8 −5
Original line number Diff line number Diff line
@@ -53,12 +53,15 @@ AssertionResult DescramblerTests::openCasSession(TunerKeyToken& 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();

}

tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp

+11 −4
Original line number Diff line number Diff line
@@ -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;

tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TestConfigurations.h

+4 −2
Original line number Diff line number Diff line
@@ -216,8 +216,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())

tv/tuner/config/TunerTestingConfigReaderV1_0.h

+2 −2
Original line number Diff line number Diff line
@@ -480,7 +480,6 @@ struct TunerTestingConfigReader1_0 { 
            return;

        }

        auto recordConfig = *dataFlow.getFirstDvrRecord();

        record.frontendId = recordConfig.getFrontendConnection();

        record.recordFilterId = recordConfig.getRecordFilterConnection();

        record.dvrRecordId = recordConfig.getDvrRecordConnection();

        if (recordConfig.hasDvrSoftwareFeConnection()) {
@@ -489,6 +488,7 @@ struct TunerTestingConfigReader1_0 { 
        if (recordConfig.getHasFrontendConnection()) {

            record.hasFrontendConnection = true;

            record.dvrSourceId = emptyHardwareId;

            record.frontendId = recordConfig.getFrontendConnection();

        } else {

            record.hasFrontendConnection = false;

            record.dvrSourceId = recordConfig.getDvrSourceConnection();
@@ -504,7 +504,6 @@ struct TunerTestingConfigReader1_0 { 
            return;

        }

        auto descConfig = *dataFlow.getFirstDescrambling();

        descrambling.frontendId = descConfig.getFrontendConnection();

        descrambling.descramblerId = descConfig.getDescramblerConnection();

        descrambling.audioFilterId = descConfig.getAudioFilterConnection();

        descrambling.videoFilterId = descConfig.getVideoFilterConnection();
@@ -514,6 +513,7 @@ struct TunerTestingConfigReader1_0 { 
        if (descConfig.getHasFrontendConnection()) {

            descrambling.hasFrontendConnection = true;

            descrambling.dvrSourceId = emptyHardwareId;

            descrambling.frontendId = descConfig.getFrontendConnection();

        } else {

            descrambling.hasFrontendConnection = false;

            descrambling.dvrSourceId = descConfig.getDvrSourceConnection();