Changeset 156 in 3DVCSoftware for branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon

Timestamp:

29 Oct 2012, 02:20:31 (12 years ago)

Author:

lg

Message:

minor fix:

1. indentation correction,
2. remove outcommented source lines

Location:

branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon

Files:

• ContextTables.h (modified) (1 diff)
• TComDataCU.cpp (modified) (6 diffs)
• TComPrediction.cpp (modified) (4 diffs)
• TComSlice.cpp (modified) (1 diff)

branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon/ContextTables.h

@@ -187 +187 @@
 #if LGE_ILLUCOMP_B0045
 static const UChar 
-  INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] =  
+INIT_IC_FLAG[3][NUM_IC_FLAG_CTX] =  
 {
   { CNU,  CNU,  CNU, }, 

branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon/TComDataCU.cpp

@@ -213 +213 @@
     m_pbMergeFlag        = (Bool*  )xMalloc(Bool,   uiNumPartition);
 #if LGE_ILLUCOMP_B0045
-  m_pbICFlag           = (Bool*  )xMalloc(Bool,   uiNumPartition);
+    m_pbICFlag           = (Bool*  )xMalloc(Bool,   uiNumPartition);
 #endif
     m_puhMergeIndex      = (UChar* )xMalloc(UChar,  uiNumPartition);
@@ -362 +362 @@
     if ( m_pbMergeFlag        ) { xFree(m_pbMergeFlag);         m_pbMergeFlag       = NULL; }
 #if LGE_ILLUCOMP_B0045
-  if ( m_pbICFlag           ) { xFree(m_pbICFlag);            m_pbICFlag          = NULL; }
+    if ( m_pbICFlag           ) { xFree(m_pbICFlag);            m_pbICFlag          = NULL; }
 #endif
     if ( m_puhMergeIndex      ) { xFree(m_puhMergeIndex);       m_puhMergeIndex     = NULL; }
@@ -558 +558 @@
     m_pbMergeFlag[ui]=pcFrom->m_pbMergeFlag[ui];
 #if LGE_ILLUCOMP_B0045
-  m_pbICFlag[ui]=pcFrom->m_pbICFlag[ui];
+    m_pbICFlag[ui]=pcFrom->m_pbICFlag[ui];
 #endif
     m_puhMergeIndex[ui]=pcFrom->m_puhMergeIndex[ui];
@@ -593 +593 @@
     memset( m_pbMergeFlag       + firstElement, false,                    numElements * sizeof( *m_pbMergeFlag ) );
 #if LGE_ILLUCOMP_B0045
-  memset( m_pbICFlag          + firstElement, false,                    numElements * sizeof( *m_pbICFlag ) );
+    memset( m_pbICFlag          + firstElement, false,                    numElements * sizeof( *m_pbICFlag ) );
 #endif
     memset( m_puhMergeIndex     + firstElement, 0,                        numElements * sizeof( *m_puhMergeIndex ) );
@@ -779 +779 @@
       m_pbMergeFlag[ui] = 0;
 #if LGE_ILLUCOMP_B0045
-    m_pbICFlag[ui]    = false;
+      m_pbICFlag[ui]    = false;
 #endif
       m_puhMergeIndex[ui] = 0;
@@ -961 +961 @@
       m_pbMergeFlag[ui]=pcCU->m_pbMergeFlag[uiPartOffset+ui];
 #if LGE_ILLUCOMP_B0045
-    m_pbICFlag[ui]=pcCU->m_pbICFlag[uiPartOffset+ui];
+      m_pbICFlag[ui]=pcCU->m_pbICFlag[uiPartOffset+ui];
 #endif
       m_puhMergeIndex[ui]=pcCU->m_puhMergeIndex[uiPartOffset+ui];

branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon/TComPrediction.cpp

@@ -629 +629 @@
     {
 #if LGE_ILLUCOMP_B0045
-    if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
+      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
 #else
       if( pcCU->getSlice()->getPPS()->getUseWP())
@@ -649 +649 @@
       }
 #if LGE_ILLUCOMP_B0045
-    if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr) )
+      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr) )
 #else
       if ( pcCU->getSlice()->getPPS()->getUseWP() )
@@ -698 +698 @@
     {
 #if LGE_ILLUCOMP_B0045
-    if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
+      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
 #else
       if( pcCU->getSlice()->getPPS()->getUseWP())
@@ -723 +723 @@
 #endif  
 #if LGE_ILLUCOMP_B0045
-    if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
+      if( pcCU->getSlice()->getPPS()->getUseWP() && !pcCU->getICFlag(uiPartAddr))
 #else
       if ( pcCU->getSlice()->getPPS()->getUseWP() )

branches/HTM-4.1-dev2-LG/source/Lib/TLibCommon/TComSlice.cpp

@@ -1370 +1370 @@
       iSumOrgSAD += abs(aiCurrHist[i] - aiRefOrgHist[i]);
     }
-    //printf("iSumOrgSAD : %d\n",iSumOrgSAD);
     // Setting
     if ( iSumOrgSAD > Int(dThresholdOrgSAD * iWidth * iHeight) )
     {
       m_bApplyIC = true;
-      //printf("ApplyIC\n");
     }
     else