Changeset 175 in 3DVCSoftware for branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon

Timestamp:

9 Nov 2012, 15:31:44 (12 years ago)

Author:

tech

Message:

Fixed wrong data types in RDO (FIX_RDO_NEGDIST)

Location:

branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon

Files:

• TComDataCU.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TComDataCU.h

@@ -236 +236 @@
   Bool          m_bDecSubCu;          ///< indicates decoder-mode
   Double        m_dTotalCost;         ///< sum of partition RD costs
+#if FIX_RDO_NEGDIST
+  Dist          m_uiTotalDistortion;  ///< sum of partition distortion
+#else
   UInt          m_uiTotalDistortion;  ///< sum of partition distortion
+#endif
   UInt          m_uiTotalBits;        ///< sum of partition bits
   UInt          m_uiTotalBins;       ///< sum of partition bins
@@ -736 +740 @@
   
   Double&       getTotalCost()                  { return m_dTotalCost;        }
+#if FIX_RDO_NEGDIST
+  Dist&         getTotalDistortion()            { return m_uiTotalDistortion; }
+#else
   UInt&         getTotalDistortion()            { return m_uiTotalDistortion; }
+#endif
   UInt&         getTotalBits()                  { return m_uiTotalBits;       }
   UInt&         getTotalNumPart()               { return m_uiNumPartition;    }

branches/HTM-4.1-dev1-HHI/source/Lib/TLibCommon/TypeDef.h

@@ -60 +60 @@
 #define FIX_LGE_IVMP_PARALLEL_MERGE_B0136 1
 #define TMVP_DEPTH_SWITCH                 1 // related to JCT3V-B0092
-
+#define FIX_RDO_NEGDIST                   1
 
 #define DV_DERIVATION_PARALLEL_B0096      1 //JCT3V-B0096, enable parallel derivation of disparity vector