tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "bug fix: fix encoder input port configuration issues" into oc-dev

Browse source 
am: 7d1592a732

Change-Id: I697e916574fc20e1bb9cad79d1e948854078f6bf
This commit is contained in:
Ram Mohan M 2017-06-10 01:28:44 +00:00 committed by android-build-merger
commit 0eb102a18b
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp
View file

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

28
media/omx/1.0/vts/functional/video/media_video_hidl_test_common.cpp
View file

@ -172,7 +172,7 @@ void setupAVCPort(sp<IOmxNode> omxNode, OMX_U32 portIndex,
status = getPortParam(omxNode, OMX_IndexParamVideoAvc, portIndex, &param); status = getPortParam(omxNode, OMX_IndexParamVideoAvc, portIndex, &param);
EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
param.nSliceHeaderSpacing = 0; param.nSliceHeaderSpacing = 0;
param.nPFrames = 0xFFFFFFFE; param.nPFrames = 300;
param.nBFrames = 0; param.nBFrames = 0;
param.bUseHadamard = OMX_TRUE; param.bUseHadamard = OMX_TRUE;
param.nRefFrames = 1; param.nRefFrames = 1;
@ -197,9 +197,13 @@ void setupHEVCPort(sp<IOmxNode> omxNode, OMX_U32 portIndex,
status = getPortParam(omxNode, (OMX_INDEXTYPE)OMX_IndexParamVideoHevc, status = getPortParam(omxNode, (OMX_INDEXTYPE)OMX_IndexParamVideoHevc,
portIndex, &param); portIndex, &param);
EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
param.eProfile = eProfile; (void)eProfile;
param.eLevel = eLevel; (void)eLevel;
param.nKeyFrameInterval = 0xFFFFFFFE; // 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, status = setPortParam(omxNode, (OMX_INDEXTYPE)OMX_IndexParamVideoHevc,
portIndex, &param); portIndex, &param);
EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); 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.nSliceHeaderSpacing = 0;
param.bSVH = OMX_FALSE; param.bSVH = OMX_FALSE;
param.bGov = OMX_FALSE; param.bGov = OMX_FALSE;
param.nPFrames = 0xFFFFFFFE; param.nPFrames = 300;
param.nBFrames = 0; param.nBFrames = 0;
param.nIDCVLCThreshold = 0; param.nIDCVLCThreshold = 0;
param.bACPred = OMX_TRUE; param.bACPred = OMX_TRUE;
@ -243,7 +247,7 @@ void setupH263Port(sp<IOmxNode> omxNode, OMX_U32 portIndex,
status = getPortParam(omxNode, OMX_IndexParamVideoH263, portIndex, &param); status = getPortParam(omxNode, OMX_IndexParamVideoH263, portIndex, &param);
EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK); EXPECT_EQ(status, ::android::hardware::media::omx::V1_0::Status::OK);
param.nPFrames = 0xFFFFFFFE; param.nPFrames = 300;
param.nBFrames = 0; param.nBFrames = 0;
param.eProfile = eProfile; param.eProfile = eProfile;
param.eLevel = eLevel; param.eLevel = eLevel;
@ -265,16 +269,22 @@ void setupVPXPort(sp<IOmxNode> omxNode, OMX_U32 portIndex, OMX_U32 xFramerate) {
status = getPortParam(omxNode, status = getPortParam(omxNode,
(OMX_INDEXTYPE)OMX_IndexParamVideoAndroidVp8Encoder, (OMX_INDEXTYPE)OMX_IndexParamVideoAndroidVp8Encoder,
portIndex, &param); 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.eTemporalPattern = OMX_VIDEO_VPXTemporalLayerPatternNone;
param.nMinQuantizer = 2; param.nMinQuantizer = 2;
param.nMaxQuantizer = 63; param.nMaxQuantizer = 63;
status = setPortParam(omxNode, status = setPortParam(omxNode,
(OMX_INDEXTYPE)OMX_IndexParamVideoAndroidVp8Encoder, (OMX_INDEXTYPE)OMX_IndexParamVideoAndroidVp8Encoder,
portIndex, &param); 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, void setupVP8Port(sp<IOmxNode> omxNode, OMX_U32 portIndex,