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

Timestamp:

6 Jan 2015, 04:21:12 (10 years ago)

Author:

seregin

Message:

port the fix for ticket #38

Location:

branches/SHM-upgrade/source/Lib

Files:

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

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

@@ -311 +311 @@
   Int m_targetLayerId;
   Int m_targetOutputLayerSetIdx;
-  std::vector<Int> *m_targetDecLayerIdSet; 
+  std::vector<Int> *m_targetDecLayerIdSet;
   Bool m_valueCheckedFlag;
   Int m_highestTId;
 public:
-  CommonDecoderParams(): 
+  CommonDecoderParams():
+#if FIX_CONF_MODE
+    m_targetLayerId(MAX_VPS_LAYER_ID_PLUS1)
+#else
     m_targetLayerId(0)
+#endif
     , m_targetOutputLayerSetIdx(-1)
     , m_targetDecLayerIdSet(NULL)

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

@@ -47 +47 @@
 #define O0215_PHASE_ALIGNMENT_REMOVAL    1
 #define CONFORMANCE_BITSTREAM_MODE       1      ///< In order to generate the metadata related to conformance bitstreams
+#define FIX_CONF_MODE                    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
@@ -98 +99 @@
                                                 ///< JCTVC-P0192: Assign layers to sub-DPBs based on the rep_format() signaled in the VPS
 #define ALIGNED_BUMPING                  1      ///< JCTVC-P0192: Align bumping of pictures in an AU
+#define FIX_ALIGN_BUMPING                1
 #define O0109_O0199_FLAGS_TO_VUI         1      ///< JCTVC-O0109, O0199: move single_layer_for_non_irap_flag and higher_layer_flag to vps_vui
 #define O0109_VIEW_ID_LEN                1      ///< JCTVC-O0109: view_id_len_minus1 to view_id_len, and add constraint (1<<view_id_len) is greater than or equal to NumViews

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

@@ -3001 +3001 @@
 
   }
+#if FIX_CONF_MODE
+  // Set correct value of targetLayerId
+  Int targetOlsIdx = params->getTargetOutputLayerSetIdx();
+  Int targetLsIdx = vps->getOutputLayerSetIdx( targetOlsIdx );
+  params->setTargetLayerId( vps->getLayerSetLayerIdList( targetLsIdx, vps->getNumLayersInIdList(targetLsIdx)-1 ) );
+#endif
 }
 #endif