Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 8 files). Show all
Unified · Split
| @@ -589,8 +589,8 @@ int32_t ParamValidationExt (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingPa · 588 unmodified lines | |||
| 589 | iMbWidth = (kiPicWidth + 15) >> 4; | 589 | iMbWidth = (kiPicWidth + 15) >> 4; |
| 590 | iMbHeight = (kiPicHeight + 15) >> 4; | 590 | iMbHeight = (kiPicHeight + 15) >> 4; |
| 591 | if (pSpatialLayer->sSliceArgument.uiSliceSizeConstraint <= MAX_MACROBLOCK_SIZE_IN_BYTE) { | 591 | if (pSpatialLayer->sSliceArgument.uiSliceSizeConstraint <= MAX_MACROBLOCK_SIZE_IN_BYTE) { |
| 592 | WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid iSliceSize (%d) settings!", | 592 | WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid iSliceSize (%d) settings!should be larger than MAX_MACROBLOCK_SIZE_IN_BYTE(%d)", |
| 593 | pSpatialLayer->sSliceArgument.uiSliceSizeConstraint); | 593 | pSpatialLayer->sSliceArgument.uiSliceSizeConstraint,MAX_MACROBLOCK_SIZE_IN_BYTE); |
| 594 | return ENC_RETURN_UNSUPPORTED_PARA; | 594 | return ENC_RETURN_UNSUPPORTED_PARA; |
| 595 | } | 595 | } |
| 596 | 596 | ||
| @@ -610,7 +610,7 @@ int32_t ParamValidationExt (SLogContext* pLogCtx, SWelsSvcCodingParam* pCodingPa · 13 unmodified lines | |||
| 610 | pSpatialLayer->sSliceArgument.uiSliceSizeConstraint = pCodingParam->uiMaxNalSize - NAL_HEADER_ADD_0X30BYTES; | 610 | pSpatialLayer->sSliceArgument.uiSliceSizeConstraint = pCodingParam->uiMaxNalSize - NAL_HEADER_ADD_0X30BYTES; |
| 611 | } | 611 | } |
| 612 | } | 612 | } |
| 613 | pSpatialLayer->sSliceArgument.uiSliceSizeConstraint -= RESERVED_SLICE_HEADER_SIZE; | 613 | pSpatialLayer->sSliceArgument.uiSliceSizeConstraint -= NAL_HEADER_ADD_0X30BYTES; |
| 614 | } | 614 | } |
| 615 | break; | 615 | break; |
| 616 | default: { | 616 | default: { |