Showing the changes to test/api/BaseEncoderTest.cpp (1 of 26 files). Show all
Unified · Split
| @@ -7,7 +7,7 @@ · 6 unmodified lines | ||
| 7 | 7 | |
| 8 | 8 | static int InitWithParam (ISVCEncoder* encoder, SEncParamExt* pEncParamExt) { |
| 9 | 9 | |
| 10 | − SliceModeEnum eSliceMode = pEncParamExt->sSpatialLayers[0].sSliceCfg.uiSliceMode; | |
| 10 | + SliceModeEnum eSliceMode = pEncParamExt->sSpatialLayers[0].sSliceArgument.uiSliceMode; | |
| 11 | 11 | bool bBaseParamFlag = (SM_SINGLE_SLICE == eSliceMode && !pEncParamExt->bEnableDenoise |
| 12 | 12 | && pEncParamExt->iSpatialLayerNum == 1 && !pEncParamExt->bIsLosslessLink |
| 13 | 13 | && !pEncParamExt->bEnableLongTermReference && !pEncParamExt->iEntropyCodingModeFlag) ? true : false; |
| @@ -36,7 +36,7 @@ static int InitWithParam (ISVCEncoder* encoder, SEncParamExt* pEncParamExt) { · 22 unmodified lines | ||
| 36 | 36 | param.bIsLosslessLink = pEncParamExt->bIsLosslessLink; |
| 37 | 37 | param.bEnableLongTermReference = pEncParamExt->bEnableLongTermReference; |
| 38 | 38 | param.iEntropyCodingModeFlag = pEncParamExt->iEntropyCodingModeFlag ? 1 : 0; |
| 39 | − if (eSliceMode != SM_SINGLE_SLICE && eSliceMode != SM_DYN_SLICE) //SM_DYN_SLICE don't support multi-thread now | |
| 39 | + if (eSliceMode != SM_SINGLE_SLICE && eSliceMode != SM_SIZELIMITED_SLICE) //SM_SIZELIMITED_SLICE don't support multi-thread now | |
| 40 | 40 | param.iMultipleThreadIdc = 2; |
| 41 | 41 | |
| 42 | 42 | for (int i = 0; i < param.iSpatialLayerNum; i++) { |
| @@ -45,9 +45,9 @@ static int InitWithParam (ISVCEncoder* encoder, SEncParamExt* pEncParamExt) { · 2 unmodified lines | ||
| 45 | 45 | param.sSpatialLayers[i].fFrameRate = pEncParamExt->fMaxFrameRate; |
| 46 | 46 | param.sSpatialLayers[i].iSpatialBitrate = param.iTargetBitrate; |
| 47 | 47 | |
| 48 | − param.sSpatialLayers[i].sSliceCfg.uiSliceMode = eSliceMode; | |
| 49 | − if (eSliceMode == SM_DYN_SLICE) { | |
| 50 | − param.sSpatialLayers[i].sSliceCfg.sSliceArgument.uiSliceSizeConstraint = 600; | |
| 48 | + param.sSpatialLayers[i].sSliceArgument.uiSliceMode = eSliceMode; | |
| 49 | + if (eSliceMode == SM_SIZELIMITED_SLICE) { | |
| 50 | + param.sSpatialLayers[i].sSliceArgument.uiSliceSizeConstraint = 600; | |
| 51 | 51 | param.uiMaxNalSize = 1500; |
| 52 | 52 | } |
| 53 | 53 | } |