Changeset 1482 in SHVCSoftware

Timestamp:

18 Oct 2015, 13:24:37 (9 years ago)

Author:

seregin

Message:

remove layerId class member from TDecGop

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecGop.cpp (modified) (2 diffs)
• TDecGop.h (modified) (2 diffs)
• TDecTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.cpp

@@ -77 +77 @@
 }
 
-#if SVC_EXTENSION
-Void TDecGop::create(UInt layerId)
-{
-  m_layerId = layerId;
-}
-#else
 Void TDecGop::create()
 {
 
 }
-#endif
 
 Void TDecGop::destroy()
@@ -212 +205 @@
     {
 #if SVC_EXTENSION
-      if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR( m_layerId ) )
+      if( pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->isILR( pcSlice->getLayerId() ) )
       {
         UInt refLayerId = pcSlice->getRefPic(RefPicList(iRefList), iRefIndex)->getLayerId();

branches/SHM-dev/source/Lib/TLibDecoder/TDecGop.h

@@ -83 +83 @@
 
 #if SVC_EXTENSION
-  UInt                  m_layerId;
   TDecTop**             m_ppcTDecTop;
 #endif
@@ -103 +102 @@
                  TComSampleAdaptiveOffset* pcSAO
                  );
-#if SVC_EXTENSION
-  Void  create  (UInt layerId);
-#else
   Void  create  ();
-#endif
   Void  destroy ();
   Void  decompressSlice(TComInputBitstream* pcBitstream, TComPic* pcPic );

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

@@ -168 +168 @@
 Void TDecTop::create()
 {
-#if SVC_EXTENSION
-  m_cGopDecoder.create( m_layerId );
-#else
   m_cGopDecoder.create();
-#endif
   m_apcSlicePilot = new TComSlice;
+#if SVC_EXTENSION
+  m_apcSlicePilot->setLayerId(m_layerId);
+#endif
   m_uiSliceIdx = 0;
 }