Changeset 637 in 3DVCSoftware for branches/HTM-8.2-dev0-KWU/source/App/TAppEncoder

Timestamp:

17 Oct 2013, 20:17:10 (12 years ago)

Author:

kwu-htm

Message:

Clean up and revised according to the guideline.

Location:

branches/HTM-8.2-dev0-KWU/source/App/TAppEncoder

Files:

• TAppEncCfg.cpp (modified) (1 diff)
• TAppEncTop.cpp (modified) (5 diffs)

branches/HTM-8.2-dev0-KWU/source/App/TAppEncoder/TAppEncCfg.cpp ¶

@@ -2179 +2179 @@
     xConfirmPara( (numLCUInPic % m_numLCUInUnit) != 0, "total number of LCUs in a frame should be completely divided by NumLCUInUnit" );
 
-#if !(KWU_RC_MADPRED_E0227 || KWU_RC_VIEWRC_E0227)
+#if !KWU_FIX_URQ
     m_iMaxDeltaQP       = MAX_DELTA_QP;
 #endif

branches/HTM-8.2-dev0-KWU/source/App/TAppEncoder/TAppEncTop.cpp ¶

@@ -512 +512 @@
   m_cTEncTop.setSignHideFlag(m_signHideFlag);
 #if RATE_CONTROL_LAMBDA_DOMAIN
-#if KWU_RC_MADPRED_E0227
+#if KWU_RC_VIEWRC_E0227 || KWU_RC_MADPRED_E0227
   if(!m_cTEncTop.getIsDepth())    //only for texture
   {
@@ -522 +522 @@
   }
 #else
-  m_cTEncTop.setUseRateCtrl         ( m_RCEnableRateControl );
+    m_cTEncTop.setUseRateCtrl         ( m_RCEnableRateControl );
 #endif
 #if !KWU_RC_VIEWRC_E0227
@@ -603 +603 @@
 #endif
 #else
-#if KWU_RC_MADPRED_E0227
+#if KWU_RC_VIEWRC_E0227 || KWU_RC_MADPRED_E0227
   if(!m_cTEncTop.getIsDepth())    //only for texture
   {
     m_cTEncTop.setUseRateCtrl         ( m_enableRateCtrl );
-#if !KWU_RC_VIEWRC_E0227
     m_cTEncTop.setTargetBitrate       ( m_targetBitrate );
-#endif
     m_cTEncTop.setNumLCUInUnit        ( m_numLCUInUnit);
   }
@@ -617 +615 @@
   }
 #else
-  m_cTEncTop.setUseRateCtrl     ( m_enableRateCtrl);
-  m_cTEncTop.setTargetBitrate   ( m_targetBitrate);
-  m_cTEncTop.setNumLCUInUnit    ( m_numLCUInUnit);
-#endif
+  m_cTEncTop.setUseRateCtrl         ( m_enableRateCtrl );
+  m_cTEncTop.setTargetBitrate       ( m_targetBitrate );
+  m_cTEncTop.setNumLCUInUnit        ( m_numLCUInUnit);
+#endif
+
   
 #if KWU_RC_MADPRED_E0227
@@ -962 +961 @@
     }
 
-#if !RATE_CONTROL_LAMBDA_DOMAIN
+#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_FIX_URQ
     for(Int layer=0; layer < m_numberOfLayers; layer++ )
     {