Changeset 377 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncTop.cpp

Timestamp:

30 Aug 2013, 03:29:41 (11 years ago)

Author:

seregin

Message:

remove REF_IDX_FRAMEWORK macro

File:

• branches/SHM-3.1-dev/source/Lib/TLibEncoder/TEncTop.cpp (modified) (8 diffs)

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

@@ -83 +83 @@
   m_pcBitCounters          = NULL;
   m_pcRdCosts              = NULL;
-#if REF_IDX_FRAMEWORK
+#if SVC_EXTENSION
   memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
-#endif
 #if REF_IDX_MFM
   m_bMFMEnabledFlag = false;
@@ -91 +90 @@
 #if SCALED_REF_LAYER_OFFSETS
   m_numScaledRefLayerOffsets = 0;
+#endif
 #endif
 }
@@ -288 +288 @@
   delete[] m_pcRdCosts;
   
-#if !SVC_EXTENSION
-  // destroy ROM
-  destroyROM();
-#endif
-#if REF_IDX_FRAMEWORK
+#if SVC_EXTENSION
   for(Int i=0; i<MAX_NUM_REF; i++)
   {
@@ -301 +297 @@
       m_cIlpPic[i] = NULL;
     }
-  }    
+  }
+#else
+  // destroy ROM
+  destroyROM();
 #endif
   return;
@@ -346 +345 @@
   m_iSPSIdCnt ++;
   m_iPPSIdCnt ++;
-#endif
-#if REF_IDX_FRAMEWORK
   xInitILRP();
 #endif
@@ -860 +857 @@
     }
   }
-#if REF_IDX_FRAMEWORK
+#if SVC_EXTENSION
   if (!m_layerId)
   {
@@ -869 +866 @@
     m_cPPS.setListsModificationPresentFlag(true);
   }
-#endif
-#if SVC_EXTENSION
+
   m_cPPS.setPPSId         ( m_iPPSIdCnt         );
   m_cPPS.setSPSId         ( m_iSPSIdCnt         );
@@ -1215 +1211 @@
 #endif
 
-#if REF_IDX_FRAMEWORK
+#if SVC_EXTENSION
 Void TEncTop::xInitILRP()
 {