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

Commit 8c9ef215 authored by Hongguang Chen's avatar Hongguang Chen Committed by Android (Google) Code Review
Browse files

Merge "Merge "VTS: fix some logic errors for tuner HAL vts [1/1]" into... 

Merge "Merge "VTS: fix some logic errors for tuner HAL vts [1/1]" into android11-tests-dev am: 0638fc1e"
parents 1d6b83f1 4cdc4f20

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

100644 → 100755
+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ AssertionResult FrontendTests::tuneFrontend(FrontendConfig config, bool testWith 
        result &= getDvrTests()->getDvrPlaybackMQDescriptor() == success();

        getDvrTests()->startPlaybackInputThread(mDvrConfig.playbackInputFile,

                                                mDvrConfig.settings.playback());

        getDvrTests()->startDvrPlayback();

        if (!result) {

            ALOGW("[vts] Software frontend dvr configure failed.");

            return failure();
@@ -400,6 +401,7 @@ AssertionResult FrontendTests::stopTuneFrontend(bool testWithDemux) { 
    status = mFrontend->stopTune();

    if (mIsSoftwareFe && testWithDemux) {

        getDvrTests()->stopPlaybackThread();

        getDvrTests()->stopDvrPlayback();

        getDvrTests()->closeDvrPlayback();

    }

    return AssertionResult(status == Result::SUCCESS);

tv/tuner/1.1/vts/functional/FrontendTests.cpp

+2 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ AssertionResult FrontendTests::tuneFrontend(FrontendConfig1_1 config, bool testW 
        result &= getDvrTests()->getDvrPlaybackMQDescriptor() == success();

        getDvrTests()->startPlaybackInputThread(mDvrConfig.playbackInputFile,

                                                mDvrConfig.settings.playback());

        getDvrTests()->startDvrPlayback();

        if (!result) {

            ALOGW("[vts] Software frontend dvr configure failed.");

            return failure();
@@ -459,6 +460,7 @@ AssertionResult FrontendTests::stopTuneFrontend(bool testWithDemux) { 
    status = mFrontend->stopTune();

    if (mIsSoftwareFe && testWithDemux) {

        getDvrTests()->stopPlaybackThread();

        getDvrTests()->stopDvrPlayback();

        getDvrTests()->closeDvrPlayback();

    }

    return AssertionResult(status == Result::SUCCESS);

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

+2 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ AssertionResult FrontendTests::tuneFrontend(FrontendConfig config, bool testWith 
        getDvrTests()->startPlaybackInputThread(

                mDvrConfig.playbackInputFile,

                mDvrConfig.settings.get<DvrSettings::Tag::playback>());

        getDvrTests()->startDvrPlayback();

    }

    mFrontendCallback->tuneTestOnLock(mFrontend, config.settings);

    return AssertionResult(true);
@@ -448,6 +449,7 @@ AssertionResult FrontendTests::stopTuneFrontend(bool testWithDemux) { 
    status = mFrontend->stopTune();

    if (mIsSoftwareFe && testWithDemux) {

        getDvrTests()->stopPlaybackThread();

        getDvrTests()->stopDvrPlayback();

        getDvrTests()->closeDvrPlayback();

    }

    return AssertionResult(status.isOk());