Changeset 95 in SHVCSoftware for branches

Timestamp:

22 Mar 2013, 23:05:09 (12 years ago)

Author:

seregin

Message:

rename getIsILR to isILR

Location:

branches/HM-10.0-dev-SHM/source/Lib

Files:

• TLibCommon/TComDataCU.cpp (modified) (3 diffs)
• TLibCommon/TComPic.h (modified) (1 diff)
• TLibCommon/TComPrediction.cpp (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncGOP.cpp (modified) (2 diffs)
• TLibEncoder/TEncSearch.cpp (modified) (7 diffs)

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComDataCU.cpp

@@ -1835 +1835 @@
   {
     Int refIdxL0 = cMvFieldL0.getRefIdx();
-    if(getSlice()->getRefPic(REF_PIC_LIST_0, refIdxL0)->getIsILR())
+    if(getSlice()->getRefPic(REF_PIC_LIST_0, refIdxL0)->isILR())
     {
       checkZeroMVILR &= (cMvFieldL0.getHor() == 0 && cMvFieldL0.getVer() == 0);
@@ -1843 +1843 @@
   {
     Int refIdxL1  = cMvFieldL1.getRefIdx();
-    if(getSlice()->getRefPic(REF_PIC_LIST_1, refIdxL1)->getIsILR())
+    if(getSlice()->getRefPic(REF_PIC_LIST_1, refIdxL1)->isILR())
     {
       checkZeroMVILR &= (cMvFieldL1.getHor() == 0 && cMvFieldL1.getVer() == 0);
@@ -1859 +1859 @@
   Bool checkZeroMVILR = true;
 
-  if(getSlice()->getRefPic(eRefPicList, iRefIdx)->getIsILR())
+  if(getSlice()->getRefPic(eRefPicList, iRefIdx)->isILR())
   {
     AMVPInfo* pcAMVPInfo = getCUMvField(eRefPicList)->getAMVPInfo();

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPic.h

@@ -124 +124 @@
 #endif
 #if REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE || REF_IDX_MFM
-  Bool          getIsILR( UInt refLayer = 0 )   {return (getIsLongTerm() && m_layerId == refLayer);}
+  Bool          isILR( UInt refLayer = 0 )   {return (getIsLongTerm() && m_layerId == refLayer);}
 #endif
 

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TComPrediction.cpp

@@ -495 +495 @@
 
 #if REF_IDX_ME_ZEROMV
-  assert( ( pcCU->getSlice()->getRefPic(eRefPicList, iRefIdx)->getIsILR() && cMv.getHor() == 0 && cMv.getVer() == 0 ) || pcCU->getSlice()->getRefPic(eRefPicList, iRefIdx)->getIsILR() == false );
+  assert( ( pcCU->getSlice()->getRefPic(eRefPicList, iRefIdx)->isILR() && cMv.getHor() == 0 && cMv.getVer() == 0 ) || pcCU->getSlice()->getRefPic(eRefPicList, iRefIdx)->isILR() == false );
 #endif
 

branches/HM-10.0-dev-SHM/source/Lib/TLibCommon/TypeDef.h

@@ -57 +57 @@
 
 #define AVC_BASE                         0      ///< YUV BL reading for AVC base SVC
-#define REF_IDX_FRAMEWORK                0      ///< inter-layer reference framework
+#define REF_IDX_FRAMEWORK                1      ///< inter-layer reference framework
 
 #if SVC_UPSAMPLING

branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -571 +571 @@
       for(Int colIdx = 0; colIdx < pcSlice->getNumRefIdx( RefPicList(1 - ColFromL0Flag) ); colIdx++) 
       { 
-        if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getIsILR() ) 
+        if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->isILR() ) 
         { 
           ColRefIdx = colIdx; 
@@ -584 +584 @@
         for(Int colIdx = 0; colIdx < pcSlice->getNumRefIdx( RefPicList(1 - ColFromL0Flag) ); colIdx++) 
         { 
-          if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->getIsILR() ) 
+          if( pcSlice->getRefPic( RefPicList(1 - ColFromL0Flag), colIdx)->isILR() ) 
           { 
             ColRefIdx = colIdx; 

branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncSearch.cpp

@@ -3289 +3289 @@
 #if (ENCODER_FAST_MODE)
         TComPic* pcPic    = pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxTemp );
-        if( !testILR && pcPic->getIsILR() && (ePartSize == SIZE_2Nx2N) ) 
+        if( !testILR && pcPic->isILR() && (ePartSize == SIZE_2Nx2N) ) 
         {
           continue;
@@ -3533 +3533 @@
         Bool     testIter = true;
         TComPic* pcPic    = pcCU->getSlice()->getRefPic( RefPicList(1 - iRefList), iRefIdxBi[1 - iRefList] );
-        if(pcPic->getIsILR() && (ePartSize == SIZE_2Nx2N))
+        if(pcPic->isILR() && (ePartSize == SIZE_2Nx2N))
+        {
           testIter = false;  //the fixed part is ILR, skip this iteration       
+        }
         if(testIter)
         {
@@ -3544 +3546 @@
         {
 #if (ENCODER_FAST_MODE)
-            Bool testRefIdx = true;
-            pcPic           = pcCU->getSlice()->getRefPic( RefPicList(iRefList) , iRefIdxTemp );
-            if(pcPic->getIsILR() && (ePartSize == SIZE_2Nx2N))
-              testRefIdx = false;  //the refined part is ILR, skip this reference pic           
-            if(testRefIdx)
-            {
+          Bool testRefIdx = true;
+          pcPic           = pcCU->getSlice()->getRefPic( RefPicList(iRefList) , iRefIdxTemp );
+          if(pcPic->isILR() && (ePartSize == SIZE_2Nx2N))
+          {
+            testRefIdx = false;  //the refined part is ILR, skip this reference pic           
+          }
+          if(testRefIdx)
+          {
 #endif
           uiBitsTemp = uiMbBits[2] + uiMotBits[1-iRefList];
@@ -3585 +3589 @@
           }
 #if (ENCODER_FAST_MODE)
-            }
-#endif
           }
+#endif
+        }
 #if (ENCODER_FAST_MODE)
         } // for loop-iRefIdxTemp
@@ -4208 +4212 @@
   //  Do integer search
 #if REF_IDX_ME_ZEROMV
-  if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->getIsILR())  //ILR reference pic 
+  if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->isILR())  //ILR reference pic 
   {
     rcMv.setZero();  //use Mv(0, 0) for integer ME 
@@ -4241 +4245 @@
   {
 #if REF_IDX_ME_ZEROMV
-    if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->getIsILR())  //ILR reference pic
+    if( pcCU->getSlice()->getRefPic( eRefPicList, iRefIdxPred )->isILR())  //ILR reference pic
     {
       xPatternSearchFracDIFMv0( pcCU, pcPatternKey, piRefY, iRefStride, &rcMv, cMvHalf, cMvQter, ruiCost, bBi );
@@ -6214 +6218 @@
     Bool foundILR    = false;
     for( Int refIdx = 0; refIdx < pcCU->getSlice()->getNumRefIdx(eRefPicList); refIdx++ )
-      if( pcCU->getSlice()->getRefPic(eRefPicList, refIdx)->getIsILR() )
+      if( pcCU->getSlice()->getRefPic(eRefPicList, refIdx)->isILR() )
       {
         iRefIdxTemp = refIdx;