Changeset 638 in 3DVCSoftware

Timestamp:

18 Oct 2013, 04:44:23 (11 years ago)

Author:

kwu-htm

Message:

Macro enclosed and cleaned-up

Location:

branches/HTM-8.2-dev0-KWU/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (5 diffs)
• App/TAppEncoder/TAppEncCfg.h (modified) (2 diffs)
• App/TAppEncoder/TAppEncTop.cpp (modified) (6 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibEncoder/TEncCfg.h (modified) (4 diffs)
• Lib/TLibEncoder/TEncCu.cpp (modified) (6 diffs)
• Lib/TLibEncoder/TEncCu.h (modified) (2 diffs)
• Lib/TLibEncoder/TEncRateCtrl.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncSlice.cpp (modified) (2 diffs)

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

@@ -84 +84 @@
 
 #if KWU_RC_MADPRED_E0227
-  m_DepthMADPred = 0;
+  m_depthMADPred = 0;
 #endif
 }
@@ -600 +600 @@
 
 #if KWU_RC_VIEWRC_E0227
-  ("ViewWiseTargetBits, -vtbr" ,  m_ViewTargetBits,  std::vector<Int>(1, 32), "View-wise target bit-rate setting")
-  ("TargetBitAssign, -ta", m_ViewWiseRateCtrl, false, "View-wise rate control on/off")
+  ("ViewWiseTargetBits, -vtbr" ,  m_viewTargetBits,  std::vector<Int>(1, 32), "View-wise target bit-rate setting")
+  ("TargetBitAssign, -ta", m_viewWiseRateCtrl, false, "View-wise rate control on/off")
 #endif
 #if KWU_RC_MADPRED_E0227
-  ("DepthMADPred, -dm", m_DepthMADPred, (UInt)0, "Depth based MAD prediction on/off")
+  ("DepthMADPred, -dm", m_depthMADPred, (UInt)0, "Depth based MAD prediction on/off")
 #endif
 #else
@@ -612 +612 @@
 
 #if KWU_RC_VIEWRC_E0227
-  ("ViewWiseTargetBits, -vtbr" ,  m_ViewTargetBits,  std::vector<Int>(1, 32), "View-wise target bit-rate setting")
-  ("TargetBitAssign, -ta", m_ViewWiseRateCtrl, false, "View-wise rate control on/off")
+  ("ViewWiseTargetBits, -vtbr" ,  m_viewTargetBits,  std::vector<Int>(1, 32), "View-wise target bit-rate setting")
+  ("TargetBitAssign, -ta", m_viewWiseRateCtrl, false, "View-wise rate control on/off")
 #endif
 #if KWU_RC_MADPRED_E0227
-  ("DepthMADPred, -dm", m_DepthMADPred, (UInt)0, "Depth based MAD prediction on/off")
+  ("DepthMADPred, -dm", m_depthMADPred, (UInt)0, "Depth based MAD prediction on/off")
 #endif
 #endif
@@ -2325 +2325 @@
 
 #if KWU_RC_MADPRED_E0227
-    printf("Depth based MAD prediction   : %d\n", m_DepthMADPred);
+    printf("Depth based MAD prediction   : %d\n", m_depthMADPred);
 #endif
 #if KWU_RC_VIEWRC_E0227
-    printf("View-wise Rate control       : %d\n", m_ViewWiseRateCtrl);
-    if(m_ViewWiseRateCtrl)
+    printf("View-wise Rate control       : %d\n", m_viewWiseRateCtrl);
+    if(m_viewWiseRateCtrl)
     {
 
       printf("ViewWiseTargetBits           : ");
-      for (int i = 0 ; i < m_iNumberOfViews ; i++)
-        printf("%d ", m_ViewTargetBits[i]);
+      for (Int i = 0 ; i < m_iNumberOfViews ; i++)
+        printf("%d ", m_viewTargetBits[i]);
       printf("\n");
     }
@@ -2351 +2351 @@
 
 #if KWU_RC_MADPRED_E0227
-    printf("Depth based MAD prediction   : %d\n", m_DepthMADPred);
+    printf("Depth based MAD prediction   : %d\n", m_depthMADPred);
 #endif
 #if KWU_RC_VIEWRC_E0227
-    printf("View-wise Rate control       : %d\n", m_ViewWiseRateCtrl);
-    if(m_ViewWiseRateCtrl)
+    printf("View-wise Rate control       : %d\n", m_viewWiseRateCtrl);
+    if(m_viewWiseRateCtrl)
     {
 
       printf("ViewWiseTargetBits           : ");
-      for (int i = 0 ; i < m_iNumberOfViews ; i++)
-        printf("%d ", m_ViewTargetBits[i]);
+      for (Int i = 0 ; i < m_iNumberOfViews ; i++)
+        printf("%d ", m_viewTargetBits[i]);
       printf("\n");
     }

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

