Changeset 639 in 3DVCSoftware for branches/HTM-8.2-dev0-KWU/source/Lib

Timestamp:

18 Oct 2013, 07:01:35 (11 years ago)

Author:

kwu-htm

Message:

Macro cleaned up.

Location:

branches/HTM-8.2-dev0-KWU/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncCu.cpp (modified) (2 diffs)
• TLibEncoder/TEncCu.h (modified) (1 diff)

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

@@ -312 +312 @@
 #endif
 
-#define KWU_RC_VIEWRC_E0227                         1  ///< JCT3V-E0227, view-wise target bitrate allocation
-#define KWU_RC_MADPRED_E0227                        1  ///< JCT3V-E0227, inter-view MAD prediction
+#define KWU_RC_VIEWRC_E0227                         0  ///< JCT3V-E0227, view-wise target bitrate allocation
+#define KWU_RC_MADPRED_E0227                        0  ///< JCT3V-E0227, inter-view MAD prediction
 
 #define MAX_CPB_CNT                     32  ///< Upper bound of (cpb_cnt_minus1 + 1)

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

@@ -113 +113 @@
   m_addSADDepth      = 0;
   m_temporalSAD      = 0;
-#endif
-#endif
-#if KWU_RC_MADPRED_E0227
+  m_spatialSAD       = 0;
+#endif
+#endif
+#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
   m_LCUPredictionSAD = 0;
   m_addSADDepth      = 0;
@@ -279 +280 @@
   m_addSADDepth      = 0;
   m_temporalSAD      = 0;
+  m_spatialSAD       = 0;
 #endif
 #endif

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

@@ -112 +112 @@
   Int                     m_addSADDepth;
   Int                     m_temporalSAD;
-#endif
-#endif
-#if KWU_RC_MADPRED_E0227
+  Int                     m_spatialSAD;
+#endif
+#endif
+#if !RATE_CONTROL_LAMBDA_DOMAIN && KWU_RC_MADPRED_E0227
   UInt                    m_LCUPredictionSAD;
   Int                     m_addSADDepth;