Changeset 1491 in SHVCSoftware

Timestamp:

2 Dec 2015, 23:43:17 (9 years ago)

Author:

seregin

Message:

remove VPS dependency in SPS parsing introduced in SCALABLE_REXT

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• TLibDecoder/TDecCAVLC.h (modified) (1 diff)
• TLibDecoder/TDecEntropy.h (modified) (2 diffs)
• TLibDecoder/TDecSbac.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -200 +200 @@
 // This can be enabled by the makefile
 #ifndef RExt__HIGH_BIT_DEPTH_SUPPORT
-#define RExt__HIGH_BIT_DEPTH_SUPPORT                      1 ///< 0 (default) use data type definitions for 8-10 bit video, 1 = use larger data types to allow for up to 16-bit video (originally developed as part of N0188)
+#define RExt__HIGH_BIT_DEPTH_SUPPORT                      SCALABLE_REXT ///< 0 (default) use data type definitions for 8-10 bit video, 1 = use larger data types to allow for up to 16-bit video (originally developed as part of N0188)
 #endif
 

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
@@ -693 +689 @@
   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;
@@ -748 +741 @@
       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

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;
@@ -147 +143 @@
 
   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

@@ -1936 +1936 @@
   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);
 }