Showing the changes to test/api/encode_options_test.cpp (1 of 3 files). Show all
Unified · Split
| @@ -1447,15 +1447,19 @@ TEST_F (EncodeDecodeTestAPI, DiffSlicingInDlayerMixed) { · 1446 unmodified lines | |||
| 1447 | sParam.bSimulcastAVC = 1; | 1447 | sParam.bSimulcastAVC = 1; |
| 1448 | sParam.sSpatialLayers[0].iVideoWidth = (iWidth >> 2); | 1448 | sParam.sSpatialLayers[0].iVideoWidth = (iWidth >> 2); |
| 1449 | sParam.sSpatialLayers[0].iVideoHeight = (iHeight >> 2); | 1449 | sParam.sSpatialLayers[0].iVideoHeight = (iHeight >> 2); |
| 1450 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_SIZELIMITED_SLICE; | 1450 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceMode = (rand() % 2) ? SM_SIZELIMITED_SLICE : SM_FIXEDSLCNUM_SLICE; |
| 1451 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = 1500; | 1451 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = 1500; |
| 1452 | 1452 | ||
| 1453 | sParam.sSpatialLayers[1].iVideoWidth = iWidth; | 1453 | sParam.sSpatialLayers[1].iVideoWidth = iWidth; |
| 1454 | sParam.sSpatialLayers[1].iVideoHeight = iHeight; | 1454 | sParam.sSpatialLayers[1].iVideoHeight = iHeight; |
| 1455 | sParam.sSpatialLayers[1].sSliceArgument.uiSliceMode = SM_FIXEDSLCNUM_SLICE; | 1455 | sParam.sSpatialLayers[1].sSliceArgument.uiSliceMode = (rand() % 2) ? SM_SIZELIMITED_SLICE : SM_FIXEDSLCNUM_SLICE; |
| 1456 | sParam.sSpatialLayers[1].sSliceArgument.uiSliceNum = 1; | 1456 | sParam.sSpatialLayers[1].sSliceArgument.uiSliceNum = 1; |
| 1457 | sParam.sSpatialLayers[1].sSliceArgument.uiSliceSizeConstraint = 1500; | ||
| 1457 | 1458 | ||
| 1458 | int rv = encoder_->InitializeExt (&sParam); | 1459 | int iTraceLevel = WELS_LOG_QUIET; |
| 1460 | int rv = encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel); | ||
| 1461 | |||
| 1462 | rv = encoder_->InitializeExt (&sParam); | ||
| 1459 | ASSERT_TRUE (rv == cmResultSuccess) << "Init Failed sParam: rv = " << rv;; | 1463 | ASSERT_TRUE (rv == cmResultSuccess) << "Init Failed sParam: rv = " << rv;; |
| 1460 | 1464 | ||
| 1461 | unsigned char* pBsBuf[MAX_SPATIAL_LAYER_NUM]; | 1465 | unsigned char* pBsBuf[MAX_SPATIAL_LAYER_NUM]; |
| @@ -1568,14 +1572,18 @@ TEST_F (EncodeDecodeTestAPI, TriggerLoadBalancing) { · 106 unmodified lines | |||
| 1568 | SEncParamExt sParam; | 1572 | SEncParamExt sParam; |
| 1569 | encoder_->GetDefaultParams (&sParam); | 1573 | encoder_->GetDefaultParams (&sParam); |
| 1570 | prepareParamDefault (iSpatialLayerNum, 1, iWidth, iHeight, fFrameRate, &sParam); | 1574 | prepareParamDefault (iSpatialLayerNum, 1, iWidth, iHeight, fFrameRate, &sParam); |
| 1571 | sParam.iMultipleThreadIdc = (rand() % 8) + 1; | 1575 | sParam.iMultipleThreadIdc = 4; |
| 1572 | sParam.bSimulcastAVC = 1; | 1576 | sParam.bSimulcastAVC = 1; |
| 1573 | sParam.sSpatialLayers[0].iVideoWidth = iWidth; | 1577 | sParam.sSpatialLayers[0].iVideoWidth = iWidth; |
| 1574 | sParam.sSpatialLayers[0].iVideoHeight = iHeight; | 1578 | sParam.sSpatialLayers[0].iVideoHeight = iHeight; |
| 1575 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_FIXEDSLCNUM_SLICE; | 1579 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceMode = SM_FIXEDSLCNUM_SLICE; |
| 1580 | //TODO: use this after the buffer problem is fixed. sParam.sSpatialLayers[0].sSliceArgument.uiSliceMode = (rand()%2) ? SM_FIXEDSLCNUM_SLICE : SM_SIZELIMITED_SLICE; | ||
| 1576 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceNum = sParam.iMultipleThreadIdc; | 1581 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceNum = sParam.iMultipleThreadIdc; |
| 1582 | sParam.sSpatialLayers[0].sSliceArgument.uiSliceSizeConstraint = 1000; | ||
| 1577 | 1583 | ||
| 1578 | int rv = encoder_->InitializeExt (&sParam); | 1584 | int iTraceLevel = WELS_LOG_QUIET; |
| 1585 | int rv = encoder_->SetOption (ENCODER_OPTION_TRACE_LEVEL, &iTraceLevel); | ||
| 1586 | rv = encoder_->InitializeExt (&sParam); | ||
| 1579 | ASSERT_TRUE (rv == cmResultSuccess) << "Init Failed sParam: rv = " << rv;; | 1587 | ASSERT_TRUE (rv == cmResultSuccess) << "Init Failed sParam: rv = " << rv;; |
| 1580 | 1588 | ||
| 1581 | unsigned char* pBsBuf[MAX_SPATIAL_LAYER_NUM]; | 1589 | unsigned char* pBsBuf[MAX_SPATIAL_LAYER_NUM]; |