Changeset 172 in SHVCSoftware for branches/SHM-2.0-dev

Timestamp:

9 May 2013, 20:26:16 (12 years ago)

Author:

seregin

Message:

code formating, m_aiNumILRRefIdx --> m_numILRRefIdx

Location:

branches/SHM-2.0-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (9 diffs)
• TComSlice.h (modified) (2 diffs)

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -124 +124 @@
   
 #if REF_IDX_FRAMEWORK
-  m_aiNumILRRefIdx = 0;
+  m_numILRRefIdx = 0;
 #endif
 #if JCTVC_M0458
@@ -185 +185 @@
   if(layerId)
   {
-    m_aiNumILRRefIdx            = m_pcVPS->getNumDirectRefLayers( layerId );
+    m_numILRRefIdx              = m_pcVPS->getNumDirectRefLayers( layerId );
 #if JCTVC_M0458
     m_aiActiveNumILRRefIdx      = 1;         
@@ -193 +193 @@
   else
   {
-    m_aiNumILRRefIdx = 0;
+    m_numILRRefIdx              = 0;
 #if JCTVC_M0458
     m_aiActiveNumILRRefIdx      = 0;
@@ -547 +547 @@
   Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + m_aiActiveNumILRRefIdx;
 #else
-  Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + m_aiNumILRRefIdx;
+  Int numPocTotalCurr = NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr + m_numILRRefIdx;
 #endif 
 #else
@@ -597 +597 @@
       for( i = 0; i < m_aiActiveNumILRRefIdx && cIdx < numPocTotalCurr; cIdx ++, i ++)      
 #else
-      for( i = 0; i < m_aiNumILRRefIdx && cIdx < numPocTotalCurr; cIdx ++, i ++)
+      for( i = 0; i < m_numILRRefIdx && cIdx < numPocTotalCurr; cIdx ++, i ++)
 #endif 
       {
@@ -625 +625 @@
       for( i = 0; i < m_aiActiveNumILRRefIdx && cIdx < numPocTotalCurr; cIdx ++, i ++)
 #else
-      for( i = 0; i < m_aiNumILRRefIdx && cIdx < numPocTotalCurr; cIdx ++, i ++)
+      for( i = 0; i < m_numILRRefIdx && cIdx < numPocTotalCurr; cIdx ++, i ++)
 #endif 
       {
@@ -699 +699 @@
       for(Int i = m_aiActiveNumILRRefIdx; i > 0; i-- )
 #else
-      for(Int i = m_aiNumILRRefIdx; i > 0; i-- )
+      for(Int i = m_numILRRefIdx; i > 0; i-- )
 #endif 
       {
@@ -729 +729 @@
       for(Int i = m_aiActiveNumILRRefIdx; i > 0; i-- )
 #else
-      for(Int i = m_aiNumILRRefIdx; i > 0; i-- )
+      for(Int i = m_numILRRefIdx; i > 0; i-- )
 #endif 
       {
@@ -756 +756 @@
     return m_aiActiveNumILRRefIdx;
 #else
-    return m_aiNumILRRefIdx;
+    return m_numILRRefIdx;
 #endif 
 #else

branches/SHM-2.0-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1418 +1418 @@
   Int         m_deblockingFilterTcOffsetDiv2;      //< tc offset for deblocking filter
 #if REF_IDX_FRAMEWORK
-  Int         m_aiNumILRRefIdx;       //< for inter-layer reference picture ser
+  Int         m_numILRRefIdx;       //< for inter-layer reference picture ser
 #endif
 #if JCTVC_M0458
@@ -1576 +1576 @@
   Int       getDeblockingFilterTcOffsetDiv2()           { return  m_deblockingFilterTcOffsetDiv2; }
 #if REF_IDX_FRAMEWORK
-  Int       getNumILRRefIdx     ( )                     { return  m_aiNumILRRefIdx; }
-  Void      setNumILRRefIdx     ( Int i )                     { m_aiNumILRRefIdx = i; }
+  Int       getNumILRRefIdx     ( )                     { return  m_numILRRefIdx; }
+  Void      setNumILRRefIdx     ( Int i )               { m_numILRRefIdx = i;     }
 #endif
 #if JCTVC_M0458