Add tasks and thread pool call for SM_SIZELIMITED_SLICE mode

sijchen committed 10 years ago

Commit 76ca5641 parent 76b428a7 files · +165 −21Browse files

Showing the changes to test/api/encode_options_test.cpp (1 of 7 files). Show all

Unified · Split

test/api/encode_options_test.cpp+3−2

@@ -1443,11 +1443,12 @@ TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayerMixed) { · 1442 unmodified lines
1443	1443	SEncParamExt sParam;
1444	1444	encoder_->GetDefaultParams (&sParam);
1445	1445	prepareParamDefault (iSpatialLayerNum, 1, iWidth, iHeight, fFrameRate, &sParam);
1446		− sParam.iMultipleThreadIdc = (rand() % 4) + 1;
	1446	+ sParam.iMultipleThreadIdc = (rand() % 2) ? 4 : ((rand() % 4) + 1);
1447	1447	sParam.bSimulcastAVC = 1;
1448	1448	sParam.sSpatialLayers[0].iVideoWidth = (iWidth >> 2);
1449	1449	sParam.sSpatialLayers[0].iVideoHeight = (iHeight >> 2);
1450		− sParam.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_RASTER_SLICE;
	1450	+ sParam.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_SIZELIMITED_SLICE;
	1451	+ sParam.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = 1500;
1451	1452
1452	1453	sParam.sSpatialLayers[1].iVideoWidth = iWidth;
1453	1454	sParam.sSpatialLayers[1].iVideoHeight = iHeight;