release-request-bbc747ae-190b-4d38-8704-432aa6396c16-for-git_oc-mr1-release-43... (a16eb0a5) · Commits · e / os / android_hardware_interfaces

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

+30 −37

Original line number	Diff line number	Diff line
		@@ -171,7 +171,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		{"mp3", mp3}, {"amrnb", amrnb}, {"amrwb", amrwb},
		{"aac", aac}, {"vorbis", vorbis}, {"opus", opus},
		{"pcm", pcm}, {"g711alaw", g711alaw}, {"g711mlaw", g711mlaw},
		{"gsm", gsm}, {"raw", raw},
		{"gsm", gsm}, {"raw", raw}, {"flac", flac},
		};
		const size_t kNumStringToName =
		sizeof(kStringToName) / sizeof(kStringToName[0]);
		@@ -204,6 +204,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		{g711mlaw, OMX_AUDIO_CodingG711},
		{gsm, OMX_AUDIO_CodingGSMFR},
		{raw, OMX_AUDIO_CodingPCM},
		{flac, OMX_AUDIO_CodingFLAC},
		};
		static const size_t kNumCompToCoding =
		sizeof(kCompToCoding) / sizeof(kCompToCoding[0]);
		@@ -219,7 +220,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		framesReceived = 0;
		timestampUs = 0;
		timestampDevTest = false;
		if (disableTest) std::cerr << "[ ] Warning ! Test Disabled\n";
		if (disableTest) std::cout << "[ WARN ] Test Disabled \n";
		}

		virtual void TearDown() override {
		@@ -263,8 +264,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		EXPECT_EQ(tsHit, true)
		<< "TimeStamp not recognized";
		} else {
		std::cerr
		<< "[ ] Warning ! Received non-zero "
		std::cout << "[ INFO ] Received non-zero "
		"output / TimeStamp not recognized \n";
		}
		}
		@@ -301,6 +301,7 @@ class AudioDecHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		g711mlaw,
		gsm,
		raw,
		flac,
		unknown_comp,
		};

		@@ -431,6 +432,16 @@ void getInputChannelInfo(sp<IOmxNode> omxNode, OMX_U32 kPortIndexInput,
		*nSampleRate = param.nSampleRate;
		break;
		}
		case OMX_AUDIO_CodingFLAC: {
		OMX_AUDIO_PARAM_FLACTYPE param;
		status = getPortParam(omxNode, OMX_IndexParamAudioFlac,
		kPortIndexInput, &param);
		ASSERT_EQ(status,
		::android::hardware::media::omx::V1_0::Status::OK);
		*nChannels = param.nChannels;
		*nSampleRate = param.nSampleRate;
		break;
		}
		default:
		ASSERT_TRUE(false);
		break;
		@@ -472,6 +483,9 @@ void GetURLForComponent(AudioDecHidlTest::standardComp comp, char* mURL,
		"bbb_gsm_1ch_8khz_13kbps.info"},
		{AudioDecHidlTest::standardComp::raw, "bbb_raw_1ch_8khz_s32le.raw",
		"bbb_raw_1ch_8khz_s32le.info"},
		{AudioDecHidlTest::standardComp::flac,
		"bbb_flac_stereo_680kbps_48000hz.flac",
		"bbb_flac_stereo_680kbps_48000hz.info"},
		};

		for (size_t i = 0; i < sizeof(kCompToURL) / sizeof(kCompToURL[0]); ++i) {
		@@ -628,39 +642,16 @@ void decodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		AudioDecHidlTest::standardComp comp, bool signalEOS = true) {
		android::hardware::media::omx::V1_0::Status status;
		Message msg;

		// dispatch output buffers
		for (size_t i = 0; i < oBuffer->size(); i++) {
		dispatchOutputBuffer(omxNode, oBuffer, i);
		}
		// dispatch input buffers
		size_t index;
		uint32_t flags = 0;
		int frameID = offset;
		for (size_t i = 0; (i < iBuffer->size()) && (frameID < (int)Info->size()) &&
		(frameID < (offset + range));
		i++) {
		char* ipBuffer = static_cast<char*>(
		static_cast<void>((iBuffer)[i].mMemory->getPointer()));
		ASSERT_LE((*Info)[frameID].bytesCount,
		static_cast<int>((*iBuffer)[i].mMemory->getSize()));
		eleStream.read(ipBuffer, (*Info)[frameID].bytesCount);
		ASSERT_EQ(eleStream.gcount(), (*Info)[frameID].bytesCount);
		flags = (*Info)[frameID].flags;
		if (signalEOS && ((frameID == (int)Info->size() - 1) \|\|
		(frameID == (offset + range - 1))))
		flags \|= OMX_BUFFERFLAG_EOS;
		dispatchInputBuffer(omxNode, iBuffer, i, (*Info)[frameID].bytesCount,
		flags, (*Info)[frameID].timestamp);
		frameID++;
		}

		int timeOut = TIMEOUT_COUNTER_Q;
		bool iQueued, oQueued;

		while (1) {
		iQueued = oQueued = false;
		status =
		observer->dequeueMessage(&msg, DEFAULT_TIMEOUT_Q, iBuffer, oBuffer);

		// Port Reconfiguration
		if (status == android::hardware::media::omx::V1_0::Status::OK &&
		msg.type == Message::Type::EVENT) {
		@@ -673,7 +664,6 @@ void decodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		if (frameID == (int)Info->size() \|\| frameID == (offset + range)) break;

		// Dispatch input buffer
		size_t index = 0;
		if ((index = getEmptyBufferID(iBuffer)) < iBuffer->size()) {
		char* ipBuffer = static_cast<char*>(
		static_cast<void>((iBuffer)[index].mMemory->getPointer()));
		@@ -682,6 +672,11 @@ void decodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		eleStream.read(ipBuffer, (*Info)[frameID].bytesCount);
		ASSERT_EQ(eleStream.gcount(), (*Info)[frameID].bytesCount);
		flags = (*Info)[frameID].flags;
		// Indicate to omx core that the buffer contains a full frame worth
		// of data
		flags \|= OMX_BUFFERFLAG_ENDOFFRAME;
		// Indicate the omx core that this is the last buffer it needs to
		// process
		if (signalEOS && ((frameID == (int)Info->size() - 1) \|\|
		(frameID == (offset + range - 1))))
		flags \|= OMX_BUFFERFLAG_EOS;
		@@ -691,10 +686,12 @@ void decodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		frameID++;
		iQueued = true;
		}
		// Dispatch output buffer
		if ((index = getEmptyBufferID(oBuffer)) < oBuffer->size()) {
		dispatchOutputBuffer(omxNode, oBuffer, index);
		oQueued = true;
		}
		// Reset Counters when either input or output buffer is dispatched
		if (iQueued \|\| oQueued)
		timeOut = TIMEOUT_COUNTER_Q;
		else
		@@ -716,7 +713,7 @@ TEST_F(AudioDecHidlTest, SetRole) {
		}

		// port format enumeration
		TEST_F(AudioDecHidlTest, DISABLED_EnumeratePortFormat) {
		TEST_F(AudioDecHidlTest, EnumeratePortFormat) {
		description("Test Component on Mandatory Port Parameters (Port Format)");
		if (disableTest) return;
		android::hardware::media::omx::V1_0::Status status;
		@@ -822,11 +819,7 @@ TEST_F(AudioDecHidlTest, DecodeTest) {
		}

		// end of sequence test
		// SPECIAL CASE; Sending Empty input EOS buffer is not supported across all
		// components. For instance soft vorbis and soft opus expects CSD buffers at
		// the start. Disabling this test for now. We shall revisit this at a later
		// stage
		TEST_F(AudioDecHidlTest, DISABLED_EOSTest_M) {
		TEST_F(AudioDecHidlTest, EOSTest_M) {
		description("Test end of stream monkeying");
		if (disableTest) return;
		android::hardware::media::omx::V1_0::Status status;

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

+7 −24

Original line number	Diff line number	Diff line
		@@ -206,7 +206,7 @@ class AudioEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		}
		if (i == kNumCompToCoding) disableTest = true;
		eosFlag = false;
		if (disableTest) std::cerr << "[ ] Warning ! Test Disabled\n";
		if (disableTest) std::cout << "[ WARN ] Test Disabled \n";
		}

		virtual void TearDown() override {
		@@ -376,44 +376,25 @@ void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		bool signalEOS = true) {
		android::hardware::media::omx::V1_0::Status status;
		Message msg;

		// dispatch output buffers
		for (size_t i = 0; i < oBuffer->size(); i++) {
		dispatchOutputBuffer(omxNode, oBuffer, i);
		}
		// dispatch input buffers
		size_t index;
		int bytesCount = samplesPerFrame * nChannels * 2;
		int32_t timestampIncr =
		(int)(((float)samplesPerFrame / nSampleRate) * 1000000);
		uint64_t timestamp = 0;
		uint32_t flags = 0;
		for (size_t i = 0; i < iBuffer->size() && nFrames != 0; i++) {
		char* ipBuffer = static_cast<char*>(
		static_cast<void>((iBuffer)[i].mMemory->getPointer()));
		ASSERT_LE(bytesCount,
		static_cast<int>((*iBuffer)[i].mMemory->getSize()));
		eleStream.read(ipBuffer, bytesCount);
		if (eleStream.gcount() != bytesCount) break;
		if (signalEOS && (nFrames == 1)) flags = OMX_BUFFERFLAG_EOS;
		dispatchInputBuffer(omxNode, iBuffer, i, bytesCount, flags, timestamp);
		timestamp += timestampIncr;
		nFrames--;
		}

		int timeOut = TIMEOUT_COUNTER_Q;
		bool iQueued, oQueued;

		while (1) {
		iQueued = oQueued = false;
		status =
		observer->dequeueMessage(&msg, DEFAULT_TIMEOUT_Q, iBuffer, oBuffer);

		if (status == android::hardware::media::omx::V1_0::Status::OK)
		ASSERT_TRUE(false);

		if (nFrames == 0) break;

		// Dispatch input buffer
		size_t index = 0;
		if ((index = getEmptyBufferID(iBuffer)) < iBuffer->size()) {
		char* ipBuffer = static_cast<char*>(
		static_cast<void>((iBuffer)[index].mMemory->getPointer()));
		@@ -421,7 +402,8 @@ void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		static_cast<int>((*iBuffer)[index].mMemory->getSize()));
		eleStream.read(ipBuffer, bytesCount);
		if (eleStream.gcount() != bytesCount) break;
		if (signalEOS && (nFrames == 1)) flags = OMX_BUFFERFLAG_EOS;
		flags = OMX_BUFFERFLAG_ENDOFFRAME;
		if (signalEOS && (nFrames == 1)) flags \|= OMX_BUFFERFLAG_EOS;
		dispatchInputBuffer(omxNode, iBuffer, index, bytesCount, flags,
		timestamp);
		timestamp += timestampIncr;
		@@ -433,6 +415,7 @@ void encodeNFrames(sp<IOmxNode> omxNode, sp<CodecObserver> observer,
		dispatchOutputBuffer(omxNode, oBuffer, index);
		oQueued = true;
		}
		// Reset Counters when either input or output buffer is dispatched
		if (iQueued \|\| oQueued)
		timeOut = TIMEOUT_COUNTER_Q;
		else
		@@ -454,7 +437,7 @@ TEST_F(AudioEncHidlTest, SetRole) {
		}

		// port format enumeration
		TEST_F(AudioEncHidlTest, DISABLED_EnumeratePortFormat) {
		TEST_F(AudioEncHidlTest, EnumeratePortFormat) {
		description("Test Component on Mandatory Port Parameters (Port Format)");
		if (disableTest) return;
		android::hardware::media::omx::V1_0::Status status;

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

+104 −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) {
		@@ -243,13 +316,32 @@ void allocateBuffer(sp<IOmxNode> omxNode, BufferInfo* buffer, OMX_U32 portIndex,
		buffer->id = id;
		});
		ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		} else if (portMode == PortMode::PRESET_ANW_BUFFER) {
		OMX_PARAM_PORTDEFINITIONTYPE portDef;
		status = getPortParam(omxNode, OMX_IndexParamPortDefinition, portIndex,
		&portDef);
		int32_t nStride;
		buffer->owner = client;
		buffer->omxBuffer.type = CodecBuffer::Type::ANW_BUFFER;
		allocateGraphicBuffers(omxNode, portIndex, buffer,
		portDef.format.video.nFrameWidth,
		portDef.format.video.nFrameHeight, &nStride,
		portDef.format.video.eColorFormat);
		omxNode->useBuffer(
		portIndex, buffer->omxBuffer,
		[&status, &buffer](android::hardware::media::omx::V1_0::Status _s,
		uint32_t id) {
		status = _s;
		buffer->id = id;
		});
		ASSERT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		}
		}

		// 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 +355,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 +373,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 +392,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);
		@@ -440,6 +539,7 @@ void dispatchOutputBuffer(sp<IOmxNode> omxNode,
		status =
		omxNode->fillBuffer((*buffArray)[bufferIndex].id, t, fenceNh);
		break;
		case PortMode::PRESET_ANW_BUFFER:
		case PortMode::PRESET_SECURE_BUFFER:
		case PortMode::PRESET_BYTE_BUFFER:
		t.sharedMemory = android::hardware::hidl_memory();

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -133,6 +133,7 @@ struct CodecObserver : public IOmxObserver {
		if (it->type ==
		android::hardware::media::omx::V1_0::Message::Type::EVENT) {
		msg = it;
		if (callBack) callBack(*it, nullptr);
		it = msgQueue.erase(it);
		// OMX_EventBufferFlag event is sent when the component has
		// processed a buffer with its EOS flag set. This event is
		@@ -302,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,