Changeset 95 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibCommon

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/TLibCommon

Files:

• TComDataCU.cpp (modified) (3 diffs)
• TComPic.h (modified) (1 diff)
• TComPrediction.cpp (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

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