Changeset 193 in 3DVCSoftware for branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComRdCost.h

Timestamp:

19 Nov 2012, 21:15:40 (12 years ago)

Author:

mitsubishi-htm

Message:

A second release, as planned

• Migrate to HTM 4.1
• Move VSP related switches to cfg file instead of #define in the source code
• A few bug fixes
• For VC project files, only VC9 file is updated

TODO

• Migrate to HTM 5.0, to be used as anchor for CE1 toward Geneva meeting

File:

• branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComRdCost.h (modified) (2 diffs)

branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComRdCost.h

@@ -377 +377 @@
   Bool                    m_bUseEstimatedVSD; 
 #endif
+#if LGE_WVSO_A0119
+  Int                     m_iDWeight;
+  Int                     m_iVSOWeight;
+  Int                     m_iVSDWeight;
+  Bool                    m_bUseWVSO;
+#endif
 
   Bool                    m_bUseVSO;
@@ -410 +416 @@
   Void    setVSOMode( UInt uiIn);
   UInt    getVSOMode( )                  { return m_uiVSOMode; }
-
+#if LGE_WVSO_A0119
+  Void    setUseWVSO ( Bool bIn )         { m_bUseWVSO = bIn; }; 
+  Bool    getUseWVSO ( )                  { return m_bUseWVSO;};
+  Void    setDWeight   ( Int iDWeight   ) { m_iDWeight = iDWeight; };
+  Int     getDWeight   ()                 { return m_iDWeight; };
+  Void    setVSOWeight ( Int iVSOWeight ) { m_iVSOWeight = iVSOWeight; };
+  Int     getVSOWeight ()                 { return m_iVSOWeight; };
+  Void    setVSDWeight ( Int iVSDWeight ) { m_iVSDWeight = iVSDWeight; };
+  Int     getVSDWeight ()                 { return m_iVSDWeight; };
+#endif 
 #if HHI_VSO_DIST_INT
   Void    setAllowNegDist ( Bool bAllowNegDist );