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

Timestamp:

4 Dec 2012, 23:29:29 (12 years ago)

Author:

nokia

Message:

1. Recommended coding style changes
2. Disabling Compile flags:

#define QC_IV_AS_LT_B0046 0
#define QC_TMVP_IDX_MOD_B0046 0
#define QC_REM_IDV_B0046 0
#define FIX_DEL_NULLPTR 0

Location:

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

Files:

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

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

@@ -1595 +1595 @@
 #endif
 
-#if FLEX_CODING_ORDER && HHI_DMM_PRED_TEX
+#if FLEX_CODING_ORDER_M23723 && HHI_DMM_PRED_TEX
 , m_bUseDMM34                   (false)
 #endif

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

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

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

@@ -42 +42 @@
 //! \{
 #define QC_MVHEVC_B0046                   0   //JCT3V-B0046: disable 3DHEVC tools
-#define QC_IV_AS_LT_B0046                 1   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled  
-#define QC_TMVP_IDX_MOD_B0046             1   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
-#define QC_REM_IDV_B0046                  1   //JCT3V-B0046: removal of IDV NAL unit type
-#define FIX_DEL_NULLPTR                   1
+#define QC_IV_AS_LT_B0046                 0   //JCT3V-B0046: inter-view reference pictures are treated as long-term pictures, scaling of motion vectors for DCP based on ViewId/ViewOrderIdx is disabled  
+#define QC_TMVP_IDX_MOD_B0046             0   //JCT3V-B0046: the reference index for temporal merging candidate is set to 0, as defined in HEVC
+#define QC_REM_IDV_B0046                  0   //JCT3V-B0046: removal of IDV NAL unit type
+#define FIX_DEL_NULLPTR                   0
 
 #define DV_V_RESTRICTION_B0037            1   // JCT3V-B0037 disparity vector vertical range restriction
@@ -63 +63 @@
 
 // FCO 
-#define FLEX_CODING_ORDER               1
-#if FLEX_CODING_ORDER
+#define FLEX_CODING_ORDER_M23723          1
+#if FLEX_CODING_ORDER_M23723
   #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.
 #endif