Merge pull request #554 from ruil2/encoder_update

add maxbitrate parameter

Licai Guo committed 12 years ago

Commit 9d73d272 parents bef50d9 258185f6 files · +137 −23Browse files

Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 6 files). Show all

Unified · Split

codec/encoder/core/src/encoder_ext.cpp+25−11

 }
-void WelsEncoderApplyBitRate(SWelsSvcCodingParam* pParam)
+void WelsEncoderApplyBitRate(SWelsSvcCodingParam* pParam,int iLayer)
 {
   //TODO (Sijia):  this is a temporary solution which keep the ratio between layers
   //but it is also possible to fulfill the bitrate of lower layer first
   SDLayerParam* pLayerParam;
   const int32_t iNumLayers = pParam->iSpatialLayerNum;
   int32_t i, iOrigTotalBitrate=0;
-  //read old BR
+  if(iLayer == SPATIAL_LAYER_ALL){
-  for (i=0;i<iNumLayers;i++) {
+    if(pParam->iMaxBitrate <pParam->iTargetBitrate){
-    iOrigTotalBitrate += pParam->sDependencyLayers[i].iSpatialBitrate;
+      WelsLog (NULL, WELS_LOG_WARNING,"CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,overall settting,TargetBitrate = %d,iMaxBitrate = %d\n",
-  }
+        pParam->iTargetBitrate,pParam->iMaxBitrate);
-  //write new BR
+      pParam->iMaxBitrate  = pParam->iTargetBitrate;
-  float fRatio = 0.0;
+    }
-  for (i=0;i<iNumLayers;i++) {
+    //read old BR
-    pLayerParam = &(pParam->sDependencyLayers[i]);
+    for (i=0;i<iNumLayers;i++) {
-    fRatio = pLayerParam->iSpatialBitrate/(static_cast<float>(iOrigTotalBitrate));
+     iOrigTotalBitrate += pParam->sDependencyLayers[i].iSpatialBitrate;
-    pLayerParam->iSpatialBitrate = static_cast<int32_t>(pParam->iTargetBitrate*fRatio);
+    }
+    //write new BR
+    float fRatio = 0.0;
+    for (i=0;i<iNumLayers;i++) {
+      pLayerParam = &(pParam->sDependencyLayers[i]);
+      fRatio = pLayerParam->iSpatialBitrate/(static_cast<float>(iOrigTotalBitrate));
+      pLayerParam->iSpatialBitrate = static_cast<int32_t>(pParam->iTargetBitrate*fRatio);
+    }
+  }else{
+    if(pParam->sSpatialLayers[iLayer].iMaxSpatialBitrate <pParam->sSpatialLayers[iLayer].iSpatialBitrate){
+      WelsLog (NULL, WELS_LOG_WARNING,"CWelsH264SVCEncoder::SetOption():ENCODER_OPTION_BITRATE,iLayer = %d,iTargetBitrate = %d,iMaxBitrate = %d\n",
+        iLayer,pParam->sSpatialLayers[iLayer].iSpatialBitrate,pParam->sSpatialLayers[iLayer].iMaxSpatialBitrate);
+      pParam->sSpatialLayers[iLayer].iMaxSpatialBitrate = pParam->sSpatialLayers[iLayer].iSpatialBitrate;
+    }
   }
 }
 /*!

Merge pull request #554 from ruil2/encoder_update

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code