Changeset 238 in SHVCSoftware for branches/SHM-2.1-dev/source/Lib/TLibEncoder

Timestamp:

24 May 2013, 01:35:11 (12 years ago)

Author:

seregin

Message:

VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE macro clean up, related code was included under macro VPS_EXTN_DIRECT_REF_LAYERS

Location:

branches/SHM-2.1-dev/source/Lib/TLibEncoder

Files:

• TEncGOP.cpp (modified) (2 diffs)
• TEncTop.cpp (modified) (3 diffs)
• TEncTop.h (modified) (1 diff)

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -535 +535 @@
     if (m_layerId > 0)
     {
-#if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
+#if VPS_EXTN_DIRECT_REF_LAYERS
       TComList<TComPic*> *cListPic = m_ppcTEncTop[m_layerId]->getRefLayerEnc(m_layerId)->getListPic();
 #else
@@ -2631 +2631 @@
     for (Int iRefIndex = 0; iRefIndex < pcSlice->getNumRefIdx(RefPicList(iRefList)); iRefIndex++)
     {
-#if REF_IDX_FRAMEWORK && VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
+#if REF_IDX_FRAMEWORK && VPS_EXTN_DIRECT_REF_LAYERS
       if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR(m_layerId) )
       {

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -507 +507 @@
       if(m_layerId > 0)
       {
-#if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
+#if VPS_EXTN_DIRECT_REF_LAYERS
         TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId );
 #else
@@ -535 +535 @@
       if(m_layerId > 0)
       {
-#if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
+#if VPS_EXTN_DIRECT_REF_LAYERS
         TEncTop *pcEncTopBase = (TEncTop *)getRefLayerEnc( m_layerId );
 #else
@@ -1192 +1192 @@
 
 #if SVC_EXTENSION
-#if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
+#if VPS_EXTN_DIRECT_REF_LAYERS
 TEncTop* TEncTop::getRefLayerEnc( UInt layerId )
 {

branches/SHM-2.1-dev/source/Lib/TLibEncoder/TEncTop.h

@@ -230 +230 @@
   Void      encode( TComPicYuv* pcPicYuvOrg, TComList<TComPicYuv*>& rcListPicYuvRecOut, std::list<AccessUnit>& accessUnitsOut, Int iPicIdInGOP  );
   Void      encodePrep( TComPicYuv* pcPicYuvOrg );
-#if VPS_EXTN_DIRECT_REF_LAYERS_CONTINUE
+#if VPS_EXTN_DIRECT_REF_LAYERS
   TEncTop*  getRefLayerEnc(UInt layerId);
 #endif