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

Commit ebf6b632 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

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



Change-Id: Iac0d1f4b2c905331a996e601c34914e1c4d1d4b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e6c67b76 9770b288
Loading
Loading
Loading
Loading
+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));
@@ -1363,6 +1361,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]);
    }