@@ -369 +369 @@
 
 #if KWU_RC_VIEWRC_E0227
-  vector<Int>     m_ViewTargetBits;
-  bool      m_ViewWiseRateCtrl;                              ///< Flag for using view-wise rate control
+  vector<Int>     m_viewTargetBits;
+  Bool      m_viewWiseRateCtrl;                              ///< Flag for using view-wise rate control
 #endif
 #if KWU_RC_MADPRED_E0227
-  UInt       m_DepthMADPred;
+  UInt       m_depthMADPred;
 #endif
 #else
@@ -381 +381 @@
 
 #if KWU_RC_VIEWRC_E0227
-  vector<Int>     m_ViewTargetBits;
-  bool      m_ViewWiseRateCtrl;                              ///< Flag for using view-wise rate control
+  vector<Int>     m_viewTargetBits;
+  Bool      m_viewWiseRateCtrl;                              ///< Flag for using view-wise rate control
 #endif
 #if KWU_RC_MADPRED_E0227
-  UInt       m_DepthMADPred;
+  UInt       m_depthMADPred;
 #endif
 #endif

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

@@ -536 +536 @@
   if(m_cTEncTop.getUseRateCtrl() && !m_cTEncTop.getIsDepth())
   {
-    m_cTEncTop.setUseDepthMADPred(layerIdInVps ? m_DepthMADPred       : 0);
+    m_cTEncTop.setUseDepthMADPred(layerIdInVps ? m_depthMADPred       : 0);
 
     if(m_cTEncTop.getUseDepthMADPred())
@@ -547 +547 @@
   if(m_cTEncTop.getUseRateCtrl() && !m_cTEncTop.getIsDepth())
   {
-    m_cTEncTop.setUseViewWiseRateCtrl(m_ViewWiseRateCtrl);
+    m_cTEncTop.setUseViewWiseRateCtrl(m_viewWiseRateCtrl);
 
     if(m_iNumberOfViews == 1)
     {
-      if(m_ViewWiseRateCtrl)
-      {
-        m_cTEncTop.setTargetBitrate(m_ViewTargetBits[layerIdInVps>>1]);
+      if(m_viewWiseRateCtrl)
+      {
+        m_cTEncTop.setTargetBitrate(m_viewTargetBits[layerIdInVps>>1]);
       }
       else
@@ -562 +562 @@
     else
     {
-      if(m_ViewWiseRateCtrl)
-      {
-        m_cTEncTop.setTargetBitrate(m_ViewTargetBits[layerIdInVps>>1]);
+      if(m_viewWiseRateCtrl)
+      {
+        m_cTEncTop.setTargetBitrate(m_viewTargetBits[layerIdInVps>>1]);
       }
       else
@@ -624 +624 @@
   if(m_cTEncTop.getUseRateCtrl() && !m_cTEncTop.getIsDepth())
   {
-    m_cTEncTop.setUseDepthMADPred(layerIdInVps ? m_DepthMADPred       : 0);
+    m_cTEncTop.setUseDepthMADPred(layerIdInVps ? m_depthMADPred       : 0);
 
     if(m_cTEncTop.getUseDepthMADPred())
@@ -636 +636 @@
   if(m_cTEncTop.getUseRateCtrl() && !m_cTEncTop.getIsDepth())
   {
-    m_cTEncTop.setUseViewWiseRateCtrl(m_ViewWiseRateCtrl);
+    m_cTEncTop.setUseViewWiseRateCtrl(m_viewWiseRateCtrl);
     if(m_iNumberOfViews == 1)
     {
-      if(m_ViewWiseRateCtrl)
-      {
-        m_cTEncTop.setTargetBitrate(m_ViewTargetBits[layerIdInVps>>1]);
+      if(m_viewWiseRateCtrl)
+      {
+        m_cTEncTop.setTargetBitrate(m_viewTargetBits[layerIdInVps>>1]);
       }
       else
@@ -650 +650 @@
     else
     {
-      if(m_ViewWiseRateCtrl)
-      {
-        m_cTEncTop.setTargetBitrate(m_ViewTargetBits[layerIdInVps>>1]);
+      if(m_viewWiseRateCtrl)
+      {
+        m_cTEncTop.setTargetBitrate(m_viewTargetBits[layerIdInVps>>1]);
       }
       else

branches/HTM-8.2-dev0-KWU/source/Lib/TLibCommon/TypeDef.h

@@ -302 +302 @@
 #endif
 
-#define RATE_CONTROL_LAMBDA_DOMAIN                  1  ///< JCTVC-K0103, rate control by R-lambda model
+#define RATE_CONTROL_LAMBDA_DOMAIN                  0  ///< JCTVC-K0103, rate control by R-lambda model
 #define M0036_RC_IMPROVEMENT                        1  ///< JCTVC-M0036, improvement for R-lambda model based rate control
 #define TICKET_1090_FIX                             1

branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCfg.h

@@ -312 +312 @@
 
 #if KWU_RC_MADPRED_E0227
-  UInt       m_uiDepthMADPred;
+  UInt       m_depthMADPred;
 #endif
 #if KWU_RC_VIEWRC_E0227
@@ -323 +323 @@
 
 #if KWU_RC_MADPRED_E0227
-  UInt       m_uiDepthMADPred;
+  UInt       m_depthMADPred;
 #endif
 #if KWU_RC_VIEWRC_E0227
@@ -842 +842 @@
 
 #if KWU_RC_MADPRED_E0227
-  UInt      getUseDepthMADPred    ()                { return m_uiDepthMADPred;        }
-  Void      setUseDepthMADPred    (UInt b)          { m_uiDepthMADPred    = b;        }
+  UInt      getUseDepthMADPred    ()                { return m_depthMADPred;        }
+  Void      setUseDepthMADPred    (UInt b)          { m_depthMADPred    = b;        }
 #endif
 #if KWU_RC_VIEWRC_E0227
@@ -858 +858 @@
 
 #if KWU_RC_MADPRED_E0227
-  UInt      getUseDepthMADPred    ()                { return m_uiDepthMADPred;        }
-  Void      setUseDepthMADPred    (UInt b)          { m_uiDepthMADPred    = b;        }
+  UInt      getUseDepthMADPred    ()                { return m_depthMADPred;        }
+  Void      setUseDepthMADPred    (UInt b)          { m_depthMADPred    = b;        }
 #endif
 #if KWU_RC_VIEWRC_E0227

branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCu.cpp

@@ -103 +103 @@
   
   m_bEncodeDQP = false;
-#if RATE_CONTROL_LAMBDA_DOMAIN && (!M0036_RC_IMPROVEMENT || KWU_RC_MADPRED_E0227)
+#if RATE_CONTROL_LAMBDA_DOMAIN
+#if !M0036_RC_IMPROVEMENT
+  m_LCUPredictionSAD = 0;
+  m_addSADDepth      = 0;
+  m_temporalSAD      = 0;
+#endif
+#if M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227
+  m_LCUPredictionSAD = 0;
+  m_addSADDepth      = 0;
+  m_temporalSAD      = 0;
+#endif
+#endif
+#if KWU_RC_MADPRED_E0227
   m_LCUPredictionSAD = 0;
   m_addSADDepth      = 0;
@@ -257 +269 @@
   m_ppcTempCU[0]->initCU( rpcCU->getPic(), rpcCU->getAddr() );
 
-#if (RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT) || KWU_RC_MADPRED_E0227
+#if RATE_CONTROL_LAMBDA_DOMAIN
+#if !M0036_RC_IMPROVEMENT
+  m_LCUPredictionSAD = 0;
   m_addSADDepth      = 0;
+  m_temporalSAD      = 0;
+#endif
+#if M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227
   m_LCUPredictionSAD = 0;
+  m_addSADDepth      = 0;
+  m_temporalSAD      = 0;
+#endif
+#endif
+#if KWU_RC_MADPRED_E0227
+  m_LCUPredictionSAD = 0;
+  m_addSADDepth      = 0;
   m_temporalSAD      = 0;
   m_spatialSAD       = 0;
@@ -673 +697 @@
     }
 
-#if (RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT) || KWU_RC_MADPRED_E0227
+#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
     if ( uiDepth <= m_addSADDepth )
     {
@@ -679 +703 @@
       m_addSADDepth = uiDepth;
     }
+#endif
+#if RATE_CONTROL_LAMBDA_DOMAIN && M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227
+    if ( uiDepth <= m_addSADDepth )
+    {
+      m_LCUPredictionSAD += m_temporalSAD;
+      m_addSADDepth = uiDepth;
+    }
+#endif
+#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
+if ( uiDepth <= m_addSADDepth )
+{
+  m_LCUPredictionSAD += m_temporalSAD;
+  m_addSADDepth = uiDepth;
+}
 #endif
 #if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_FIX_URQ
@@ -1022 +1060 @@
           {
             xCheckRDCostIntra( rpcBestCU, rpcTempCU, SIZE_2Nx2N );
-#if (RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT) || KWU_RC_MADPRED_E0227
+#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
+            if ( uiDepth <= m_addSADDepth )
+            {
+              m_LCUPredictionSAD += m_spatialSAD;
+              m_addSADDepth = uiDepth;
+            }
+#elif RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
+            if ( uiDepth <= m_addSADDepth )
+            {
+              m_LCUPredictionSAD += m_spatialSAD;
+              m_addSADDepth = uiDepth;
+            }
+#endif
+#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
             if ( uiDepth <= m_addSADDepth )
             {
@@ -2261 +2312 @@
   rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() );
   
-#if RATE_CONTROL_LAMBDA_DOMAIN && (!M0036_RC_IMPROVEMENT || KWU_RC_MADPRED_E0227)
+#if RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT
+  UChar uhDepth = rpcTempCU->getDepth( 0 );
+  if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )
+  {
+    UInt SAD = m_pcRdCost->getSADPart( g_bitDepthY, m_ppcPredYuvTemp[uhDepth]->getLumaAddr(), m_ppcPredYuvTemp[uhDepth]->getStride(),
+      m_ppcOrigYuv[uhDepth]->getLumaAddr(), m_ppcOrigYuv[uhDepth]->getStride(),
+      rpcTempCU->getWidth(0), rpcTempCU->getHeight(0) );
+    m_spatialSAD = (Int)SAD;
+  }
+#elif RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
   UChar uhDepth = rpcTempCU->getDepth( 0 );
   if ( m_pcEncCfg->getUseRateCtrl() && m_pcEncCfg->getLCULevelRC() && eSize == SIZE_2Nx2N && uhDepth <= m_addSADDepth )

branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncCu.h

@@ -102 +102 @@
   Bool                    m_bUseSBACRD;
   TEncRateCtrl*           m_pcRateCtrl;
-#if (RATE_CONTROL_LAMBDA_DOMAIN && !M0036_RC_IMPROVEMENT) || KWU_RC_MADPRED_E0227
+#if RATE_CONTROL_LAMBDA_DOMAIN
+#if !M0036_RC_IMPROVEMENT
+  UInt                    m_LCUPredictionSAD;
+  Int                     m_addSADDepth;
+  Int                     m_temporalSAD;
+#endif
+#if M0036_RC_IMPROVEMENT && KWU_RC_MADPRED_E0227
+  UInt                    m_LCUPredictionSAD;
+  Int                     m_addSADDepth;
+  Int                     m_temporalSAD;
+#endif
+#endif
+#if KWU_RC_MADPRED_E0227
   UInt                    m_LCUPredictionSAD;
   Int                     m_addSADDepth;
@@ -108 +120 @@
   Int                     m_spatialSAD;
 #endif
+
 public:
   /// copy parameters from encoder class

branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncRateCtrl.cpp

@@ -726 +726 @@
   m_lastPicture = NULL;
   list<TEncRCPic*>::reverse_iterator it;
-#if KWU_RC_MADPRED_E0227
   for ( it = listPreviousPictures.rbegin(); it != listPreviousPictures.rend(); it++ )
   {
@@ -735 +734 @@
     }
   }
-#endif
 #endif
 
@@ -2486 +2484 @@
 {
   Int     x, y;
-  double dMAD = 0.0;
+  Double dMAD = 0.0;
   Int Sum = 0;
   Double SAD = 0.0;

branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -1139 +1139 @@
       if(pcSlice->getLayerId() != 0 && m_pcCfg->getUseDepthMADPred() && !pcSlice->getIsDepth())
       {
-        double zn, zf, focallength, position, camshift;
-        double basepos;
-        bool bInterpolated;
+        Double zn, zf, focallength, position, camshift;
+        Double basepos;
+        Bool bInterpolated;
         Int direction = pcSlice->getViewId() - pcCU->getSlice()->getIvPic(false, 0)->getViewId();
 
@@ -1252 +1252 @@
           if(pcSlice->getLayerId() != 0 && m_pcCfg->getUseDepthMADPred() && !pcSlice->getIsDepth())
           {
-            double zn, zf, focallength, position, camShift;
-            double basePos;
-            bool bInterpolated;
+            Double zn, zf, focallength, position, camShift;
+            Double basePos;
+            Bool bInterpolated;
             Int direction = pcSlice->getViewId() - pcCU->getSlice()->getIvPic(false, 0)->getViewId();
             Int disparity;