Changeset 75 in SHVCSoftware for branches

Timestamp:

11 Mar 2013, 23:06:21 (12 years ago)

Author:

seregin

Message:

remove m_bIsILR flag

Location:

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

Files:

• TLibCommon/TComPic.cpp (modified) (1 diff)
• TLibCommon/TComPic.h (modified) (2 diffs)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncTop.cpp (modified) (2 diffs)

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

@@ -70 +70 @@
 , m_bSpatialEnhLayer( false )
 , m_pcFullPelBaseRec( NULL )
-#if REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE || REF_IDX_MFM
-, m_bIsILR                                (false)
-#endif
 #endif
 {

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

@@ -94 +94 @@
   Bool                  m_bSpatialEnhLayer;       // whether current layer is a spatial enhancement layer,
   TComPicYuv*           m_pcFullPelBaseRec;    // upsampled base layer recontruction for difference domain inter prediction
-#if REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE || REF_IDX_MFM
-  Bool                  m_bIsILR;                 //  Is ILR picture
-#endif
 #endif
 
@@ -127 +124 @@
 #endif
 #if REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE || REF_IDX_MFM
-  Void          setIsILR( Bool bIsILR)      {m_bIsILR = bIsILR;}
-  Bool          getIsILR()                  {return m_bIsILR;}
+  Bool          getIsILR( UInt refLayer = 0 )   {return (getIsLongTerm() && m_layerId == refLayer);}
 #endif
 

branches/HM-10.0-dev-SHM/source/Lib/TLibDecoder/TDecTop.cpp

@@ -159 +159 @@
         m_cIlpPic[j]->create(pcSPS->getPicWidthInLumaSamples(), pcSPS->getPicHeightInLumaSamples(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
 #endif
-#if REF_IDX_ME_ZEROMV || REF_IDX_MFM
-        m_cIlpPic[j]->setIsILR(true);
-#endif
         for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
         {
@@ -178 +175 @@
     m_cIlpPic[0]->copyUpsampledPictureYuv(pcPic->getFullPelBaseRec(), m_cIlpPic[0]->getPicYuvRec());
     m_cIlpPic[0]->getSlice(0)->setPOC(pcPic->getPOC());
+    m_cIlpPic[0]->setLayerId(0); //set reference layerId
     m_cIlpPic[0]->getPicYuvRec()->setBorderExtension(false);
     m_cIlpPic[0]->getPicYuvRec()->extendPicBorder();

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

@@ -1127 +1127 @@
         m_cIlpPic[j]->create(m_iSourceWidth, m_iSourceHeight, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, conformanceWindow, defaultDisplayWindow, numReorderPics, true);
 #endif
-#if REF_IDX_ME_ZEROMV || ENCODER_FAST_MODE || REF_IDX_MFM
-        m_cIlpPic[j]->setIsILR(true);
-#endif
         for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCUsInFrame(); i++)
         {
@@ -1146 +1143 @@
     m_cIlpPic[0]->copyUpsampledPictureYuv(pcPic->getFullPelBaseRec(), m_cIlpPic[0]->getPicYuvRec());
     m_cIlpPic[0]->getSlice(0)->setPOC(pcPic->getPOC());
+    m_cIlpPic[0]->setLayerId(0); //set reference layerId
     m_cIlpPic[0]->getPicYuvRec()->setBorderExtension(false);
     m_cIlpPic[0]->getPicYuvRec()->extendPicBorder();