diff options
author | Pawin Vongmasa | 2017-07-13 23:45:48 -0500 |
---|---|---|
committer | android-build-merger | 2017-07-13 23:45:48 -0500 |
commit | eadfa778d9851a2846414b355103c39e129e1fcb (patch) | |
tree | 6572cd73c967632048bae9335ba3bdb5318c2a7d /media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp | |
parent | 6bc4329c0321e3f63f74cce9942e6e938fa88cee (diff) | |
parent | 3f1ce37ed4c78cc641e8317beb41d4c5cd01d87d (diff) | |
download | platform-hardware-interfaces-eadfa778d9851a2846414b355103c39e129e1fcb.tar.gz platform-hardware-interfaces-eadfa778d9851a2846414b355103c39e129e1fcb.tar.xz platform-hardware-interfaces-eadfa778d9851a2846414b355103c39e129e1fcb.zip |
Merge "Print test information to the target device's logcat" into oc-dr1-dev am: 4bd2ed2323
am: 3f1ce37ed4
Change-Id: If3b8e780cf3a7c505a17c38ed11e8a98ce94a031
Diffstat (limited to 'media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp')
-rw-r--r-- | media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp index 53ffc599..12b1355f 100644 --- a/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp +++ b/media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp | |||
@@ -134,12 +134,22 @@ static ComponentTestEnvironment* gEnv = nullptr; | |||
134 | 134 | ||
135 | // video decoder test fixture class | 135 | // video decoder test fixture class |
136 | class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { | 136 | class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { |
137 | private: | ||
138 | typedef ::testing::VtsHalHidlTargetTestBase Super; | ||
137 | public: | 139 | public: |
140 | ::std::string getTestCaseInfo() const override { | ||
141 | return ::std::string() + | ||
142 | "Component: " + gEnv->getComponent().c_str() + " | " + | ||
143 | "Role: " + gEnv->getRole().c_str() + " | " + | ||
144 | "Instance: " + gEnv->getInstance().c_str() + " | " + | ||
145 | "Res: " + gEnv->getRes().c_str(); | ||
146 | } | ||
147 | |||
138 | virtual void SetUp() override { | 148 | virtual void SetUp() override { |
149 | Super::SetUp(); | ||
139 | disableTest = false; | 150 | disableTest = false; |
140 | android::hardware::media::omx::V1_0::Status status; | 151 | android::hardware::media::omx::V1_0::Status status; |
141 | omx = ::testing::VtsHalHidlTargetTestBase::getService<IOmx>( | 152 | omx = Super::getService<IOmx>(gEnv->getInstance()); |
142 | gEnv->getInstance()); | ||
143 | ASSERT_NE(omx, nullptr); | 153 | ASSERT_NE(omx, nullptr); |
144 | observer = | 154 | observer = |
145 | new CodecObserver([this](Message msg, const BufferInfo* buffer) { | 155 | new CodecObserver([this](Message msg, const BufferInfo* buffer) { |
@@ -223,6 +233,7 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase { | |||
223 | EXPECT_TRUE((omxNode->freeNode()).isOk()); | 233 | EXPECT_TRUE((omxNode->freeNode()).isOk()); |
224 | omxNode = nullptr; | 234 | omxNode = nullptr; |
225 | } | 235 | } |
236 | Super::TearDown(); | ||
226 | } | 237 | } |
227 | 238 | ||
228 | // callback function to process messages received by onMessages() from IL | 239 | // callback function to process messages received by onMessages() from IL |