commit 3595647dfdded911a862dc0540baf28bac614c65
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 17 00:28:32 2021 +0000
committer Hongguang Chen <hgchen@google.com> Fri Dec 17 00:51:00 2021 +0000
tree 2c9e543749ccf273211e52e6667a0b1c7c995b83
parent 35f07a44869afb199ae06a06eb2a8bf4eaba48da
parent 0638fc1edecabf7ccf89992cc260ebd0e3819913

Merge "VTS: fix some logic errors for tuner HAL vts [1/1]" into android11-tests-dev am: 0638fc1ede

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

Change-Id: Ida7b10a22c9c72ac9bc0fffc97750aaf27860fd7

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

diff --git a/tv/tuner/1.0/vts/functional/FrontendTests.cpp b/tv/tuner/1.0/vts/functional/FrontendTests.cpp
old mode 100644
new mode 100755
index cb5d89c..b39d922
--- a/tv/tuner/1.0/vts/functional/FrontendTests.cpp
+++ b/tv/tuner/1.0/vts/functional/FrontendTests.cpp
@@ -376,6 +376,7 @@
         result &= mDvrTests.getDvrPlaybackMQDescriptor() == success();
         mDvrTests.startPlaybackInputThread(mDvrConfig.playbackInputFile,
                                            mDvrConfig.settings.playback());
+        mDvrTests.startDvrPlayback();
         if (!result) {
             ALOGW("[vts] Software frontend dvr configure failed.");
             return failure();
@@ -399,6 +400,7 @@
     status = mFrontend->stopTune();
     if (mIsSoftwareFe && testWithDemux) {
         mDvrTests.stopPlaybackThread();
+        mDvrTests.stopDvrPlayback();
         mDvrTests.closeDvrPlayback();
     }
     return AssertionResult(status == Result::SUCCESS);

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

diff --git a/tv/tuner/1.1/vts/functional/FrontendTests.cpp b/tv/tuner/1.1/vts/functional/FrontendTests.cpp
index 77cd2d4..f65e58d 100644
--- a/tv/tuner/1.1/vts/functional/FrontendTests.cpp
+++ b/tv/tuner/1.1/vts/functional/FrontendTests.cpp
@@ -443,6 +443,7 @@
         result &= mDvrTests.getDvrPlaybackMQDescriptor() == success();
         mDvrTests.startPlaybackInputThread(mDvrConfig.playbackInputFile,
                                            mDvrConfig.settings.playback());
+        mDvrTests.startDvrPlayback();
         if (!result) {
             ALOGW("[vts] Software frontend dvr configure failed.");
             return failure();
@@ -458,6 +459,7 @@
     status = mFrontend->stopTune();
     if (mIsSoftwareFe && testWithDemux) {
         mDvrTests.stopPlaybackThread();
+        mDvrTests.stopDvrPlayback();
         mDvrTests.closeDvrPlayback();
     }
     return AssertionResult(status == Result::SUCCESS);