Changeset 962 in SHVCSoftware for branches/SHM-upgrade/source/Lib

Timestamp:

6 Jan 2015, 04:36:57 (10 years ago)

Author:

seregin

Message:

port fixes for conformance testing and non-output layers (rev 953)

Location:

branches/SHM-upgrade/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (4 diffs)
• TLibDecoder/TDecTop.h (modified) (1 diff)

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

@@ -48 +48 @@
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
 #define FIX_CONF_MODE                    1
+#define FIX_NON_OUTPUT_LAYER             1
 #define SIGNALLING_BITRATE_PICRATE_FIX   1      ///< Fix for signalling of bitrate and picture rate info in VPS VUI to be more aligned to JCTVC-R1008
 #define INFERENCE_POC_MSB_VAL_PRESENT    1      ///< JCTVC-Q0146 -- poc_msb_val_present_flag shall be equal to 0 when slice_header_extension_length is (inferred to be ) equal to 0

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

@@ -132 +132 @@
   m_confModeFlag = false;
 #endif
+#if FIX_NON_OUTPUT_LAYER
+  m_isOutputLayerFlag = false;
+#endif
 }
 
@@ -473 +476 @@
 
   m_cGopDecoder.filterPicture(pcPic);
+
+#if FIX_NON_OUTPUT_LAYER
+  if( this->getLayerDec(pcPic->getLayerId())->m_isOutputLayerFlag == false )
+  {
+    pcPic->setOutputMark( false );
+  }
+#endif
 
   TComSlice::sortPicList( m_cListPic ); // sorting for application output
@@ -2903 +2913 @@
   CommonDecoderParams* params = this->getCommonDecoderParams();
 
+#if !FIX_CONF_MODE
   assert( params->getTargetLayerId() < vps->getMaxLayers() );
+#endif
 
   if( params->getValueCheckedFlag() )
@@ -3006 +3018 @@
   Int targetLsIdx = vps->getOutputLayerSetIdx( targetOlsIdx );
   params->setTargetLayerId( vps->getLayerSetLayerIdList( targetLsIdx, vps->getNumLayersInIdList(targetLsIdx)-1 ) );
+#endif
+#if FIX_NON_OUTPUT_LAYER
+  // Check if the current layer is an output layer
+  for(Int i = 0; i < vps->getNumLayersInIdList( targetLsIdx ); i++)
+  {
+    if( vps->getOutputLayerFlag( targetOlsIdx, i ) )
+    {
+      this->getLayerDec( vps->getLayerSetLayerIdList( targetLsIdx, i ) )->m_isOutputLayerFlag = true;
+    }
+  }
 #endif
 }

branches/SHM-upgrade/source/Lib/TLibDecoder/TDecTop.h

@@ -174 +174 @@
   std::vector<TComPic>   m_confListPic;         //  Dynamic buffer for storing pictures for conformance purposes
 #endif
+#if FIX_NON_OUTPUT_LAYER
+  Bool m_isOutputLayerFlag;
+#endif
 public:
 #if POC_RESET_RESTRICTIONS