Changeset 846 in SHVCSoftware
- Timestamp:
- 28 Jul 2014, 23:13:21 (10 years ago)
- Location:
- branches/SHM-dev/source/Lib
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/source/Lib/TLibCommon/SEI.h
r823 r846 94 94 BSP_NESTING = 140, 95 95 BSP_INITIAL_ARRIVAL_TIME = 141, 96 #if !REMOVE_BSP_HRD_SEI 96 97 BSP_HRD = 142, 98 #endif 97 99 #endif 98 100 #if Q0074_SEI_COLOR_MAPPING … … 607 609 }; 608 610 611 #if !REMOVE_BSP_HRD_SEI 609 612 class SEIBspHrd : public SEI 610 613 { … … 627 630 TComHRD *hrd; 628 631 }; 632 #endif 629 633 630 634 #endif -
branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h
r843 r846 47 47 #define VPS_VUI_VST_PARAMS 1 ///< JCTVC-R0227: Related to signalling of VST parameters of the base layer. 48 48 #define VPS_VUI_OFFSET 1 ///< N0085: Signal VPS VUI offset in the VPS extension 49 #define REMOVE_BSP_HRD_SEI 1 ///< R0010: Remove bitstream partition HRD SEI message. 49 50 #define O0137_MAX_LAYERID 1 ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1 50 51 -
branches/SHM-dev/source/Lib/TLibDecoder/SEIread.cpp
r815 r846 361 361 xParseSEIBspInitialArrivalTime((SEIBspInitialArrivalTime&) *sei, vps, sps, *nestingSei, *bspNestingSei); 362 362 break; 363 #if !REMOVE_BSP_HRD_SEI 363 364 case SEI::BSP_HRD: 364 365 sei = new SEIBspHrd; 365 366 xParseSEIBspHrd((SEIBspHrd&) *sei, sps, *nestingSei); 366 367 break; 368 #endif 367 369 #endif 368 370 #if Q0078_ADD_LAYER_SETS … … 1286 1288 } 1287 1289 1290 #if !REMOVE_BSP_HRD_SEI 1288 1291 Void SEIReader::xParseSEIBspHrd(SEIBspHrd &sei, TComSPS *sps, const SEIScalableNesting &nestingSei) 1289 1292 { … … 1371 1374 } 1372 1375 } 1376 #endif 1373 1377 1374 1378 Void SEIReader::xParseHrdParameters(TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1) -
branches/SHM-dev/source/Lib/TLibDecoder/SEIread.h
r815 r846 116 116 #endif 117 117 Void xParseSEIBspInitialArrivalTime(SEIBspInitialArrivalTime &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei, const SEIBspNesting &bspNestingSei); 118 #if !REMOVE_BSP_HRD_SEI 118 119 Void xParseSEIBspHrd(SEIBspHrd &sei, TComSPS *sps, const SEIScalableNesting &nestingSei); 120 #endif 119 121 Void xParseHrdParameters(TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1); 120 122 #endif -
branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.cpp
r815 r846 233 233 xWriteSEIBspInitialArrivalTime(*static_cast<const SEIBspInitialArrivalTime*>(&sei), vps, sps, nestingSei, bspNestingSei); 234 234 break; 235 #if !REMOVE_BSP_HRD_SEI 235 236 case SEI::BSP_HRD: 236 237 xWriteSEIBspHrd(*static_cast<const SEIBspHrd*>(&sei), sps, nestingSei); 237 238 break; 239 #endif 238 240 #endif 239 241 #if Q0078_ADD_LAYER_SETS … … 953 955 } 954 956 957 #if !REMOVE_BSP_HRD_SEI 955 958 Void SEIWriter::xWriteSEIBspHrd(const SEIBspHrd &sei, TComSPS *sps, const SEIScalableNesting &nestingSei) 956 959 { … … 1004 1007 } 1005 1008 } 1009 #endif 1006 1010 1007 1011 Void SEIWriter::xCodeHrdParameters( TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 ) -
branches/SHM-dev/source/Lib/TLibEncoder/SEIwrite.h
r815 r846 104 104 Void xWriteSEIBspNesting(TComBitIf& bs, const SEIBspNesting &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei); 105 105 Void xWriteSEIBspInitialArrivalTime(const SEIBspInitialArrivalTime &sei, TComVPS *vps, TComSPS *sps, const SEIScalableNesting &nestingSei, const SEIBspNesting &bspNestingSei); 106 #if !REMOVE_BSP_HRD_SEI 106 107 Void xWriteSEIBspHrd(const SEIBspHrd &sei, TComSPS *sps, const SEIScalableNesting &nestingSei); 108 #endif 107 109 Void xCodeHrdParameters( TComHRD *hrd, Bool commonInfPresentFlag, UInt maxNumSubLayersMinus1 ); 108 110 #endif
Note: See TracChangeset for help on using the changeset viewer.