shithub: openh264

Download patch

ref: 1dbc856ed03a866378438ec0b8e472bdea0ac401
parent: 3f2ea77908b70e382b967b7af4d49658b12e0bb2
parent: 736a6753c0969c59bf4dca3c1f89441916a2a88b
author: ruil2 <ruil2@cisco.com>
date: Mon Apr 21 12:40:47 EDT 2014 

Merge pull request #721 from sijchen/fix_one_getoption

fix the GetOption: bit rate part


--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -935,7 +935,7 @@
              m_uiCountFrameNum, m_iCspInternal);
 #endif//REC_FRAME_COUNT
     SBitrateInfo*pInfo = (static_cast<SBitrateInfo *>(pOption));
-    if((pInfo->iLayer!=SPATIAL_LAYER_ALL)||(pInfo->iLayer!=SPATIAL_LAYER_0)||(pInfo->iLayer!=SPATIAL_LAYER_1)||(pInfo->iLayer!=SPATIAL_LAYER_2)||(pInfo->iLayer!=SPATIAL_LAYER_3))
+    if((pInfo->iLayer!=SPATIAL_LAYER_ALL)&&(pInfo->iLayer!=SPATIAL_LAYER_0)&&(pInfo->iLayer!=SPATIAL_LAYER_1)&&(pInfo->iLayer!=SPATIAL_LAYER_2)&&(pInfo->iLayer!=SPATIAL_LAYER_3))
         return cmInitParaError;
     if(pInfo->iLayer == SPATIAL_LAYER_ALL){
       pInfo->iBitrate = m_pEncContext->pSvcParam->iTargetBitrate;
@@ -950,7 +950,7 @@
 	          m_uiCountFrameNum, m_iCspInternal);
 #endif//REC_FRAME_COUNT
     SBitrateInfo*pInfo = (static_cast<SBitrateInfo *>(pOption));
-	if((pInfo->iLayer!=SPATIAL_LAYER_ALL)||(pInfo->iLayer!=SPATIAL_LAYER_0)||(pInfo->iLayer!=SPATIAL_LAYER_1)||(pInfo->iLayer!=SPATIAL_LAYER_2)||(pInfo->iLayer!=SPATIAL_LAYER_3))
+	if((pInfo->iLayer!=SPATIAL_LAYER_ALL)&&(pInfo->iLayer!=SPATIAL_LAYER_0)&&(pInfo->iLayer!=SPATIAL_LAYER_1)&&(pInfo->iLayer!=SPATIAL_LAYER_2)&&(pInfo->iLayer!=SPATIAL_LAYER_3))
 	  return cmInitParaError;
 	if(pInfo->iLayer == SPATIAL_LAYER_ALL){
       pInfo->iBitrate = m_pEncContext->pSvcParam->iMaxBitrate;