shithub: openh264

Download patch

ref: be17261a92c70604e1bc1715e80248f2b32f502c
parent: e15742b4044f35d2df0be6f494b5efb28fc169c2
author: sijchen <[email protected]>
date: Mon May 19 13:04:59 EDT 2014 

reformat


--- a/codec/encoder/core/src/encoder_ext.cpp
+++ b/codec/encoder/core/src/encoder_ext.cpp
@@ -80,7 +80,7 @@
   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 @@
   }
 
   //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);
     }
   }
 
--- a/codec/encoder/core/src/svc_mode_decision.cpp
+++ b/codec/encoder/core/src/svc_mode_decision.cpp
@@ -118,12 +118,6 @@
   WelsMdSpatialelInterMbIlfmdNoilp (pEncCtx, pWelsMd, pSlice, pCurMb, kuiInterLayerRefMbType); //MD process
 }
 
-//////////////////////////
-//
-//SUPPORTING FUNCS
-//
-//////////////////////////
-
 ///////////////////////
 // do initiation for noILP (needed by ILFMD)
 ////////////////////////