Changeset 139 in 3DVCSoftware for branches/HTM-4.0-Nokia/source/Lib/TLibCommon

Timestamp:

24 Sep 2012, 14:08:01 (13 years ago)

Author:

nokia

Message:

3DV-HTM v4.0: FCO

Location:

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

Files:

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

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

@@ -1441 +1441 @@
 , m_bUseDMM                   (false)
 #endif
+
+#if FLEX_CODING_ORDER && HHI_DMM_PRED_TEX
+, m_bUseDMM34                   (false)
+#endif
+
 {
   // AMVP parameter

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

@@ -354 +354 @@
 #endif
 
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+  Bool  m_bUseDMM34;
+#endif
+
 #if DEPTH_MAP_GENERATION
   UInt  m_uiPredDepthMapGeneration;
@@ -382 +386 @@
   Void setVPSId       (Int i)    { m_VPSId = i;             }
 #endif
-  Int  getSPSId       ()         { return m_SPSId;          }
+  Int  getSPSId       ()         
+  { return m_SPSId;          }
   Void setSPSId       (Int i)    { m_SPSId = i;             }
   Int  getProfileIdc  ()         { return m_ProfileIdc;     }
@@ -619 +624 @@
 #endif
 
+#if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER
+  Bool getUseDMM34()         { return m_bUseDMM34; }
+  Void setUseDMM34( Bool b ) { m_bUseDMM34 = b;    }
+#endif
+
   Void initMultiviewSPS      ( UInt uiViewId, Int iViewOrderIdx = 0, UInt uiCamParPrecision = 0, Bool bCamParSlice = false, Int** aaiScale = 0, Int** aaiOffset = 0 );
   Void initMultiviewSPSDepth ( UInt uiViewId, Int iViewOrderIdx );

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

@@ -46 +46 @@
 #define FIX_DECODING_WO_WRITING           1
 #define FIX_INIT_ROM                      1
+
 #define FIX_VIRT_DESTRUCTOR               1
+
+
+
+
+#define FLEX_CODING_ORDER               1
+#if FLEX_CODING_ORDER
+  #define DISABLE_FCO_FOR_VSO             1
+#else
+  #define DISABLE_FCO_FOR_VSO             0
+#endif
+