Changeset 664 in SHVCSoftware for branches/SHM-6-dev
- Timestamp:
- 10 Apr 2014, 03:34:55 (11 years ago)
- Location:
- branches/SHM-6-dev/source/Lib
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-6-dev/source/Lib/TLibCommon/TypeDef.h
r662 r664 234 234 #define O0153_ALT_OUTPUT_LAYER_FLAG 1 ///< JCTVC-O0153: alt output layer flag 235 235 #define P0300_ALT_OUTPUT_LAYER_FLAG 1 ///< JCTVC-P0300: alt output layer flag 236 237 #define Q0165_OUTPUT_LAYER_SET 1 ///< JCTVC-Q0165: add a constraint to disallow an empty output layer set 238 #define Q0165_NUM_ADD_OUTPUT_LAYER_SETS 1 ///< JCTVC-Q0165: signal num_add_output_layer_set and default_target_output_layer_idc when vps_num_layer_sets_minus1 is greater than 0 236 239 237 240 #define VPS_DPB_SIZE_TABLE 1 ///< JCTVC-O0217: DPB operations: signaling DPB-related parameters -
branches/SHM-6-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r663 r664 1254 1254 } 1255 1255 #else 1256 1257 #if Q0165_NUM_ADD_OUTPUT_LAYER_SETS 1258 if( vps->getNumLayerSets() > 1 ) 1259 { 1260 READ_UVLC( uiCode, "num_add_output_layer_sets" ); vps->setNumAddOutputLayerSets( uiCode ); 1261 READ_CODE( 2, uiCode, "default_target_output_layer_idc" ); vps->setDefaultTargetOutputLayerIdc( uiCode ); 1262 } 1263 else 1264 { 1265 vps->setNumAddOutputLayerSets( 0 ); 1266 } 1267 #else 1256 1268 READ_UVLC( uiCode, "num_add_output_layer_sets" ); vps->setNumAddOutputLayerSets( uiCode ); 1269 #endif 1257 1270 Int numOutputLayerSets = vps->getNumLayerSets() + vps->getNumAddOutputLayerSets(); 1258 1271 #endif 1259 1272 1260 1273 #if P0295_DEFAULT_OUT_LAYER_IDC 1274 #if !Q0165_NUM_ADD_OUTPUT_LAYER_SETS 1261 1275 if( numOutputLayerSets > 1 ) 1262 1276 { 1263 1277 READ_CODE( 2, uiCode, "default_target_output_layer_idc" ); vps->setDefaultTargetOutputLayerIdc( uiCode ); 1264 1278 } 1279 #endif 1265 1280 vps->setNumOutputLayerSets( numOutputLayerSets ); 1266 1281 … … 1334 1349 vps->setAltOuputLayerFlag(i, uiCode ? true : false); 1335 1350 } 1351 #if Q0165_OUTPUT_LAYER_SET 1352 assert( NumOutputLayersInOutputLayerSet[i]>0 ); 1353 #endif 1354 1336 1355 #endif 1337 1356 } -
branches/SHM-6-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
r663 r664 998 998 Int numOutputLayerSets = vps->getNumOutputLayerSets() ; 999 999 assert( numOutputLayerSets - (Int)vps->getNumLayerSets() >= 0 ); 1000 1001 #if Q0165_NUM_ADD_OUTPUT_LAYER_SETS 1002 if( vps->getNumLayerSets() > 1 ) 1003 { 1004 WRITE_UVLC( numOutputLayerSets - vps->getNumLayerSets(), "num_add_output_layer_sets" ); 1005 WRITE_CODE( vps->getDefaultTargetOutputLayerIdc(), 2, "default_target_output_layer_idc" ); 1006 } 1007 #else 1000 1008 WRITE_UVLC( numOutputLayerSets - vps->getNumLayerSets(), "num_add_output_layer_sets" ); 1001 1009 #endif 1010 1011 #endif 1012 1013 #if !Q0165_NUM_ADD_OUTPUT_LAYER_SETS 1002 1014 if( numOutputLayerSets > 1 ) 1003 1015 { … … 1012 1024 #endif 1013 1025 } 1026 #endif 1014 1027 1015 1028 for(i = 1; i < numOutputLayerSets; i++) … … 1059 1072 WRITE_FLAG(vps->getAltOuputLayerFlag(i), "alt_output_layer_flag[i]"); 1060 1073 } 1074 1075 #if Q0165_OUTPUT_LAYER_SET 1076 assert( NumOutputLayersInOutputLayerSet[i]>0 ); 1077 #endif 1078 1061 1079 #endif 1062 1080 }
Note: See TracChangeset for help on using the changeset viewer.