Changeset 593 in SHVCSoftware for branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

Timestamp:

2 Feb 2014, 04:51:29 (11 years ago)

Author:

seregin

Message:

update to HM-13.0

File:

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

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

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+ * Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -404 +404 @@
 #endif
 #endif
-#if !HM_CLEANUP_SAO
-    rpcPic->getPicSym()->allocSaoParam(&m_cSAO);
-#endif
     m_cListPic.pushBack( rpcPic );
     
@@ -485 +482 @@
 #endif
 #endif
-#endif
-#if !HM_CLEANUP_SAO
-  rpcPic->getPicSym()->allocSaoParam(&m_cSAO);
 #endif
 }
@@ -784 +778 @@
 #if REPN_FORMAT_IN_VPS
 #if AUXILIARY_PICTURES
-#if HM_CLEANUP_SAO
   m_cSAO.create( m_apcSlicePilot->getPicWidthInLumaSamples(), m_apcSlicePilot->getPicHeightInLumaSamples(), sps->getChromaFormatIdc(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth() );
 #else
-  m_cSAO.create( m_apcSlicePilot->getPicWidthInLumaSamples(), m_apcSlicePilot->getPicHeightInLumaSamples(), sps->getMaxCUWidth(), sps->getMaxCUHeight() );
-#endif
-#else
-#if HM_CLEANUP_SAO
   m_cSAO.create( m_apcSlicePilot->getPicWidthInLumaSamples(), m_apcSlicePilot->getPicHeightInLumaSamples(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth() );
-#else
-  m_cSAO.create( m_apcSlicePilot->getPicWidthInLumaSamples(), m_apcSlicePilot->getPicHeightInLumaSamples(), sps->getMaxCUWidth(), sps->getMaxCUHeight() );
-#endif
-#endif
-#else
-#if HM_CLEANUP_SAO
+#endif
+#else
   m_cSAO.create( sps->getPicWidthInLumaSamples(), sps->getPicHeightInLumaSamples(), sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth() );
-#else
-  m_cSAO.create( sps->getPicWidthInLumaSamples(), sps->getPicHeightInLumaSamples(), sps->getMaxCUWidth(), sps->getMaxCUHeight() );
-#endif
 #endif
   m_cLoopFilter.create( sps->getMaxCUDepth() );
@@ -817 +799 @@
 {
   TComPic*&   pcPic         = m_pcPic;
+#if SVC_EXTENSION
 #if NO_CLRAS_OUTPUT_FLAG
   Bool bFirstSliceInSeq;
 #endif
-#if SVC_EXTENSION
   m_apcSlicePilot->setVPS( m_parameterSetManagerDecoder.getPrefetchedVPS(0) );
 #if OUTPUT_LAYER_SET_INDEX
@@ -831 +813 @@
 #endif
   m_apcSlicePilot->initSlice( nalu.m_layerId );
-#else
+#else //SVC_EXTENSION
   m_apcSlicePilot->initSlice();
 #endif
@@ -839 +821 @@
     m_uiSliceIdx     = 0;
   }
+  else
+  {
+    m_apcSlicePilot->copySliceInfo( pcPic->getPicSym()->getSlice(m_uiSliceIdx-1) );
+  }
   m_apcSlicePilot->setSliceIdx(m_uiSliceIdx);
-  if (!m_bFirstSliceInPicture)
-  {
-    m_apcSlicePilot->copySliceInfo( pcPic->getPicSym()->getSlice(m_uiSliceIdx-1) );
-  }
 
   m_apcSlicePilot->setNalUnitType(nalu.m_nalUnitType);
@@ -857 +839 @@
 
 #if SVC_EXTENSION
-  m_apcSlicePilot->setSliceIdx( m_uiSliceIdx ); // it should be removed if HM will reflect it in above
 #if VPS_EXTN_DIRECT_REF_LAYERS
   setRefLayerParams(m_apcSlicePilot->getVPS());
@@ -1875 +1856 @@
       return false;
       
+      
+    case NAL_UNIT_RESERVED_VCL_N10:
+    case NAL_UNIT_RESERVED_VCL_R11:
+    case NAL_UNIT_RESERVED_VCL_N12:
+    case NAL_UNIT_RESERVED_VCL_R13:
+    case NAL_UNIT_RESERVED_VCL_N14:
+    case NAL_UNIT_RESERVED_VCL_R15:
+      
+    case NAL_UNIT_RESERVED_IRAP_VCL22:
+    case NAL_UNIT_RESERVED_IRAP_VCL23:
+      
+    case NAL_UNIT_RESERVED_VCL24:
+    case NAL_UNIT_RESERVED_VCL25:
+    case NAL_UNIT_RESERVED_VCL26:
+    case NAL_UNIT_RESERVED_VCL27:
+    case NAL_UNIT_RESERVED_VCL28:
+    case NAL_UNIT_RESERVED_VCL29:
+    case NAL_UNIT_RESERVED_VCL30:
+    case NAL_UNIT_RESERVED_VCL31:
+      
+    case NAL_UNIT_FILLER_DATA:
+    case NAL_UNIT_RESERVED_NVCL41:
+    case NAL_UNIT_RESERVED_NVCL42:
+    case NAL_UNIT_RESERVED_NVCL43:
+    case NAL_UNIT_RESERVED_NVCL44:
+    case NAL_UNIT_RESERVED_NVCL45:
+    case NAL_UNIT_RESERVED_NVCL46:
+    case NAL_UNIT_RESERVED_NVCL47:
+    case NAL_UNIT_UNSPECIFIED_48:
+    case NAL_UNIT_UNSPECIFIED_49:
+    case NAL_UNIT_UNSPECIFIED_50:
+    case NAL_UNIT_UNSPECIFIED_51:
+    case NAL_UNIT_UNSPECIFIED_52:
+    case NAL_UNIT_UNSPECIFIED_53:
+    case NAL_UNIT_UNSPECIFIED_54:
+    case NAL_UNIT_UNSPECIFIED_55:
+    case NAL_UNIT_UNSPECIFIED_56:
+    case NAL_UNIT_UNSPECIFIED_57:
+    case NAL_UNIT_UNSPECIFIED_58:
+    case NAL_UNIT_UNSPECIFIED_59:
+    case NAL_UNIT_UNSPECIFIED_60:
+    case NAL_UNIT_UNSPECIFIED_61:
+    case NAL_UNIT_UNSPECIFIED_62:
+    case NAL_UNIT_UNSPECIFIED_63:
+
     default:
       assert (0);
@@ -1954 +1980 @@
 }
 
+#if SVC_EXTENSION
 #if VPS_EXTN_DIRECT_REF_LAYERS
 TDecTop* TDecTop::getRefLayerDec( UInt refLayerIdc )
@@ -1968 +1995 @@
 
 #if VPS_EXTN_DIRECT_REF_LAYERS
-
 Void TDecTop::setRefLayerParams( TComVPS* vps )
 {
@@ -2137 +2163 @@
 }
 #endif
+#endif //SVC_EXTENSION
 //! \}