shithub: openh264

Download patch

ref: 9caf082b4abb15c85113614f066a2bcaeda74a97
parent: 76bd633d915b0373903a2c94fba8eb8d755e56d8
parent: 05cd0e8adabb3c20d0590ef6ccf476f0a5c29927
author: ruil2 <[email protected]>
date: Wed Jul 2 05:04:01 EDT 2014 

Merge pull request #1054 from huili2/output_bs_enc

fix when output enabled in encoder


--- a/codec/encoder/plus/src/welsEncoderExt.cpp
+++ b/codec/encoder/plus/src/welsEncoderExt.cpp
@@ -464,7 +464,7 @@
   }
   ///////////////////for test
 #ifdef OUTPUT_BIT_STREAM
-  if (pBsInfo->eOutputFrameType != videoFrameTypeInvalid && pBsInfo->eOutputFrameType != videoFrameTypeSkip) {
+  if (pBsInfo->eFrameType != videoFrameTypeInvalid && pBsInfo->eFrameType != videoFrameTypeSkip) {
     SLayerBSInfo* pLayer = NULL;
     int32_t i = 0, j = 0, iCurLayerBits = 0, total_bits = 0;
 
@@ -692,7 +692,7 @@
     }
 #ifdef OUTPUT_BIT_STREAM
     if (sEncodingParam.sSpatialLayers[sEncodingParam.iSpatialLayerNum - 1].iVideoWidth !=
-        m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iSpatialLayerNum - 1].iFrameWidth) {
+        m_pEncContext->pSvcParam->sDependencyLayers[m_pEncContext->pSvcParam->iSpatialLayerNum - 1].iActualWidth) {
       ++ m_iSwitchTimes;
       m_bSwitch = true;
     }