generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #560 from ruil2/encoder_nal

Browse Source 
add uiMaxNalSize to support the maximum nal size setting
This commit is contained in:
Licai Guo 2014-03-21 12:52:32 +08:00
commit 65e8560dc7
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
codec/api/svc/codec_app_def.h
View File

@ -275,6 +275,7 @@ typedef struct TagEncParamExt
int iMaxBitrate; // max bitrate desired int iMaxBitrate; // max bitrate desired
int iMaxQp; int iMaxQp;
int iMinQp; int iMinQp;
unsigned int uiMaxNalSize;
/*LTR settings*/ /*LTR settings*/
bool bEnableLongTermReference; // 0: on, 1: off bool bEnableLongTermReference; // 0: on, 1: off

2
codec/encoder/core/inc/param_svc.h
View File

@ -188,6 +188,7 @@ static void FillDefault (SEncParamExt& param, const bool kbEnableRc) {
param.iMaxQp = 51; param.iMaxQp = 51;
param.iMinQp = 0; param.iMinQp = 0;
param.iUsageType = CAMERA_VIDEO_REAL_TIME; param.iUsageType = CAMERA_VIDEO_REAL_TIME;
param.uiMaxNalSize = 0;
for(int32_t iLayer = 0;iLayer< MAX_SPATIAL_LAYER_NUM;iLayer++){ for(int32_t iLayer = 0;iLayer< MAX_SPATIAL_LAYER_NUM;iLayer++){
param.sSpatialLayers[iLayer].uiProfileIdc = PRO_BASELINE; param.sSpatialLayers[iLayer].uiProfileIdc = PRO_BASELINE;
@ -333,6 +334,7 @@ int32_t ParamTranscode (const SEncParamExt& pCodingParam) {
iTargetBitrate = pCodingParam.iTargetBitrate; // target bitrate iTargetBitrate = pCodingParam.iTargetBitrate; // target bitrate
iMaxBitrate = pCodingParam.iMaxBitrate; iMaxBitrate = pCodingParam.iMaxBitrate;
uiMaxNalSize = pCodingParam.uiMaxNalSize;
/* Denoise Control */ /* Denoise Control */
bEnableDenoise = pCodingParam.bEnableDenoise ? true : false; // Denoise Control // only support 0 or 1 now bEnableDenoise = pCodingParam.bEnableDenoise ? true : false; // Denoise Control // only support 0 or 1 now

2
codec/encoder/core/inc/wels_const.h
View File

@ -167,6 +167,8 @@
#define UNAVAILABLE_DQ_ID ((uint8_t)(-1)) #define UNAVAILABLE_DQ_ID ((uint8_t)(-1))
#define LAYER_NUM_EXCHANGEABLE 2 #define LAYER_NUM_EXCHANGEABLE 2
#define NAL_HEADER_ADD_0X30BYTES 50
#define MAX_NAL_UNIT_NUM_IN_AU 256 // predefined maximal number of NAL Units in an access unit #define MAX_NAL_UNIT_NUM_IN_AU 256 // predefined maximal number of NAL Units in an access unit
#define MAX_ACCESS_UINT_CAPACITY (1<<20) // Maximal AU capacity in bytes: 1024 KB predefined #define MAX_ACCESS_UINT_CAPACITY (1<<20) // Maximal AU capacity in bytes: 1024 KB predefined
#define MAX_ACCESS_UNIT_CACHE_NUM 2 // Maximal Access Unit(AU) cache number to be processed, denote current AU and the next coming AU. #define MAX_ACCESS_UNIT_CACHE_NUM 2 // Maximal Access Unit(AU) cache number to be processed, denote current AU and the next coming AU.

18
codec/encoder/core/src/encoder_ext.cpp
View File

@ -196,7 +196,10 @@ int32_t ParamValidationExt (sWelsEncCtx*pCtx,SWelsSvcCodingParam* pCodingParam)
WelsLog (pCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceMode (%d) settings!\n", fDlp->sSliceCfg.uiSliceMode); WelsLog (pCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiSliceMode (%d) settings!\n", fDlp->sSliceCfg.uiSliceMode);
return ENC_RETURN_UNSUPPORTED_PARA; return ENC_RETURN_UNSUPPORTED_PARA;
} }
if((pCodingParam->uiMaxNalSize != 0) && (fDlp->sSliceCfg.uiSliceMode != SM_DYN_SLICE)){
WelsLog (pCtx, WELS_LOG_ERROR,"ParamValidationExt(), invalid uiSliceMode (%d) settings!,MaxNalSize = %d\n", fDlp->sSliceCfg.uiSliceMode,pCodingParam->uiMaxNalSize);
return ENC_RETURN_UNSUPPORTED_PARA;
}
//check pSlice settings under multi-pSlice //check pSlice settings under multi-pSlice
if (kiPicWidth <= 16 && kiPicHeight <= 16) { if (kiPicWidth <= 16 && kiPicHeight <= 16) {
//only have one MB, set to single_slice //only have one MB, set to single_slice
@ -328,6 +331,19 @@ int32_t ParamValidationExt (sWelsEncCtx*pCtx,SWelsSvcCodingParam* pCodingParam)
fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint); fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint);
return ENC_RETURN_UNSUPPORTED_PARA; return ENC_RETURN_UNSUPPORTED_PARA;
} }
if( pCodingParam->uiMaxNalSize <= NAL_HEADER_ADD_0X30BYTES) {
WelsLog (pCtx, WELS_LOG_ERROR, "ParamValidationExt(), invalid uiMaxNalSize (%d) settings!\n",
pCodingParam->uiMaxNalSize);
return ENC_RETURN_UNSUPPORTED_PARA;
}
if( fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint > (pCodingParam->uiMaxNalSize - NAL_HEADER_ADD_0X30BYTES)){
WelsLog (pCtx, WELS_LOG_WARNING, "ParamValidationExt(), slice mode = SM_DYN_SLICE, uiSliceSizeConstraint = %d ,uiMaxNalsize = %d!\n",
fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint,pCodingParam->uiMaxNalSize);
fDlp->sSliceCfg.sSliceArgument.uiSliceSizeConstraint = pCodingParam->uiMaxNalSize - NAL_HEADER_ADD_0X30BYTES;
}
// considering the coding efficient and performance, iCountMbNum constraint by MIN_NUM_MB_PER_SLICE condition of multi-pSlice mode settting // considering the coding efficient and performance, iCountMbNum constraint by MIN_NUM_MB_PER_SLICE condition of multi-pSlice mode settting
if (iMbWidth * iMbHeight <= MIN_NUM_MB_PER_SLICE) { if (iMbWidth * iMbHeight <= MIN_NUM_MB_PER_SLICE) {
fDlp->sSliceCfg.uiSliceMode = SM_SINGLE_SLICE; fDlp->sSliceCfg.uiSliceMode = SM_SINGLE_SLICE;