Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 4 files). Show all
Unified · Split
| @@ -196,7 +196,10 @@ int32_t ParamValidationExt (sWelsEncCtx*pCtx,SWelsSvcCodingParam* pCodingParam) · 195 unmodified lines | |||
| 196 | WelsLog (pCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceMode (%d) settings!\n", fDlp->sSliceCfg.uiSliceMode); | 196 | WelsLog (pCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceMode (%d) settings!\n", fDlp->sSliceCfg.uiSliceMode); |
| 197 | return ENC_RETURN_UNSUPPORTED_PARA; | 197 | return ENC_RETURN_UNSUPPORTED_PARA; |
| 198 | } | 198 | } |
| 199 | 199 | if((pCodingParam->uiMaxNalSize != 0) && (fDlp->sSliceCfg.uiSliceMode != SM_DYN_SLICE)){ | |
| 200 | WelsLog (pCtx, WELS_LOG_ERROR,"ParamValidationExt(), invalid uiSliceMode (%d) settings!,MaxNalSize = %d\n", fDlp->sSliceCfg.uiSliceMode,pCodingParam->uiMaxNalSize); | ||
| 201 | return ENC_RETURN_UNSUPPORTED_PARA; | ||
| 202 | } | ||
| 200 | //check pSlice settings under multi-pSlice | 203 | //check pSlice settings under multi-pSlice |
| 201 | if (kiPicWidth <= 16 && kiPicHeight <= 16) { | 204 | if (kiPicWidth <= 16 && kiPicHeight <= 16) { |
| 202 | //only have one MB, set to single_slice | 205 | //only have one MB, set to single_slice |
| @@ -328,6 +331,19 @@ int32_t ParamValidationExt (sWelsEncCtx*pCtx,SWelsSvcCodingParam* pCodingParam) · 125 unmodified lines | |||
| 328 | fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint); | 331 | fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint); |
| 329 | return ENC_RETURN_UNSUPPORTED_PARA; | 332 | return ENC_RETURN_UNSUPPORTED_PARA; |
| 330 | } | 333 | } |
| 334 | |||
| 335 | if( pCodingParam->uiMaxNalSize <= NAL_HEADER_ADD_0X30BYTES) { | ||
| 336 | WelsLog (pCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiMaxNalSize (%d) settings!\n", | ||
| 337 | pCodingParam->uiMaxNalSize); | ||
| 338 | return ENC_RETURN_UNSUPPORTED_PARA; | ||
| 339 | } | ||
| 340 | |||
| 341 | if( fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint > (pCodingParam->uiMaxNalSize - NAL_HEADER_ADD_0X30BYTES)){ | ||
| 342 | WelsLog (pCtx, WELS_LOG_WARNING, "ParamValidationExt(), slice mode = SM_DYN_SLICE, uiSliceSizeConstraint = %d ,uiMaxNalsize = %d!\n", | ||
| 343 | fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint,pCodingParam->uiMaxNalSize); | ||
| 344 | fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint = pCodingParam->uiMaxNalSize - NAL_HEADER_ADD_0X30BYTES; | ||
| 345 | } | ||
| 346 | |||
| 331 | // considering the coding efficient and performance, iCountMbNum constraint by MIN_NUM_MB_PER_SLICE condition of multi-pSlice mode settting | 347 | // considering the coding efficient and performance, iCountMbNum constraint by MIN_NUM_MB_PER_SLICE condition of multi-pSlice mode settting |
| 332 | if (iMbWidth * iMbHeight <= MIN_NUM_MB_PER_SLICE) { | 348 | if (iMbWidth * iMbHeight <= MIN_NUM_MB_PER_SLICE) { |
| 333 | fDlp->sSliceCfg.uiSliceMode = SM_SINGLE_SLICE; | 349 | fDlp->sSliceCfg.uiSliceMode = SM_SINGLE_SLICE; |