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

Commit d2f5566e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bypass share memory handle test for passthrough filter" into... 

Merge "Bypass share memory handle test for passthrough filter" into android14-tests-dev am: 9770b288 am: ebf6b632 am: 3698c3e6

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



Change-Id: I2f8ecd5869d67871c5b5d3340d14cecee1cad15e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b7224d2 3698c3e6

tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp

+5 −3
Original line number Diff line number Diff line
@@ -214,9 +214,7 @@ void TunerBroadcastAidlTest::mediaFilterUsingSharedMemoryTest(FilterConfig filte 
    ASSERT_TRUE(mFilterTests.startFilter(filterId));

    // tune test

    ASSERT_TRUE(mFrontendTests.tuneFrontend(frontendConf, true /*testWithDemux*/));

    if (!isPassthroughFilter(filterConf)) {

    ASSERT_TRUE(filterDataOutputTest());

    }

    ASSERT_TRUE(mFrontendTests.stopTuneFrontend(true /*testWithDemux*/));

    ASSERT_TRUE(mFilterTests.stopFilter(filterId));

    ASSERT_TRUE(mFilterTests.releaseShareAvHandle(filterId));
@@ -1383,6 +1381,10 @@ TEST_P(TunerBroadcastAidlTest, MediaFilterWithSharedMemoryHandle) { 
    auto live_configs = generateLiveConfigurations();

    for (auto& configuration : live_configs) {

        live = configuration;

        // shared memory handle is not used by a passthrough filter at all

        if (isPassthroughFilter(filterMap[live.videoFilterId])) {

            continue;

        }

        mediaFilterUsingSharedMemoryTest(filterMap[live.videoFilterId],

                                         frontendMap[live.frontendId]);

    }