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

reformat

Browse Source
This commit is contained in:
sijchen 2014-05-19 17:04:59 +08:00
parent e15742b404
commit be17261a92
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,7 @@ int32_t ParamValidation (SWelsSvcCodingParam* pCfg) {
assert (pCfg != NULL);
if ((pCfg->iUsageType != CAMERA_VIDEO_REAL_TIME) && (pCfg->iUsageType != SCREEN_CONTENT_REAL_TIME)) {
WelsLog (NULL, WELS_LOG_ERROR, "ParamValidation(),Invalid usage type = %d", pCfg->iUsageType);
WelsLog (NULL, WELS_LOG_ERROR, "ParamValidation(),Invalid usage type = %d\n", pCfg->iUsageType);
return ENC_RETURN_UNSUPPORTED_PARA;
}
for (i = 0; i < pCfg->iSpatialLayerNum; ++ i) {
@ -113,15 +113,16 @@ int32_t ParamValidation (SWelsSvcCodingParam* pCfg) {
}
//bitrate setting validation
if (pCfg->iRCMode != RC_OFF_MODE){
if (pCfg->iRCMode != RC_OFF_MODE) {
int32_t iTotalBitrate = 0;
for (i = 0; i < pCfg->iSpatialLayerNum; ++ i) {
SDLayerParam* fDlp = &pCfg->sDependencyLayers[i];
iTotalBitrate += fDlp->iSpatialBitrate;
}
if(iTotalBitrate > pCfg->iTargetBitrate){
WelsLog(NULL, WELS_LOG_ERROR,"Invalid setttings in bitrate. the sum of each layer bitrate(%d) is larger than total bitrate setting(%d)\n",
iTotalBitrate,pCfg->iTargetBitrate);
if (iTotalBitrate > pCfg->iTargetBitrate) {
WelsLog (NULL, WELS_LOG_ERROR,
"Invalid setttings in bitrate. the sum of each layer bitrate(%d) is larger than total bitrate setting(%d)\n",
iTotalBitrate, pCfg->iTargetBitrate);
}
}

6
codec/encoder/core/src/svc_mode_decision.cpp
View File

@ -118,12 +118,6 @@ void WelsMdInterMbEnhancelayer (void* pEnc, void* pMd, SSlice* pSlice, SMB* pCur
WelsMdSpatialelInterMbIlfmdNoilp (pEncCtx, pWelsMd, pSlice, pCurMb, kuiInterLayerRefMbType); //MD process
}
//////////////////////////
//
//SUPPORTING FUNCS
//
//////////////////////////
///////////////////////
// do initiation for noILP (needed by ILFMD)
////////////////////////