commit 9fc37c0d3c8ec8d34f2a79c95dfd5e5d24f826d0
author Gregory Montoir <gmontoir@google.com> Mon Jul 04 07:45:50 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 04 07:45:50 2022 +0000
tree e4074b4f9493eb9e8e738d04e9f01144ecbf6cbf
parent a7ce9003ed918b12a7e31f52bb1787a530acf5f3
parent 14ecb1c6a130bebd4a04880caaeb5d2223748ce6

Merge "Fix VTS PlaybackDataFlowWithTsVideoFilterTest sometimes failed." into android12-tests-dev am: 14ecb1c6a1

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

Change-Id: I1e3a07087b606a28c98bd4f61f84d74d99d40931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp
index b39abe3..53280d7 100644
--- a/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp
+++ b/tv/tuner/1.0/vts/functional/VtsHalTvTunerV1_0TargetTest.cpp
@@ -144,9 +144,9 @@
     ASSERT_TRUE(mFilterTests.getNewlyOpenedFilterId(filterId));
     ASSERT_TRUE(mFilterTests.configFilter(filterConf.settings, filterId));
     ASSERT_TRUE(mFilterTests.getFilterMQDescriptor(filterId, filterConf.getMqDesc));
-    mDvrTests.startPlaybackInputThread(dvrConf.playbackInputFile, dvrConf.settings.playback());
     ASSERT_TRUE(mDvrTests.startDvrPlayback());
     ASSERT_TRUE(mFilterTests.startFilter(filterId));
+    mDvrTests.startPlaybackInputThread(dvrConf.playbackInputFile, dvrConf.settings.playback());
     ASSERT_TRUE(filterDataOutputTest());
     mDvrTests.stopPlaybackThread();
     ASSERT_TRUE(mFilterTests.stopFilter(filterId));