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

Timestamp:

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

Author:

seregin

Message:

port rev 4405

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComRom.cpp (modified) (3 diffs)
• TLibCommon/TComRom.h (modified) (1 diff)
• TLibEncoder/TEncCfg.h (modified) (3 diffs)

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];

branches/SHM-dev/source/Lib/TLibEncoder/TEncCfg.h

@@ -222 +222 @@
 
   Bool      m_bUseConstrainedIntraPred;
+  Bool      m_bFastUDIUseMPMEnabled;
   Bool      m_usePCM;
   Int       m_PCMBitDepth[MAX_NUM_CHANNEL_TYPE];
@@ -639 +640 @@
   Void      setUseEarlySkipDetection        ( Bool  b )     { m_useEarlySkipDetection = b; }
   Void      setUseConstrainedIntraPred      ( Bool  b )     { m_bUseConstrainedIntraPred = b; }
+  Void      setFastUDIUseMPMEnabled         ( Bool  b )     { m_bFastUDIUseMPMEnabled = b; }
   Void      setPCMInputBitDepthFlag         ( Bool  b )     { m_bPCMInputBitDepthFlag = b; }
   Void      setPCMFilterDisableFlag         ( Bool  b )     {  m_bPCMFilterDisableFlag = b; }
@@ -661 +663 @@
   Bool      getUseEarlySkipDetection        ()      { return m_useEarlySkipDetection; }
   Bool      getUseConstrainedIntraPred      ()      { return m_bUseConstrainedIntraPred; }
+  Bool      getFastUDIUseMPMEnabled         ()      { return m_bFastUDIUseMPMEnabled; }
   Bool      getPCMInputBitDepthFlag         ()      { return m_bPCMInputBitDepthFlag;   }
   Bool      getPCMFilterDisableFlag         ()      { return m_bPCMFilterDisableFlag;   }