Changeset 1327 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

22 Jul 2015, 00:46:06 (10 years ago)

Author:

seregin

Message:

port rev 4405

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComRom.cpp (modified) (3 diffs)
• TComRom.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComRom.cpp

@@ -510 +510 @@
 // ====================================================================================================================
 
-#if FAST_UDI_USE_MPM
-const UChar g_aucIntraModeNumFast[MAX_CU_DEPTH] =
+const UChar g_aucIntraModeNumFast_UseMPM[MAX_CU_DEPTH] =
 {
   3,  //   2x2
@@ -520 +519 @@
   3   //  64x64
 };
-#else // FAST_UDI_USE_MPM
-const UChar g_aucIntraModeNumFast[MAX_CU_DEPTH] =
+const UChar g_aucIntraModeNumFast_NotUseMPM[MAX_CU_DEPTH] =
 {
   3,  //   2x2
@@ -530 +528 @@
   5   //  64x64   33
 };
-#endif // FAST_UDI_USE_MPM
 
 const UChar g_chroma422IntraAngleMappingTable[NUM_INTRA_MODE] =

branches/SHM-dev/source/Lib/TLibCommon/TComRom.h

@@ -142 +142 @@
 // ====================================================================================================================
 
-extern const UChar  g_aucIntraModeNumFast[MAX_CU_DEPTH];
+extern const UChar  g_aucIntraModeNumFast_UseMPM[MAX_CU_DEPTH];
+extern const UChar  g_aucIntraModeNumFast_NotUseMPM[MAX_CU_DEPTH];
 
 extern const UChar  g_chroma422IntraAngleMappingTable[NUM_INTRA_MODE];