Changeset 1312 in 3DVCSoftware for branches

Timestamp:

11 Aug 2015, 18:27:09 (9 years ago)

Author:

tech

Message:

Reordered defines.

Location:

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon

Files:

• TComRom.h (modified) (2 diffs)
• TypeDef.h (modified) (5 diffs)

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComRom.h

@@ -232 +232 @@
 #define DTRACE_CABAC_R( x,y )
 #define DTRACE_CABAC_N
-#if H_MV_ENC_DEC_TRAC
 #define DTRACE_CU(x,y) ;             
 #define DTRACE_PU(x,y) ;            
@@ -244 +243 @@
 #define D_PRINT_INDENT( b, str );
 
-#endif
 #endif
 const Char* nalUnitTypeToString(NalUnitType type);

branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TypeDef.h

@@ -60 +60 @@
 #define NH_MV          ( HEVC_EXT != 0)
 #define NH_3D          ( HEVC_EXT == 2)
-
-
 /////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////   MAJOR DEFINES   ///////////////////////////////////  
 /////////////////////////////////////////////////////////////////////////////////////////
 #if NH_MV
-
+#define NH_MV_FIX_TICKET_105              1 // layer_set_idx_for_ols_minus1 length
+#define NH_MV_FIX_TICKET_100              1 // Extra slice header bits
+#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
+#define H_MV_ENC_DEC_TRAC_FIX             1  // by SHARP
+#if NH_3D
+// FIXES 
+#define NH_3D_FIX_TICKET_98               1 // Writing of depth intra skip flag
 #define NH_3D_FIX_TICKET_101              ( 1 && NH_3D_VER141_DEC_COMP_FLAG )  // Camera parameters for depth
-#define NH_MV_FIX_TICKET_105              1 // layer_set_idx_for_ols_minus1 length
-#define NH_3D_FIX_TICKET_98               1 // Writing of depth intra skip flag
-#define NH_MV_FIX_TICKET_100              1 // Extra slice header bits
-
-
 #define NH_3D_DIS_FIX                     1
 #define NH_3D_ENC_DEPTH_FIX               1 // Fix Intra TU coding. 
@@ -81 +80 @@
 #define NH_3D_ALIGN_SPIVMP_RP             1 // Alignment of DBBP and RP
 #define NH_3D_FIX_VSP                     1 
-
-#define H_MV_ENC_DEC_TRAC                 1  //< CU/PU level tracking
-#define H_MV_ENC_DEC_TRAC_FIX             1  // by SHARP
-
-#if NH_3D
 #define NH_3D_VSO                         1
 #define NH_3D_NBDV                        1
@@ -103 +97 @@
                                               // SEC_IC_NEIGHBOR_CLIP_I0080    // Clipping of neighboring sample position, JCT3V-I0080
                                               // LGE_CHROMA_IC_J0050_J0034
-
 #define NH_3D_IC_FIX                      1   // Fix uninitialized value in cDtParam.bUseIC (it happened on intra block)
 #define NH_3D_FULL_PEL_DEPTH_MAP_MV_ACC   1   // Full Pel Interpolation for Depth, HHI_FULL_PEL_DEPTH_MAP_MV_ACC
-
 #define NH_3D_QTLPC                       1   // OL_QTLIMIT_PREDCODING_B0068 //JCT3V-B0068
                                               // HHI_QTLPC_RAU_OFF_C0160 JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units 
                                               // MTK_TEX_DEP_PAR_G0055 Texture-partition-dependent depth partition. JCT3V-G0055
-
 #define NH_3D_NBDV_REF                    1
 #define NH_3D_MLC                         1
@@ -133 +124 @@
                                               // SEC_ARP_VIEW_REF_CHECK_J0037    Signaling iv_res_pred_weight_idx when the current slice has both view and temporal reference picture(s), JCT3V-J0037 item1
                                               // SEC_ARP_REM_ENC_RESTRICT_K0035    Removal of encoder restriction of ARP, JCT3V-K0035
-
 #define NH_3D_DMM                         1   // Depth modeling modes
 #define NH_3D_DLT                         1   // Depth Lookup Table
@@ -146 +136 @@
 #define NH_3D_FAST_TEXTURE_ENCODING       1   // Fast merge mode decision and early CU determination for texture component of dependent view, JCT3V-E0173
 #endif
-
 #if H_3D
 #define H_3D_QTLPC                        1   // OL_QTLIMIT_PREDCODING_B0068 //JCT3V-B0068