Changeset 1078 in 3DVCSoftware for branches/HTM-12.1-dev0/source/Lib/TLibCommon

Timestamp:

21 Oct 2014, 22:36:22 (10 years ago)

Author:

tech

Message:

Removed MV-HEVC related macros part 4.

Location:

branches/HTM-12.1-dev0/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (3 diffs)
• TypeDef.h (modified) (2 diffs)

branches/HTM-12.1-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -4382 +4382 @@
 , m_nonPackedConstraintFlag(false)
 , m_frameOnlyConstraintFlag(false)
+#if H_MV
   , m_max12bitConstraintFlag      ( false )
   , m_max10bitConstraintFlag      ( false )
@@ -4392 +4393 @@
   , m_lowerBitRateConstraintFlag  ( false )
   , m_inbldFlag                   ( false )
+#endif
 {
   ::memset(m_profileCompatibilityFlag, 0, sizeof(m_profileCompatibilityFlag));
 }
 
+#if H_MV
 Bool ProfileTierLevel::getV2ConstraintsPresentFlag()
 {
@@ -4440 +4443 @@
   copyV2ConstraintFlags      ( ptlRef );
 }
-
+#endif
 
 TComPTL::TComPTL()

branches/HTM-12.1-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -367 +367 @@
 /////////////////////////////////////////////////////////////////////////////////
 // TBD: Check if integration is necessary. 
-
+#define H_MV_HLS_PTL_LIMITS                  0
 #define H_MV_HLS7_GEN                        0  // General changes (not tested)
 
@@ -434 +434 @@
 
 #define MAX_VPS_NUM_HRD_PARAMETERS                1024
+#if H_MV
 #define MAX_NUM_SUB_LAYERS                        7
 #define MAX_NUM_SIGNALLED_PARTITIONING_SCHEMES    16
-
+#endif
 #define MAX_VPS_OP_SETS_PLUS1                     1024
 #if H_MV