Changeset 42 in SHVCSoftware for branches/SHM-1.1-dev/source/Lib/TLibDecoder

Timestamp:

21 Feb 2013, 00:01:40 (12 years ago)

Author:

seregin

Message:

initializing base layer reference lists by copying the enhancement layer picture lists structure for the AVC metadata file reading

File:

• branches/SHM-1.1-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (5 diffs)

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

@@ -561 +561 @@
   if (m_bFirstSliceInPicture)
   {
-
 #if AVC_BASE
   if( m_layerId == 1 )
@@ -609 +608 @@
       }
     }
-#if AVC_SYNTAX
-    if( m_apcSlicePilot->getPOC() == 0 )
-    {
-      // initialize partition order.
-      UInt* piTmp = &g_auiZscanToRaster[0];
-      initZscanToRaster( pBLPic->getPicSym()->getMaxDepth() + 1, 1, 0, piTmp );
-      initRasterToZscan( pBLPic->getPicSym()->getMaxCUWidth(), pBLPic->getPicSym()->getMaxCUHeight(), pBLPic->getPicSym()->getMaxDepth() + 1 );
-    }
-    pBLPic->getSlice( 0 )->setPOC( m_apcSlicePilot->getPOC() );
-    pBLPic->getSlice( 0 )->setSliceType( m_apcSlicePilot->getSliceType() );
-    pBLPic->readBLSyntax( m_ppcTDecTop[0]->getBLSyntaxFile(), SYNTAX_BYTES );
-#endif
   }
 #endif
@@ -758 +745 @@
   {
     pcSlice->checkCRA(pcSlice->getRPS(), m_pocCRA, m_prevRAPisBLA, m_cListPic);
-#if !REF_IDX_FRAMEWORK
+#if !REF_IDX_FRAMEWORK || AVC_SYNTAX
     // Set reference list
     pcSlice->setRefPicList( m_cListPic );
@@ -768 +755 @@
 #if AVC_BASE
       pcSlice->setBaseColPic ( *m_ppcTDecTop[0]->getListPic()->begin() );
+#if AVC_SYNTAX
+      TComPic* pBLPic = pcSlice->getBaseColPic();
+      if( pcSlice->getPOC() == 0 )
+      {
+        // initialize partition order.
+        UInt* piTmp = &g_auiZscanToRaster[0];
+        initZscanToRaster( pBLPic->getPicSym()->getMaxDepth() + 1, 1, 0, piTmp );
+        initRasterToZscan( pBLPic->getPicSym()->getMaxCUWidth(), pBLPic->getPicSym()->getMaxCUHeight(), pBLPic->getPicSym()->getMaxDepth() + 1 );
+      }      
+      pBLPic->getSlice( 0 )->initBaseLayerRPL( pcSlice );
+      pBLPic->readBLSyntax( m_ppcTDecTop[0]->getBLSyntaxFile(), SYNTAX_BYTES );
+#endif
+
 #else
       TDecTop *pcTDecTop = (TDecTop *)getLayerDec( m_layerId-1 );
@@ -788 +788 @@
 
 #if REF_IDX_FRAMEWORK
+#if !AVC_SYNTAX
     // Set reference list
     pcSlice->setRefPicList( m_cListPic );
+#endif
     if(m_layerId > 0)
     {