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

Timestamp:

24 Nov 2015, 03:13:36 (9 years ago)

Author:

fujitsu

Message:

Added support of scalable range extension profiles. Also corrected few issues such as the confWindow wrong initialization. Code is controlled by the macro SCALABLE_REXT.

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (5 diffs)
• TDecCAVLC.h (modified) (1 diff)
• TDecEntropy.h (modified) (2 diffs)
• TDecSbac.h (modified) (1 diff)
• TDecTop.cpp (modified) (1 diff)

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

@@ -681 +681 @@
 }
 
+#if SCALABLE_REXT
+Void TDecCavlc::parseSPS(TComSPS* pcSPS, ParameterSetManager* pcParamSetManager)
+#else
 Void TDecCavlc::parseSPS(TComSPS* pcSPS)
+#endif
 {
 #if ENC_DEC_TRACE
@@ -689 +693 @@
   UInt  uiCode;
   READ_CODE( 4,  uiCode, "sps_video_parameter_set_id");          pcSPS->setVPSId        ( uiCode );
-
+#if SCALABLE_REXT
+  const TComVPS* pTmpVPS = pcParamSetManager->getVPS(pcSPS->getVPSId()); 
+#endif
 #if SVC_EXTENSION
   UInt uiTmp = 0;
@@ -742 +748 @@
       pcSPS->setUpdateRepFormatIndex(uiCode);
     }
+#if SCALABLE_REXT
+    // If update_rep_format_flag is equal to 0, the variable repFormatIdx is set equal to vps_rep_format_idx[ LayerIdxInVps[ layerIdCurr ] ].
+    else
+    {
+      Int iVPSRepFormatIdx = pTmpVPS->getVpsRepFormatIdx( pTmpVPS->getLayerIdxInVps( pcSPS->getLayerId() ) );
+      pcSPS->setUpdateRepFormatIndex( iVPSRepFormatIdx );
+
+      pcSPS->setChromaFormatIdc(              pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getChromaFormatVpsIdc() );
+      pcSPS->setPicWidthInLumaSamples(        pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getPicWidthVpsInLumaSamples() );
+      pcSPS->setPicHeightInLumaSamples(       pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getPicHeightVpsInLumaSamples() );
+      pcSPS->setBitDepth(CHANNEL_TYPE_LUMA,   pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getBitDepthVpsLuma() );
+      pcSPS->setBitDepth(CHANNEL_TYPE_CHROMA, pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getBitDepthVpsChroma() );
+      Window &conf = pcSPS->getConformanceWindow();
+      conf.setWindowLeftOffset(               pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getConformanceWindowVps().getWindowLeftOffset() );
+      conf.setWindowRightOffset(              pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getConformanceWindowVps().getWindowRightOffset() );
+      conf.setWindowTopOffset(                pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getConformanceWindowVps().getWindowTopOffset() );
+      conf.setWindowBottomOffset(             pTmpVPS->getVpsRepFormat(iVPSRepFormatIdx)->getConformanceWindowVps().getWindowBottomOffset() );
+    }
+#endif
   }
   else
@@ -2166 +2191 @@
 
   if (ptl->getProfileIdc() == Profile::MAINREXT           || ptl->getProfileCompatibilityFlag(Profile::MAINREXT) ||
-      ptl->getProfileIdc() == Profile::HIGHTHROUGHPUTREXT || ptl->getProfileCompatibilityFlag(Profile::HIGHTHROUGHPUTREXT))
+      ptl->getProfileIdc() == Profile::HIGHTHROUGHPUTREXT || ptl->getProfileCompatibilityFlag(Profile::HIGHTHROUGHPUTREXT
+#if SCALABLE_REXT
+      || ptl->getProfileIdc() == Profile::SCALABLEREXT
+#endif
+      ))
   {
     UInt maxBitDepth=16;
@@ -2979 +3008 @@
             ProfileTierLevel* ptl = vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL();
             numIncludedLayers++;
+#if SCALABLE_REXT
+            // if scalable profile is Scalable Main 10 or Scalable Rext, dimension_id = 2
+            const Profile::Name profileName = ( ptl->getProfileIdc() == Profile::SCALABLEMAIN10 || ptl->getProfileIdc() == Profile::SCALABLEREXT ) ? Profile::SCALABLEMAIN : ptl->getProfileIdc();
+#else
             const Profile::Name profileName = ptl->getProfileIdc() == Profile::SCALABLEMAIN10 ? Profile::SCALABLEMAIN : ptl->getProfileIdc();
+#endif
 
             for( Int p = 0; p < profiles.size(); p++ )

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

@@ -76 +76 @@
   Void  parseQtRootCbf      ( UInt uiAbsPartIdx, UInt& uiQtRootCbf );
   Void  parseVPS            ( TComVPS* pcVPS );
+#if SCALABLE_REXT
+  Void  parseSPS            ( TComSPS* pcSPS, ParameterSetManager* pcParamSetManager );
+#else
   Void  parseSPS            ( TComSPS* pcSPS );
+#endif
 #if !SVC_EXTENSION
   Void  parsePPS            ( TComPPS* pcPPS );

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

@@ -70 +70 @@
 
   virtual Void  parseVPS                  ( TComVPS* pcVPS )     = 0;
+#if SCALABLE_REXT
+  virtual Void  parseSPS                  ( TComSPS* pcSPS, ParameterSetManager* pcParamSetManager )     = 0;
+#else
   virtual Void  parseSPS                  ( TComSPS* pcSPS )     = 0;
+#endif
 #if CGS_3D_ASYMLUT
   virtual Void  parsePPS                  ( TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT , Int nLayerID )     = 0;
@@ -143 +147 @@
 
   Void    decodeVPS                   ( TComVPS* pcVPS ) { m_pcEntropyDecoderIf->parseVPS(pcVPS); }
+#if SCALABLE_REXT
+  Void    decodeSPS                   ( TComSPS* pcSPS, ParameterSetManager* pcParamSetManager ) { m_pcEntropyDecoderIf->parseSPS(pcSPS, pcParamSetManager); }
+#else
   Void    decodeSPS                   ( TComSPS* pcSPS ) { m_pcEntropyDecoderIf->parseSPS(pcSPS); }
+#endif
 
 #if CGS_3D_ASYMLUT

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

@@ -78 +78 @@
   Void  setBitstream              ( TComInputBitstream* p  ) { m_pcBitstream = p; m_pcTDecBinIf->init( p ); }
   Void  parseVPS                  ( TComVPS* /*pcVPS*/ ) {}
+#if SCALABLE_REXT
+  Void  parseSPS                  (TComSPS*  /*pcSPS*/, ParameterSetManager* /*pcParamSetManager*/ ) {}
+#else
   Void  parseSPS                  ( TComSPS* /*pcSPS*/ ) {}
+#endif
 #if CGS_3D_ASYMLUT
   Void  parsePPS                  ( TComPPS* /*pcPPS*/, TCom3DAsymLUT * /*pc3DAsymLUT*/, Int /*nLayerID*/ ) {}

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

@@ -1939 +1939 @@
   sps->setLayerId(m_layerId);
 #endif
+#if SCALABLE_REXT
+  m_cEntropyDecoder.decodeSPS( sps, &m_parameterSetManager );
+#else
   m_cEntropyDecoder.decodeSPS( sps );
+#endif
   m_parameterSetManager.storeSPS(sps, naluData);
 }