Changeset 1239 in 3DVCSoftware for branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon

Timestamp:

31 May 2015, 20:35:03 (10 years ago)

Author:

rwth

Message:

• enabled SDC encoder speedup
• fixed some compiler warnings

Location:

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

Files:

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

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

@@ -102 +102 @@
   STATS__CABAC_BITS__DMMMODE,
   STATS__CABAC_BITS__DMM1_BITS_EP,
+#endif
+#if NH_3D_SDC_INTRA
+  STATS__CABAC_BITS__SDC_INTRA_FLAG,
+  STATS__CABAC_BITS__SDC_DELTADC_FLAG,
 #endif
 
@@ -164 +168 @@
    ,"STATS__CABAC_BITS__DMM1_BITS_EP"
 #endif
+#if NH_3D_SDC_INTRA
+    ,"STATS__CABAC_BITS__SDC_INTRA_FLAG"
+    ,"STATS__CABAC_BITS__SDC_DELTADC_FLAG"
+#endif
   };
   assert(STATS__NUM_STATS == sizeof(statNames)/sizeof(Char *) && name < STATS__NUM_STATS);

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComSlice.cpp

@@ -2032 +2032 @@
 Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType ) const
 {
-  assert( scalType >= 0 && scalType <= MAX_NUM_SCALABILITY_TYPES ); 
-  assert( scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMaskFlag( scalType ) );
+  assert( (Int)scalType >= 0 && (Int)scalType <= MAX_NUM_SCALABILITY_TYPES );
+  assert( (Int)scalType == MAX_NUM_SCALABILITY_TYPES || getScalabilityMaskFlag( scalType ) );
   Int scalIdx = 0; 
   for( Int curScalType = 0; curScalType < scalType; curScalType++ )