Changeset 200 in 3DVCSoftware for branches/HTM-5.0-Nokia/source/Lib/TLibCommon

Timestamp:

3 Dec 2012, 16:57:58 (12 years ago)

Author:

nokia

Message:

Reintegration of Flexible Coding Order to 3DV-HTM v5.1
To enable following params are required:
FCO : 1
FCOCodingOrder : T0D0D1D2T1T2
VSOConfig: [ox0 B(cc1) I(s0.25 s0.5 s0.75)][cx1 B(oo0) B(oo2) I(s0.25 s0.5 s0.75 s1.25 s1.5 s1.75)][ox2 B(cc1) I(s1.25 s1.5 s1.75)]

Location:

branches/HTM-5.0-Nokia/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.cpp

@@ -1594 +1594 @@
 , m_bUseDMM                   (false)
 #endif
+
+#if FLEX_CODING_ORDER && HHI_DMM_PRED_TEX
+, m_bUseDMM34                   (false)
+#endif
+
 #if OL_QTLIMIT_PREDCODING_B0068
 , m_bUseQTLPC                 (false)

branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TComSlice.h

@@ -394 +394 @@
 #endif
 
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+  Bool  m_bUseDMM34;
+#endif
+
 #if OL_QTLIMIT_PREDCODING_B0068
   Bool m_bUseQTLPC;
@@ -674 +678 @@
 #endif
 
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+  Bool getUseDMM34()         { return m_bUseDMM34; }
+  Void setUseDMM34( Bool b ) { m_bUseDMM34 = b;    }
+#endif
+
 #if OL_QTLIMIT_PREDCODING_B0068
   Void setUseQTLPC( Bool b ) { m_bUseQTLPC = b;    }

branches/HTM-5.0-Nokia/source/Lib/TLibCommon/TypeDef.h

@@ -62 +62 @@
 
 
+// FCO 
+#define FLEX_CODING_ORDER               1
+#if FLEX_CODING_ORDER
+  #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.
+#endif
+
 ///// ***** PATCHES *********
 #define TMVP_DEPTH_SWITCH                 1   // JCT3V-B0092 additional encoder option only