Merge "Revert "Loop all decode tests for all port modes supported"" (8b77593b) · Commits · e / os / android_hardware_interfaces

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -813,7 +813,7 @@ TEST_F(AudioDecHidlTest, DecodeTest) {
		if (timestampDevTest) EXPECT_EQ(timestampUslist.empty(), true);
		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);
		}
		@@ -872,7 +872,7 @@ TEST_F(AudioDecHidlTest, EOSTest_M) {

		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);
		}
		@@ -979,7 +979,7 @@ TEST_F(AudioDecHidlTest, ThumbnailTest) {

		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);
		}
		@@ -1065,7 +1065,7 @@ TEST_F(AudioDecHidlTest, SimpleEOSTest) {

		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);
		}
		@@ -1169,7 +1169,7 @@ TEST_F(AudioDecHidlTest, FlushTest) {

		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ TEST_F(AudioEncHidlTest, SimpleEncodeTest) {

		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);
		}

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

+428 −536

File changed.

Preview size limit exceeded, changes collapsed.

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -1161,7 +1161,7 @@ TEST_F(VideoEncHidlTest, BufferSourceCallBacks) {
		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &buffersource->iBuffer,
		&buffersource->oBuffer);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &buffersource->iBuffer,
		&buffersource->oBuffer, kPortIndexInput,
		kPortIndexOutput);
		@@ -1273,7 +1273,7 @@ TEST_F(VideoEncHidlTest, EncodeTest) {

		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);
		}
		@@ -1432,7 +1432,7 @@ TEST_F(VideoEncHidlTest, EncodeTestBufferMetaModes) {
		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		EXPECT_EQ(portDef.nBufferCountActual, listener->freeBuffers);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);

		@@ -1543,7 +1543,7 @@ TEST_F(VideoEncHidlTest, EncodeTestEOS) {
		// set state to idle
		changeStateExecutetoIdle(omxNode, observer, &iBuffer, &oBuffer);
		EXPECT_EQ(portDef.nBufferCountActual, listener->freeBuffers);
		// set state to loaded
		// set state to executing
		changeStateIdletoLoaded(omxNode, observer, &iBuffer, &oBuffer,
		kPortIndexInput, kPortIndexOutput);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ void setupRAWPort(sp<IOmxNode> omxNode, OMX_U32 portIndex, OMX_U32 nFrameWidth,
		portDef.format.video.nFrameWidth = nFrameWidth;
		portDef.format.video.nFrameHeight = nFrameHeight;
		portDef.format.video.nStride = (((nFrameWidth + 15) >> 4) << 4);
		portDef.format.video.nSliceHeight = nFrameHeight;
		portDef.format.video.nSliceHeight = (((nFrameHeight + 15) >> 4) << 4);
		portDef.format.video.nBitrate = nBitrate;
		portDef.format.video.xFramerate = xFramerate;
		portDef.format.video.bFlagErrorConcealment = OMX_TRUE;