Changeset 55 in SHVCSoftware for trunk/source/Lib/TLibDecoder

Timestamp:

4 Mar 2013, 22:43:28 (12 years ago)

Author:

seregin

Message:

Reintegrate SHM-1.1-dev branch into the trunk

Location:

trunk/source

Files:

• . (modified) (1 prop)
• Lib/TLibDecoder/TDecCu.cpp (modified) (2 diffs)
• Lib/TLibDecoder/TDecTop.cpp (modified) (10 diffs)
• Lib/TLibDecoder/TDecTop.h (modified) (2 diffs)

trunk/source/Lib/TLibDecoder/TDecCu.cpp

@@ -546 +546 @@
   
   //===== get prediction signal =====
-#if INTRA_BL
+#if INTRA_BL && !NO_RESIDUAL_FLAG_FOR_BLPRED
   if(pcCU->isIntraBL ( uiAbsPartIdx ) )
   {
@@ -651 +651 @@
   
   //===== get prediction signal =====
-#if INTRA_BL
+#if INTRA_BL && !NO_RESIDUAL_FLAG_FOR_BLPRED
   if(pcCU->isIntraBL ( uiAbsPartIdx ) )
   {

trunk/source/Lib/TLibDecoder/TDecTop.cpp

@@ -81 +81 @@
   memset(m_cIlpPic, 0, sizeof(m_cIlpPic));
 #endif
+#if AVC_SYNTAX || SYNTAX_OUTPUT
+  m_pBLSyntaxFile = NULL;
+#endif
 
 }
@@ -335 +338 @@
 
   m_cGopDecoder.filterPicture(pcPic);
+
+#if SYNTAX_OUTPUT
+  pcPic->wrireBLSyntax( getBLSyntaxFile(), SYNTAX_BYTES );
+#endif
 
   TComSlice::sortPicList( m_cListPic ); // sorting for application output
@@ -554 +561 @@
   if (m_bFirstSliceInPicture)
   {
-
 #if AVC_BASE
   if( m_layerId == 1 )
   {
     TComPic* pBLPic = (*m_ppcTDecTop[0]->getListPic()->begin());
-    FILE* pFile = m_ppcTDecTop[0]->getBLReconFile();
-    UInt uiWidth = pBLPic->getPicYuvRec()->getWidth();
-    UInt uiHeight = pBLPic->getPicYuvRec()->getHeight();
+    fstream* pFile  = m_ppcTDecTop[0]->getBLReconFile();
+    UInt uiWidth    = pBLPic->getPicYuvRec()->getWidth() - pBLPic->getPicYuvRec()->getPicCropLeftOffset() - pBLPic->getPicYuvRec()->getPicCropRightOffset();;
+    UInt uiHeight   = pBLPic->getPicYuvRec()->getHeight() - pBLPic->getPicYuvRec()->getPicCropTopOffset() - pBLPic->getPicYuvRec()->getPicCropBottomOffset();
         
-    if( pFile )
-    {
-      fseek( pFile, m_apcSlicePilot->getPOC() * uiWidth * uiHeight * 3 / 2, SEEK_SET );
+    if( pFile->good() )
+    {
+      UInt64 uiPos = (UInt64) m_apcSlicePilot->getPOC() * uiWidth * uiHeight * 3 / 2;
+
+      pFile->seekg((UInt)uiPos, ios::beg );
 
       Pel* pPel = pBLPic->getPicYuvRec()->getLumaAddr();
@@ -573 +581 @@
         for( Int j = 0; j < uiWidth; j++ )
         {
-          pPel[j] = fgetc( pFile );
+          pPel[j] = pFile->get();
         }
         pPel += uiStride;
@@ -584 +592 @@
         for( Int j = 0; j < uiWidth/2; j++ )
         {
-          pPel[j] = fgetc( pFile );
+          pPel[j] = pFile->get();
         }
         pPel += uiStride;
@@ -595 +603 @@
         for( Int j = 0; j < uiWidth/2; j++ )
         {
-          pPel[j] = fgetc( pFile );
+          pPel[j] = pFile->get();
         }
         pPel += uiStride;
@@ -737 +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 );
@@ -747 +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 );
@@ -767 +788 @@
 
 #if REF_IDX_FRAMEWORK
+#if !AVC_SYNTAX
     // Set reference list
     pcSlice->setRefPicList( m_cListPic );
+#endif
     if(m_layerId > 0)
     {
@@ -979 +1002 @@
         {
 #if SVC_UPSAMPLING
+#if AVC_SYNTAX
+          TComSPS* sps = new TComSPS();
+          pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, sps, true);
+#else
           pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, NULL, true);
+#endif
 #else
           pBLPic->create( m_ppcTDecTop[0]->getBLWidth(), m_ppcTDecTop[0]->getBLHeight(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true);

trunk/source/Lib/TLibDecoder/TDecTop.h

@@ -127 +127 @@
   TDecTop**               m_ppcTDecTop;
 #if AVC_BASE
-  FILE*                   m_pBLReconFile;
+  fstream*                m_pBLReconFile;
   Int                     m_iBLSourceWidth;
   Int                     m_iBLSourceHeight;
 #endif
 #endif 
+#if AVC_SYNTAX || SYNTAX_OUTPUT
+  fstream*               m_pBLSyntaxFile;
+#endif
 #if REF_IDX_FRAMEWORK
   TComPic*                m_cIlpPic[MAX_NUM_REF];                    ///<  Inter layer Prediction picture =  upsampled picture 
@@ -165 +168 @@
   TDecTop*            getLayerDec(UInt layer)   { return m_ppcTDecTop[layer]; }
 #if AVC_BASE
-  Void      setBLReconFile( FILE* pFile ) { m_pBLReconFile = pFile; }
-  FILE*     getBLReconFile() { return m_pBLReconFile; }
+  Void      setBLReconFile( fstream* pFile ) { m_pBLReconFile = pFile; }
+  fstream*  getBLReconFile() { return m_pBLReconFile; }
   Void      setBLsize( Int iWidth, Int iHeight ) { m_iBLSourceWidth = iWidth; m_iBLSourceHeight = iHeight; }
   Int       getBLWidth() { return  m_iBLSourceWidth; }
   Int       getBLHeight() { return  m_iBLSourceHeight; }
 #endif
+#endif
+#if AVC_SYNTAX || SYNTAX_OUTPUT
+  Void      setBLSyntaxFile( fstream* pFile ) { m_pBLSyntaxFile = pFile; }
+  fstream* getBLSyntaxFile() { return m_pBLSyntaxFile; }
 #endif
 #if REF_IDX_FRAMEWORK