Merge changes I4a4aad3a,I40b94919 into oc-mr1-dev (089b8813) · Commits · e / os / android_hardware_interfaces

media/omx/1.0/vts/functional/common/Android.bp

+3 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ cc_library_static {
		"android.hidl.allocator@1.0",
		"android.hidl.memory@1.0",
		"android.hardware.media.omx@1.0",
		"android.hardware.graphics.allocator@2.0",
		],
		}

		@@ -38,6 +39,8 @@ cc_defaults {
		// Link to these statically as they are not guaranteed to be on the device.
		static_libs: [
		"VtsHalMediaOmxV1_0CommonUtil",
		"android.hardware.graphics.allocator@2.0",
		"android.hardware.graphics.mapper@2.0",
		"android.hardware.graphics.bufferqueue@1.0",
		"android.hardware.graphics.common@1.0",
		"android.hardware.media.omx@1.0",

media/omx/1.0/vts/functional/common/media_hidl_test_common.cpp

+84 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,9 @@

		#include <android-base/logging.h>

		#include <android/hardware/graphics/allocator/2.0/IAllocator.h>
		#include <android/hardware/graphics/mapper/2.0/IMapper.h>
		#include <android/hardware/graphics/mapper/2.0/types.h>
		#include <android/hardware/media/omx/1.0/IOmx.h>
		#include <android/hardware/media/omx/1.0/IOmxNode.h>
		#include <android/hardware/media/omx/1.0/IOmxObserver.h>
		@@ -29,7 +32,10 @@
		#include <android/hidl/allocator/1.0/IAllocator.h>
		#include <android/hidl/memory/1.0/IMapper.h>
		#include <android/hidl/memory/1.0/IMemory.h>
		#include <cutils/atomic.h>

		using ::android::hardware::graphics::common::V1_0::BufferUsage;
		using ::android::hardware::graphics::common::V1_0::PixelFormat;
		using ::android::hardware::media::omx::V1_0::IOmx;
		using ::android::hardware::media::omx::V1_0::IOmxObserver;
		using ::android::hardware::media::omx::V1_0::IOmxNode;
		@@ -186,6 +192,73 @@ Return<android::hardware::media::omx::V1_0::Status> setAudioPortFormat(
		return status;
		}

		void allocateGraphicBuffers(sp<IOmxNode> omxNode, OMX_U32 portIndex,
		BufferInfo* buffer, uint32_t nFrameWidth,
		uint32_t nFrameHeight, int32_t* nStride,
		int format) {
		android::hardware::media::omx::V1_0::Status status;
		sp<android::hardware::graphics::allocator::V2_0::IAllocator> allocator =
		android::hardware::graphics::allocator::V2_0::IAllocator::getService();
		ASSERT_NE(nullptr, allocator.get());

		sp<android::hardware::graphics::mapper::V2_0::IMapper> mapper =
		android::hardware::graphics::mapper::V2_0::IMapper::getService();
		ASSERT_NE(mapper.get(), nullptr);

		android::hardware::graphics::mapper::V2_0::IMapper::BufferDescriptorInfo
		descriptorInfo;
		uint32_t usage;

		descriptorInfo.width = nFrameWidth;
		descriptorInfo.height = nFrameHeight;
		descriptorInfo.layerCount = 1;
		descriptorInfo.format = static_cast<PixelFormat>(format);
		descriptorInfo.usage = static_cast<uint64_t>(BufferUsage::CPU_READ_OFTEN);
		omxNode->getGraphicBufferUsage(
		portIndex,
		[&status, &usage](android::hardware::media::omx::V1_0::Status _s,
		uint32_t _n1) {
		status = _s;
		usage = _n1;
		});
		if (status == android::hardware::media::omx::V1_0::Status::OK) {
		descriptorInfo.usage \|= usage;
		}

		::android::hardware::hidl_vec<uint32_t> descriptor;
		android::hardware::graphics::mapper::V2_0::Error error;
		mapper->createDescriptor(
		descriptorInfo, [&error, &descriptor](
		android::hardware::graphics::mapper::V2_0::Error _s,
		::android::hardware::hidl_vec<uint32_t> _n1) {
		error = _s;
		descriptor = _n1;
		});
		EXPECT_EQ(error, android::hardware::graphics::mapper::V2_0::Error::NONE);

		static volatile int32_t nextId = 0;
		uint64_t id = static_cast<uint64_t>(getpid()) << 32;
		allocator->allocate(
		descriptor, 1,
		[&](android::hardware::graphics::mapper::V2_0::Error _s, uint32_t _n1,
		const ::android::hardware::hidl_vec<
		::android::hardware::hidl_handle>& _n2) {
		ASSERT_EQ(android::hardware::graphics::mapper::V2_0::Error::NONE,
		_s);
		*nStride = _n1;
		buffer->omxBuffer.nativeHandle = _n2[0];
		buffer->omxBuffer.attr.anwBuffer.width = nFrameWidth;
		buffer->omxBuffer.attr.anwBuffer.height = nFrameHeight;
		buffer->omxBuffer.attr.anwBuffer.stride = _n1;
		buffer->omxBuffer.attr.anwBuffer.format = descriptorInfo.format;
		buffer->omxBuffer.attr.anwBuffer.usage = descriptorInfo.usage;
		buffer->omxBuffer.attr.anwBuffer.layerCount =
		descriptorInfo.layerCount;
		buffer->omxBuffer.attr.anwBuffer.id =
		id \| static_cast<uint32_t>(android_atomic_inc(&nextId));
		});
		}

		// allocate buffers needed on a component port
		void allocateBuffer(sp<IOmxNode> omxNode, BufferInfo* buffer, OMX_U32 portIndex,
		OMX_U32 nBufferSize, PortMode portMode) {
		@@ -249,7 +322,7 @@ void allocateBuffer(sp<IOmxNode> omxNode, BufferInfo* buffer, OMX_U32 portIndex,
		// allocate buffers needed on a component port
		void allocatePortBuffers(sp<IOmxNode> omxNode,
		android::Vector<BufferInfo>* buffArray,
		OMX_U32 portIndex, PortMode portMode) {
		OMX_U32 portIndex, PortMode portMode, bool allocGrap) {
		android::hardware::media::omx::V1_0::Status status;
		OMX_PARAM_PORTDEFINITIONTYPE portDef;

		@@ -263,6 +336,13 @@ void allocatePortBuffers(sp<IOmxNode> omxNode,
		BufferInfo buffer;
		allocateBuffer(omxNode, &buffer, portIndex, portDef.nBufferSize,
		portMode);
		if (allocGrap && portMode == PortMode::DYNAMIC_ANW_BUFFER) {
		int32_t nStride;
		allocateGraphicBuffers(omxNode, portIndex, &buffer,
		portDef.format.video.nFrameWidth,
		portDef.format.video.nFrameHeight, &nStride,
		portDef.format.video.eColorFormat);
		}
		buffArray->push(buffer);
		}
		}
		@@ -274,7 +354,7 @@ void changeStateLoadedtoIdle(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		android::Vector<BufferInfo>* iBuffer,
		android::Vector<BufferInfo>* oBuffer,
		OMX_U32 kPortIndexInput, OMX_U32 kPortIndexOutput,
		PortMode* portMode) {
		PortMode* portMode, bool allocGrap) {
		android::hardware::media::omx::V1_0::Status status;
		Message msg;
		PortMode defaultPortMode[2], *pm;
		@@ -293,14 +373,14 @@ void changeStateLoadedtoIdle(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::TIMED_OUT);

		// allocate buffers on input port
		allocatePortBuffers(omxNode, iBuffer, kPortIndexInput, pm[0]);
		allocatePortBuffers(omxNode, iBuffer, kPortIndexInput, pm[0], allocGrap);

		// Dont switch states until the ports are populated
		status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);
		ASSERT_EQ(status, android::hardware::media::omx::V1_0::Status::TIMED_OUT);

		// allocate buffers on output port
		allocatePortBuffers(omxNode, oBuffer, kPortIndexOutput, pm[1]);
		allocatePortBuffers(omxNode, oBuffer, kPortIndexOutput, pm[1], allocGrap);

		// As the ports are populated, check if the state transition is complete
		status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT, iBuffer, oBuffer);

media/omx/1.0/vts/functional/common/media_hidl_test_common.h

+4 −2

Original line number	Diff line number	Diff line
		@@ -303,13 +303,15 @@ void allocateBuffer(sp<IOmxNode> omxNode, BufferInfo* buffer, OMX_U32 portIndex,
		void allocatePortBuffers(sp<IOmxNode> omxNode,
		android::Vector<BufferInfo>* buffArray,
		OMX_U32 portIndex,
		PortMode portMode = PortMode::PRESET_BYTE_BUFFER);
		PortMode portMode = PortMode::PRESET_BYTE_BUFFER,
		bool allocGrap = false);

		void changeStateLoadedtoIdle(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		android::Vector<BufferInfo>* iBuffer,
		android::Vector<BufferInfo>* oBuffer,
		OMX_U32 kPortIndexInput, OMX_U32 kPortIndexOutput,
		PortMode* portMode = nullptr);
		PortMode* portMode = nullptr,
		bool allocGrap = false);

		void changeStateIdletoLoaded(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		android::Vector<BufferInfo>* iBuffer,

media/omx/1.0/vts/functional/video/Android.bp

+0 −5

Original line number	Diff line number	Diff line
		@@ -21,10 +21,6 @@ cc_test {
		"VtsHalMediaOmxV1_0TargetVideoDecTest.cpp",
		"media_video_hidl_test_common.cpp"
		],
		static_libs: [
		"android.hardware.graphics.allocator@2.0",
		"android.hardware.graphics.mapper@2.0",
		],
		}

		cc_test {
		@@ -36,6 +32,5 @@ cc_test {
		],
		static_libs: [
		"libnativewindow",
		"android.hardware.graphics.mapper@2.0",
		],
		}

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoDecTest.cpp

+18 −119

Original line number	Diff line number	Diff line
		@@ -17,9 +17,6 @@
		#define LOG_TAG "media_omx_hidl_video_dec_test"
		#include <android-base/logging.h>

		#include <android/hardware/graphics/allocator/2.0/IAllocator.h>
		#include <android/hardware/graphics/mapper/2.0/IMapper.h>
		#include <android/hardware/graphics/mapper/2.0/types.h>
		#include <android/hardware/media/omx/1.0/IOmx.h>
		#include <android/hardware/media/omx/1.0/IOmxNode.h>
		#include <android/hardware/media/omx/1.0/IOmxObserver.h>
		@@ -27,10 +24,7 @@
		#include <android/hidl/allocator/1.0/IAllocator.h>
		#include <android/hidl/memory/1.0/IMapper.h>
		#include <android/hidl/memory/1.0/IMemory.h>
		#include <cutils/atomic.h>

		using ::android::hardware::graphics::common::V1_0::BufferUsage;
		using ::android::hardware::graphics::common::V1_0::PixelFormat;
		using ::android::hardware::media::omx::V1_0::IOmx;
		using ::android::hardware::media::omx::V1_0::IOmxObserver;
		using ::android::hardware::media::omx::V1_0::IOmxNode;
		@@ -433,82 +427,6 @@ void GetURLForComponent(VideoDecHidlTest::standardComp comp, char* mURL,
		}
		}

		void allocateGraphicBuffers(sp<IOmxNode> omxNode, OMX_U32 portIndex,
		android::Vector<BufferInfo>* buffArray,
		uint32_t nFrameWidth, uint32_t nFrameHeight,
		int32_t* nStride, int format, uint32_t count) {
		android::hardware::media::omx::V1_0::Status status;
		sp<android::hardware::graphics::allocator::V2_0::IAllocator> allocator =
		android::hardware::graphics::allocator::V2_0::IAllocator::getService();
		ASSERT_NE(nullptr, allocator.get());

		sp<android::hardware::graphics::mapper::V2_0::IMapper> mapper =
		android::hardware::graphics::mapper::V2_0::IMapper::getService();
		ASSERT_NE(mapper.get(), nullptr);

		android::hardware::graphics::mapper::V2_0::IMapper::BufferDescriptorInfo
		descriptorInfo;
		uint32_t usage;

		descriptorInfo.width = nFrameWidth;
		descriptorInfo.height = nFrameHeight;
		descriptorInfo.layerCount = 1;
		descriptorInfo.format = static_cast<PixelFormat>(format);
		descriptorInfo.usage = static_cast<uint64_t>(BufferUsage::CPU_READ_OFTEN);
		omxNode->getGraphicBufferUsage(
		portIndex,
		[&status, &usage](android::hardware::media::omx::V1_0::Status _s,
		uint32_t _n1) {
		status = _s;
		usage = _n1;
		});
		if (status == android::hardware::media::omx::V1_0::Status::OK) {
		descriptorInfo.usage \|= usage;
		}

		::android::hardware::hidl_vec<uint32_t> descriptor;
		android::hardware::graphics::mapper::V2_0::Error error;
		mapper->createDescriptor(
		descriptorInfo, [&error, &descriptor](
		android::hardware::graphics::mapper::V2_0::Error _s,
		::android::hardware::hidl_vec<uint32_t> _n1) {
		error = _s;
		descriptor = _n1;
		});
		EXPECT_EQ(error, android::hardware::graphics::mapper::V2_0::Error::NONE);

		EXPECT_EQ(buffArray->size(), count);

		static volatile int32_t nextId = 0;
		uint64_t id = static_cast<uint64_t>(getpid()) << 32;
		allocator->allocate(
		descriptor, count,
		[&](android::hardware::graphics::mapper::V2_0::Error _s, uint32_t _n1,
		const ::android::hardware::hidl_vec<
		::android::hardware::hidl_handle>& _n2) {
		ASSERT_EQ(android::hardware::graphics::mapper::V2_0::Error::NONE,
		_s);
		*nStride = _n1;
		ASSERT_EQ(count, _n2.size());
		for (uint32_t i = 0; i < count; i++) {
		buffArray->editItemAt(i).omxBuffer.nativeHandle = _n2[i];
		buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.width =
		nFrameWidth;
		buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.height =
		nFrameHeight;
		buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.stride = _n1;
		buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.format =
		descriptorInfo.format;
		buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.usage =
		descriptorInfo.usage;
		buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.layerCount =
		descriptorInfo.layerCount;
		buffArray->editItemAt(i).omxBuffer.attr.anwBuffer.id =
		id \| static_cast<uint32_t>(android_atomic_inc(&nextId));
		}
		});
		}

		// port settings reconfiguration during runtime. reconfigures frame dimensions
		void portReconfiguration(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		android::Vector<BufferInfo>* iBuffer,
		@@ -592,22 +510,7 @@ void portReconfiguration(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		android::hardware::media::omx::V1_0::Status::TIMED_OUT);

		allocatePortBuffers(omxNode, oBuffer, kPortIndexOutput,
		oPortMode);
		if (oPortMode != PortMode::PRESET_BYTE_BUFFER) {
		OMX_PARAM_PORTDEFINITIONTYPE portDef;

		status = getPortParam(omxNode, OMX_IndexParamPortDefinition,
		kPortIndexOutput, &portDef);
		ASSERT_EQ(
		status,
		::android::hardware::media::omx::V1_0::Status::OK);
		allocateGraphicBuffers(omxNode, kPortIndexOutput, oBuffer,
		portDef.format.video.nFrameWidth,
		portDef.format.video.nFrameHeight,
		&portDef.format.video.nStride,
		portDef.format.video.eColorFormat,
		portDef.nBufferCountActual);
		}
		oPortMode, true);
		status = observer->dequeueMessage(&msg, DEFAULT_TIMEOUT,
		iBuffer, oBuffer);
		ASSERT_EQ(status,
		@@ -1000,23 +903,10 @@ TEST_F(VideoDecHidlTest, DecodeTest) {

		// set state to idle
		changeStateLoadedtoIdle(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput, portMode);
		kPortIndexInput, kPortIndexOutput, portMode, true);
		// set state to executing
		changeStateIdletoExecute(omxNode, observer);

		if (portMode[1] != PortMode::PRESET_BYTE_BUFFER) {
		OMX_PARAM_PORTDEFINITIONTYPE portDef;

		status = getPortParam(omxNode, OMX_IndexParamPortDefinition,
		kPortIndexOutput, &portDef);
		ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		allocateGraphicBuffers(
		omxNode, kPortIndexOutput, &oBuffer,
		portDef.format.video.nFrameWidth, portDef.format.video.nFrameHeight,
		&portDef.format.video.nStride, portDef.format.video.eColorFormat,
		portDef.nBufferCountActual);
		}

		// Port Reconfiguration
		eleStream.open(mURL, std::ifstream::binary);
		ASSERT_EQ(eleStream.is_open(), true);
		@@ -1056,10 +946,16 @@ TEST_F(VideoDecHidlTest, AdaptivePlaybackTest) {
		}

		// set port mode
		portMode[0] = PortMode::PRESET_BYTE_BUFFER;
		portMode[1] = PortMode::DYNAMIC_ANW_BUFFER;
		status = omxNode->setPortMode(kPortIndexInput, portMode[0]);
		ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);
		if (status != ::android::hardware::media::omx::V1_0::Status::OK) {
		portMode[1] = PortMode::PRESET_BYTE_BUFFER;
		status = omxNode->setPortMode(kPortIndexOutput, portMode[1]);
		ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		}

		// prepare for adaptive playback
		uint32_t adaptiveMaxWidth = 320;
		@@ -1071,7 +967,10 @@ TEST_F(VideoDecHidlTest, AdaptivePlaybackTest) {
		// support for adaptive play back is mandatory in Byte Buffer mode
		ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		} else {
		return;
		// for vendor codecs, support for adaptive play back is optional
		// in byte buffer mode.
		if (portMode[1] == PortMode::PRESET_BYTE_BUFFER) return;
		if (status != ::android::hardware::media::omx::V1_0::Status::OK) return;
		}

		// TODO: Handle this better !!!
		@@ -1101,7 +1000,7 @@ TEST_F(VideoDecHidlTest, AdaptivePlaybackTest) {

		// set state to idle
		changeStateLoadedtoIdle(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput, portMode);
		kPortIndexInput, kPortIndexOutput, portMode, true);
		// set state to executing
		changeStateIdletoExecute(omxNode, observer);

		@@ -1211,7 +1110,7 @@ TEST_F(VideoDecHidlTest, EOSTest_M) {

		// set state to idle
		changeStateLoadedtoIdle(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput, portMode);
		kPortIndexInput, kPortIndexOutput, portMode, true);
		// set state to executing
		changeStateIdletoExecute(omxNode, observer);

		@@ -1299,7 +1198,7 @@ TEST_F(VideoDecHidlTest, ThumbnailTest) {

		// set state to idle
		changeStateLoadedtoIdle(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput, portMode);
		kPortIndexInput, kPortIndexOutput, portMode, true);
		// set state to executing
		changeStateIdletoExecute(omxNode, observer);

		@@ -1412,7 +1311,7 @@ TEST_F(VideoDecHidlTest, SimpleEOSTest) {

		// set state to idle
		changeStateLoadedtoIdle(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput, portMode);
		kPortIndexInput, kPortIndexOutput, portMode, true);
		// set state to executing
		changeStateIdletoExecute(omxNode, observer);

		@@ -1507,7 +1406,7 @@ TEST_F(VideoDecHidlTest, FlushTest) {

		// set state to idle
		changeStateLoadedtoIdle(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput, portMode);
		kPortIndexInput, kPortIndexOutput, portMode, true);
		// set state to executing
		changeStateIdletoExecute(omxNode, observer);