Changeset 545 in SHVCSoftware

Timestamp:

11 Jan 2014, 02:47:53 (11 years ago)

Author:

seregin

Message:

JCTVC-O0135. Patch was provided by Yongjin Cho <choyongjin@…>

Location:

branches/SHM-4.1-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

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

@@ -54 +54 @@
 #define O0109_DEFAULT_ONE_OUT_LAYER_IDC  1      ///< JCTVC-O0109: default_one_target_output_layer_flag to default_one_target_output_layer_idc
 #define O0109_MOVE_VPS_VUI_FLAG          1      ///< JCTVC-O0109: move vps_vui_present_flag before vps_vui_offset
+
+#define O0135_DEFAULT_ONE_OUT_SEMANTIC   1      ///< JCTVC-O0135: semantics change of default_one_target_output_layer_idc for auxiliary pictures
 
 #define O0194_DIFFERENT_BITDEPTH_EL_BL   1      ///< JCTVC-O0194: Support for different bitdepth values for BL and EL, add required configuration parameters (and Some bugfixes when REPN_FORMAT_IN_VPS (JCTVC-N0092) is enabled)

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

@@ -1253 +1253 @@
         for(j = 0; j < vps->getNumLayersInIdList(lsIdx); j++)
         {
+#if O0135_DEFAULT_ONE_OUT_SEMANTIC
+          vps->setOutputLayerFlag(i, j, (j == (vps->getNumLayersInIdList(lsIdx)-1)) && (vps->getDimensionId(j,1)==0) );
+#else
           vps->setOutputLayerFlag(i, j, (j == (vps->getNumLayersInIdList(lsIdx)-1)));
+#endif
         }
       }