Merge "bug fix: fix encoder input port configuration issues" into oc-dev (db3214fb) · Commits · e / os / android_hardware_interfaces

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

+1 −2

Original line number	Diff line number	Diff line
		@@ -249,8 +249,7 @@ class VideoEncHidlTest : public ::testing::VtsHalHidlTargetTestBase {
		if (msg.data.extendedBufferData.rangeLength != 0) {
		// Test if current timestamp is among the list of queued
		// timestamps
		if (timestampDevTest && (prependSPSPPS \|\|
		(msg.data.extendedBufferData.flags &
		if (timestampDevTest && ((msg.data.extendedBufferData.flags &
		OMX_BUFFERFLAG_CODECCONFIG) == 0)) {
		bool tsHit = false;
		android::List<uint64_t>::iterator it =

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

+19 −9

Original line number	Diff line number	Diff line
		@@ -172,7 +172,7 @@ void setupAVCPort(sp<IOmxNode> omxNode, OMX_U32 portIndex,
		status = getPortParam(omxNode, OMX_IndexParamVideoAvc, portIndex, &param);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		param.nSliceHeaderSpacing = 0;
		param.nPFrames = 0xFFFFFFFE;
		param.nPFrames = 300;
		param.nBFrames = 0;
		param.bUseHadamard = OMX_TRUE;
		param.nRefFrames = 1;
		@@ -197,9 +197,13 @@ void setupHEVCPort(sp<IOmxNode> omxNode, OMX_U32 portIndex,
		status = getPortParam(omxNode, (OMX_INDEXTYPE)OMX_IndexParamVideoHevc,
		portIndex, &param);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		param.eProfile = eProfile;
		param.eLevel = eLevel;
		param.nKeyFrameInterval = 0xFFFFFFFE;
		(void)eProfile;
		(void)eLevel;
		// SPECIAL CASE; OMX.qcom.video.encoder.hevc does not support the level it
		// enumerated in the list. Lets skip this for now
		// param.eProfile = eProfile;
		// param.eLevel = eLevel;
		param.nKeyFrameInterval = 300;
		status = setPortParam(omxNode, (OMX_INDEXTYPE)OMX_IndexParamVideoHevc,
		portIndex, &param);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		@@ -218,7 +222,7 @@ void setupMPEG4Port(sp<IOmxNode> omxNode, OMX_U32 portIndex,
		param.nSliceHeaderSpacing = 0;
		param.bSVH = OMX_FALSE;
		param.bGov = OMX_FALSE;
		param.nPFrames = 0xFFFFFFFE;
		param.nPFrames = 300;
		param.nBFrames = 0;
		param.nIDCVLCThreshold = 0;
		param.bACPred = OMX_TRUE;
		@@ -243,7 +247,7 @@ void setupH263Port(sp<IOmxNode> omxNode, OMX_U32 portIndex,
		status = getPortParam(omxNode, OMX_IndexParamVideoH263, portIndex, &param);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);

		param.nPFrames = 0xFFFFFFFE;
		param.nPFrames = 300;
		param.nBFrames = 0;
		param.eProfile = eProfile;
		param.eLevel = eLevel;
		@@ -265,16 +269,22 @@ void setupVPXPort(sp<IOmxNode> omxNode, OMX_U32 portIndex, OMX_U32 xFramerate) {
		status = getPortParam(omxNode,
		(OMX_INDEXTYPE)OMX_IndexParamVideoAndroidVp8Encoder,
		portIndex, &param);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		// EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		// SPECIAL CASE; OMX.qcom.video.encoder.vp8 does not support this index
		// type. Dont flag error for now
		if (status != ::android::hardware::media::omx::V1_0::Status::OK) return;

		param.nKeyFrameInterval = 0xFFFFFFFE;
		param.nKeyFrameInterval = 300;
		param.eTemporalPattern = OMX_VIDEO_VPXTemporalLayerPatternNone;
		param.nMinQuantizer = 2;
		param.nMaxQuantizer = 63;
		status = setPortParam(omxNode,
		(OMX_INDEXTYPE)OMX_IndexParamVideoAndroidVp8Encoder,
		portIndex, &param);
		EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		// EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
		// SPECIAL CASE; OMX.qcom.video.encoder.vp8 does not support this index
		// type. Dont flag error for now
		if (status != ::android::hardware::media::omx::V1_0::Status::OK) return;
		}

		void setupVP8Port(sp<IOmxNode> omxNode, OMX_U32 portIndex,