Changeset 537 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/SEI.h
- Timestamp:
- 13 Jul 2013, 15:51:26 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/SEI.h
r446 r537 124 124 125 125 SEIActiveParameterSets() 126 #if !L0047_APS_FLAGS127 :numSpsIdsMinus1(0)128 #else129 126 : activeVPSId (0) 130 127 , m_fullRandomAccessFlag (false) 131 128 , m_noParamSetUpdateFlag (false) 132 129 , numSpsIdsMinus1 (0) 133 #endif134 130 {} 135 131 virtual ~SEIActiveParameterSets() {} 136 132 137 133 Int activeVPSId; 138 #if L0047_APS_FLAGS139 134 Bool m_fullRandomAccessFlag; 140 135 Bool m_noParamSetUpdateFlag; 141 #endif142 136 Int numSpsIdsMinus1; 143 137 std::vector<Int> activeSeqParamSetId; … … 150 144 151 145 SEIBufferingPeriod() 152 #if L0044_CPB_DPB_DELAY_OFFSET153 146 : m_bpSeqParameterSetId (0) 154 147 , m_rapCpbParamsPresentFlag (false) … … 161 154 ::memset(m_initialAltCpbRemovalDelayOffset, 0, sizeof(m_initialAltCpbRemovalDelayOffset)); 162 155 } 163 #else164 {}165 #endif166 156 virtual ~SEIBufferingPeriod() {} 167 157 168 158 UInt m_bpSeqParameterSetId; 169 159 Bool m_rapCpbParamsPresentFlag; 170 #if L0044_CPB_DPB_DELAY_OFFSET171 160 Bool m_cpbDelayOffset; 172 161 Bool m_dpbDelayOffset; 173 #endif174 162 UInt m_initialCpbRemovalDelay [MAX_CPB_CNT][2]; 175 163 UInt m_initialCpbRemovalDelayOffset [MAX_CPB_CNT][2]; 176 164 UInt m_initialAltCpbRemovalDelay [MAX_CPB_CNT][2]; 177 165 UInt m_initialAltCpbRemovalDelayOffset[MAX_CPB_CNT][2]; 178 #if L0328_SPLICING179 166 Bool m_concatenationFlag; 180 167 UInt m_auCpbRemovalDelayDelta; 181 #endif182 168 }; 183 169 class SEIPictureTiming : public SEI … … 188 174 SEIPictureTiming() 189 175 : m_picStruct (0) 190 #if L0046_RENAME_PROG_SRC_IDC191 176 , m_sourceScanType (0) 192 #else193 , m_progressiveSourceIdc (0)194 #endif195 177 , m_duplicateFlag (false) 196 #if L0044_DU_DPB_OUTPUT_DELAY_HRD197 178 , m_picDpbOutputDuDelay (0) 198 #endif199 179 , m_numNalusInDuMinus1 (NULL) 200 180 , m_duCpbRemovalDelayMinus1 (NULL) … … 213 193 214 194 UInt m_picStruct; 215 #if L0046_RENAME_PROG_SRC_IDC216 195 UInt m_sourceScanType; 217 #else218 UInt m_progressiveSourceIdc;219 #endif220 196 Bool m_duplicateFlag; 221 197 222 198 UInt m_auCpbRemovalDelay; 223 199 UInt m_picDpbOutputDelay; 224 #if L0044_DU_DPB_OUTPUT_DELAY_HRD225 200 UInt m_picDpbOutputDuDelay; 226 #endif227 201 UInt m_numDecodingUnitsMinus1; 228 202 Bool m_duCommonCpbRemovalDelayFlag; … … 240 214 : m_decodingUnitIdx(0) 241 215 , m_duSptCpbRemovalDelay(0) 242 #if L0044_DU_DPB_OUTPUT_DELAY_HRD243 216 , m_dpbOutputDuDelayPresentFlag(false) 244 217 , m_picSptDpbOutputDuDelay(0) 245 #endif246 218 {} 247 219 virtual ~SEIDecodingUnitInfo() {} 248 220 Int m_decodingUnitIdx; 249 221 Int m_duSptCpbRemovalDelay; 250 #if L0044_DU_DPB_OUTPUT_DELAY_HRD251 222 Bool m_dpbOutputDuDelayPresentFlag; 252 223 Int m_picSptDpbOutputDuDelay; 253 #endif254 224 }; 255 225 … … 290 260 Int m_frame1GridPositionY; 291 261 Int m_arrangementReservedByte; 292 #if L0045_PERSISTENCE_FLAGS293 262 Bool m_arrangementPersistenceFlag; 294 #else295 Int m_arrangementRepetetionPeriod;296 #endif297 263 Bool m_upsampledAspectRatio; 298 264 }; … … 305 271 SEIDisplayOrientation() 306 272 : cancelFlag(true) 307 #if L0045_PERSISTENCE_FLAGS308 273 , persistenceFlag(0) 309 #else310 , repetitionPeriod(1)311 #endif312 274 , extensionFlag(false) 313 275 {} … … 319 281 320 282 UInt anticlockwiseRotation; 321 #if L0045_PERSISTENCE_FLAGS322 283 Bool persistenceFlag; 323 #else324 UInt repetitionPeriod;325 #endif326 284 Bool extensionFlag; 327 285 }; … … 355 313 }; 356 314 357 #if L0208_SOP_DESCRIPTION_SEI358 315 class SEISOPDescription : public SEI 359 316 { … … 372 329 Int m_sopDescPocDelta[MAX_NUM_PICS_IN_SOP]; 373 330 }; 374 #endif 375 376 #if J0149_TONE_MAPPING_SEI 331 377 332 class SEIToneMappingInfo : public SEI 378 333 { … … 407 362 Int m_extendedWhiteLevelLumaCodeValue; 408 363 }; 409 #endif410 364 411 365 typedef std::list<SEI*> SEIMessages; … … 420 374 Void deleteSEIs (SEIMessages &seiList); 421 375 422 #if K0180_SCALABLE_NESTING_SEI423 376 class SEIScalableNesting : public SEI 424 377 { … … 450 403 SEIMessages m_nestedSEIs; 451 404 }; 452 #endif453 405 454 406 //! \}
Note: See TracChangeset for help on using the changeset viewer.