Merge "Print test information to the target device's logcat" into oc-dr1-dev (3f1ce37e) · Commits · e / os / android_hardware_interfaces

media/omx/1.0/vts/functional/audio/VtsHalMediaOmxV1_0TargetAudioDecTest.cpp

+13 −2

Original line number	Diff line number	Diff line
		@@ -129,12 +129,22 @@ static ComponentTestEnvironment* gEnv = nullptr;

		// audio decoder test fixture class
		class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		private:
		typedef ::testing::VtsHalHidlTargetTestBase Super;
		public:
		::std::string getTestCaseInfo() const override {
		return ::std::string() +
		"Component: " + gEnv->getComponent().c_str() + " \| " +
		"Role: " + gEnv->getRole().c_str() + " \| " +
		"Instance: " + gEnv->getInstance().c_str() + " \| " +
		"Res: " + gEnv->getRes().c_str();
		}

		virtual void SetUp() override {
		Super::SetUp();
		disableTest = false;
		android::hardware::media::omx::V1_0::Status status;
		omx = ::testing::VtsHalHidlTargetTestBase::getService<IOmx>(
		gEnv->getInstance());
		omx = Super::getService<IOmx>(gEnv->getInstance());
		ASSERT_NE(omx, nullptr);
		observer =
		new CodecObserver([this](Message msg, const BufferInfo* buffer) {
		@@ -217,6 +227,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		EXPECT_TRUE((omxNode->freeNode()).isOk());
		omxNode = nullptr;
		}
		Super::TearDown();
		}

		// callback function to process messages received by onMessages() from IL

+13 −2

Original line number	Diff line number	Diff line
		@@ -129,12 +129,22 @@ static ComponentTestEnvironment* gEnv = nullptr;

		// audio encoder test fixture class
		class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		private:
		typedef ::testing::VtsHalHidlTargetTestBase Super;
		public:
		::std::string getTestCaseInfo() const override {
		return ::std::string() +
		"Component: " + gEnv->getComponent().c_str() + " \| " +
		"Role: " + gEnv->getRole().c_str() + " \| " +
		"Instance: " + gEnv->getInstance().c_str() + " \| " +
		"Res: " + gEnv->getRes().c_str();
		}

		virtual void SetUp() override {
		Super::SetUp();
		disableTest = false;
		android::hardware::media::omx::V1_0::Status status;
		omx = ::testing::VtsHalHidlTargetTestBase::getService<IOmx>(
		gEnv->getInstance());
		omx = Super::getService<IOmx>(gEnv->getInstance());
		ASSERT_NE(omx, nullptr);
		observer =
		new CodecObserver([this](Message msg, const BufferInfo* buffer) {
		@@ -204,6 +214,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		EXPECT_TRUE((omxNode->freeNode()).isOk());
		omxNode = nullptr;
		}
		Super::TearDown();
		}

		// callback function to process messages received by onMessages() from IL

+12 −2

Original line number	Diff line number	Diff line
		@@ -117,12 +117,21 @@ static ComponentTestEnvironment* gEnv = nullptr;

		// generic component test fixture class
		class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		private:
		typedef ::testing::VtsHalHidlTargetTestBase Super;
		public:
		::std::string getTestCaseInfo() const override {
		return ::std::string() +
		"Component: " + gEnv->getComponent().c_str() + " \| " +
		"Role: " + gEnv->getRole().c_str() + " \| " +
		"Instance: " + gEnv->getInstance().c_str();
		}

		virtual void SetUp() override {
		Super::SetUp();
		disableTest = false;
		android::hardware::media::omx::V1_0::Status status;
		omx = ::testing::VtsHalHidlTargetTestBase::getService<IOmx>(
		gEnv->getInstance());
		omx = Super::getService<IOmx>(gEnv->getInstance());
		ASSERT_NE(omx, nullptr);
		observer = new CodecObserver(nullptr);
		ASSERT_NE(observer, nullptr);
		@@ -180,6 +189,7 @@ class ComponentHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		EXPECT_TRUE((omxNode->freeNode()).isOk());
		omxNode = nullptr;
		}
		Super::TearDown();
		}

		enum standardCompClass {

+7 −2

Original line number	Diff line number	Diff line
		@@ -97,17 +97,22 @@ class ComponentTestEnvironment : public ::testing::Environment {
		static ComponentTestEnvironment* gEnv = nullptr;

		class MasterHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		private:
		typedef ::testing::VtsHalHidlTargetTestBase Super;
		public:
		virtual void SetUp() override {
		Super::SetUp();
		omxStore = nullptr;
		omxStore = ::testing::VtsHalHidlTargetTestBase::getService<IOmxStore>();
		omxStore = Super::getService<IOmxStore>();
		ASSERT_NE(omxStore, nullptr);
		omx = nullptr;
		omx = omxStore->getOmx(gEnv->getInstance());
		ASSERT_NE(omx, nullptr);
		}

		virtual void TearDown() override {}
		virtual void TearDown() override {
		Super::TearDown();
		}

		sp<IOmxStore> omxStore;
		sp<IOmx> omx;

+13 −2

Original line number	Diff line number	Diff line
		@@ -134,12 +134,22 @@ static ComponentTestEnvironment* gEnv = nullptr;

		// video decoder test fixture class
		class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		private:
		typedef ::testing::VtsHalHidlTargetTestBase Super;
		public:
		::std::string getTestCaseInfo() const override {
		return ::std::string() +
		"Component: " + gEnv->getComponent().c_str() + " \| " +
		"Role: " + gEnv->getRole().c_str() + " \| " +
		"Instance: " + gEnv->getInstance().c_str() + " \| " +
		"Res: " + gEnv->getRes().c_str();
		}

		virtual void SetUp() override {
		Super::SetUp();
		disableTest = false;
		android::hardware::media::omx::V1_0::Status status;
		omx = ::testing::VtsHalHidlTargetTestBase::getService<IOmx>(
		gEnv->getInstance());
		omx = Super::getService<IOmx>(gEnv->getInstance());
		ASSERT_NE(omx, nullptr);
		observer =
		new CodecObserver([this](Message msg, const BufferInfo* buffer) {
		@@ -223,6 +233,7 @@ class VideoDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		EXPECT_TRUE((omxNode->freeNode()).isOk());
		omxNode = nullptr;
		}
		Super::TearDown();
		}

		// callback function to process messages received by onMessages() from IL