Ticket #1093: Ticket1093.patch

Lib/TLibEncoder/TEncRateCtrl.cpp

@@ -778 +778 @@
   m_estPicLambda = estLambda;
 
 #if M0036_RC_IMPROVEMENT
-#if RC_FIX
+#if RC_FIX && 0
   if(m_encRCSeq->getUseLCUSeparateModel())
   {
 #endif
@@ -786 +786 @@
   // initial BU bit allocation weight
   for ( Int i=0; i<m_numberOfLCU; i++ )
   {
+#if RC_FIX
+    Double alphaLCU, betaLCU;
+    if ( m_encRCSeq->getUseLCUSeparateModel() )
+    {
+      alphaLCU = m_encRCSeq->getLCUPara( m_frameLevel, i ).m_alpha;
+      betaLCU  = m_encRCSeq->getLCUPara( m_frameLevel, i ).m_beta;
+    }
+    else
+    {
+      alphaLCU = m_encRCSeq->getPicPara( m_frameLevel ).m_alpha;
+      betaLCU  = m_encRCSeq->getPicPara( m_frameLevel ).m_beta;
+    }
+#else
     Double alphaLCU = m_encRCSeq->getLCUPara( m_frameLevel, i ).m_alpha;
     Double betaLCU  = m_encRCSeq->getLCUPara( m_frameLevel, i ).m_beta;
+#endif
 
     m_LCUs[i].m_bitWeight =  m_LCUs[i].m_numberOfPixel * pow( estLambda/alphaLCU, 1.0/betaLCU );
 
@@ -802 +816 @@
     Double BUTargetBits = m_targetBits * m_LCUs[i].m_bitWeight / totalWeight;
     m_LCUs[i].m_bitWeight = BUTargetBits;
   }
-#if RC_FIX
+#if RC_FIX && 0
   }
 #endif
 #endif