From 0c820f4c06d83c99b5ec99a96df48e8f42f1f826 Mon Sep 17 00:00:00 2001 From: sijchen Date: Mon, 30 Nov 2015 11:55:07 -0800 Subject: [PATCH] adjust encoder test case to cover multi-thread without loadbalancing --- test/api/BaseEncoderTest.cpp | 2 ++ test/api/encoder_test.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/api/BaseEncoderTest.cpp b/test/api/BaseEncoderTest.cpp index 5638629e..df3b4c51 100644 --- a/test/api/BaseEncoderTest.cpp +++ b/test/api/BaseEncoderTest.cpp @@ -49,6 +49,8 @@ static int InitWithParam (ISVCEncoder* encoder, SEncParamExt* pEncParamExt) { if (eSliceMode == SM_SIZELIMITED_SLICE) { param.sSpatialLayers[i].sSliceArgument.uiSliceSizeConstraint = 600; param.uiMaxNalSize = 1500; + param.iMultipleThreadIdc = 4; + param.bUseLoadBalancing = false; } if (eSliceMode == SM_FIXEDSLCNUM_SLICE) { param.sSpatialLayers[i].sSliceArgument.uiSliceNum = 4; diff --git a/test/api/encoder_test.cpp b/test/api/encoder_test.cpp index c0799106..aa53d222 100644 --- a/test/api/encoder_test.cpp +++ b/test/api/encoder_test.cpp @@ -127,7 +127,7 @@ static const EncodeFileParam kFileParamArray[] = { }, { "res/Cisco_Absolute_Power_1280x720_30fps.yuv", - "a747529a097f581b66f779860c2c491d8cac32fe", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false + "84f97cff898055aaf96a303960abb76e12bf24c1", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false }, { "res/Cisco_Absolute_Power_1280x720_30fps.yuv", @@ -148,12 +148,12 @@ static const EncodeFileParam kFileParamArray[] = { }, { "res/Cisco_Absolute_Power_1280x720_30fps.yuv", - "aa0aaca96475c65d66e90e513618fa814b098dff", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false + "8027935ed347671cb2a181d09cd4380ce2c0da79", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, false }, //for different strategy { "res/Cisco_Absolute_Power_1280x720_30fps.yuv", - "5622722316eed2482bf78520eda7e448312e340e", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false + "0e1af98bd978e602cc15329ba70a2c4c2afe8016", SCREEN_CONTENT_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, true, true, false }, { "res/CiscoVT2people_320x192_12fps.yuv", @@ -161,7 +161,7 @@ static const EncodeFileParam kFileParamArray[] = { }, { "res/Cisco_Absolute_Power_1280x720_30fps.yuv", - "6c13d959d981d412343664b4830dd4042bc4ddf9", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true + "c87ff55413efb14d95acd1de3be02bd601fcc3df", CAMERA_VIDEO_REAL_TIME, 1280, 720, 30.0f, SM_SIZELIMITED_SLICE, false, 1, false, false, true }, { "res/Cisco_Absolute_Power_1280x720_30fps.yuv",