commit 2ef9a1554c269837a8c122ae61a9f5787be23ad5
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 21 23:25:43 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 21 23:25:43 2022 +0000
tree ccef91770d4198b9723b98aa55b7c1733602a036
parent 63dfce8d5534db940280179108184b1637689284
parent a71fffd754106e755714155605aa92d672817822

Merge "Fix VTS PlaybackDataFlowWithTsVideoFilterTest sometimes failed." into tm-dev am: a71fffd754

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

Change-Id: I8971ee77d3f21b002b7aee16ddd128f5f3dd290c
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 3e3a4d4..59b7939 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));