Changeset 537 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.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/TComSlice.h
r535 r537 190 190 Int m_levelIdc; 191 191 192 #if L0046_CONSTRAINT_FLAGS193 192 Bool m_progressiveSourceFlag; 194 193 Bool m_interlacedSourceFlag; 195 194 Bool m_nonPackedConstraintFlag; 196 195 Bool m_frameOnlyConstraintFlag; 197 #endif198 196 199 197 public: … … 215 213 Void setLevelIdc(Int x) { m_levelIdc = x; } 216 214 217 #if L0046_CONSTRAINT_FLAGS218 215 Bool getProgressiveSourceFlag() const { return m_progressiveSourceFlag; } 219 216 Void setProgressiveSourceFlag(Bool b) { m_progressiveSourceFlag = b; } … … 227 224 Bool getFrameOnlyConstraintFlag() const { return m_frameOnlyConstraintFlag; } 228 225 Void setFrameOnlyConstraintFlag(Bool b) { m_frameOnlyConstraintFlag = b; } 229 #endif230 226 }; 231 227 … … 253 249 }; 254 250 /// VPS class 255 256 #if SIGNAL_BITRATE_PICRATE_IN_VPS257 class TComBitRatePicRateInfo258 {259 Bool m_bitRateInfoPresentFlag[MAX_TLAYER];260 Bool m_picRateInfoPresentFlag[MAX_TLAYER];261 Int m_avgBitRate[MAX_TLAYER];262 Int m_maxBitRate[MAX_TLAYER];263 Int m_constantPicRateIdc[MAX_TLAYER];264 Int m_avgPicRate[MAX_TLAYER];265 public:266 TComBitRatePicRateInfo();267 Bool getBitRateInfoPresentFlag(Int i) {return m_bitRateInfoPresentFlag[i];}268 Void setBitRateInfoPresentFlag(Int i, Bool x) {m_bitRateInfoPresentFlag[i] = x;}269 270 Bool getPicRateInfoPresentFlag(Int i) {return m_picRateInfoPresentFlag[i];}271 Void setPicRateInfoPresentFlag(Int i, Bool x) {m_picRateInfoPresentFlag[i] = x;}272 273 Int getAvgBitRate(Int i) {return m_avgBitRate[i];}274 Void setAvgBitRate(Int i, Int x) {m_avgBitRate[i] = x;}275 276 Int getMaxBitRate(Int i) {return m_maxBitRate[i];}277 Void setMaxBitRate(Int i, Int x) {m_maxBitRate[i] = x;}278 279 Int getConstantPicRateIdc(Int i) {return m_constantPicRateIdc[i];}280 Void setConstantPicRateIdc(Int i, Int x) {m_constantPicRateIdc[i] = x;}281 282 Int getAvgPicRate(Int i) {return m_avgPicRate[i];}283 Void setAvgPicRate(Int i, Int x) {m_avgPicRate[i] = x;}284 };285 #endif286 251 287 252 struct HrdSubLayerInfo … … 296 261 UInt ducpbSizeValue [MAX_CPB_CNT][2]; 297 262 UInt cbrFlag [MAX_CPB_CNT][2]; 298 #if L0363_DU_BIT_RATE299 263 UInt duBitRateValue [MAX_CPB_CNT][2]; 300 #endif301 264 }; 302 265 … … 304 267 { 305 268 private: 306 #if !L0043_TIMING_INFO307 Bool m_timingInfoPresentFlag;308 UInt m_numUnitsInTick;309 UInt m_timeScale;310 #endif311 269 Bool m_nalHrdParametersPresentFlag; 312 270 Bool m_vclHrdParametersPresentFlag; … … 315 273 UInt m_duCpbRemovalDelayLengthMinus1; 316 274 Bool m_subPicCpbParamsInPicTimingSEIFlag; 317 #if L0044_DU_DPB_OUTPUT_DELAY_HRD318 275 UInt m_dpbOutputDelayDuLengthMinus1; 319 #endif320 276 UInt m_bitRateScale; 321 277 UInt m_cpbSizeScale; … … 329 285 public: 330 286 TComHRD() 331 #if !L0043_TIMING_INFO332 :m_timingInfoPresentFlag(false)333 ,m_numUnitsInTick(1001)334 ,m_timeScale(60000)335 ,m_nalHrdParametersPresentFlag(0)336 #else337 287 :m_nalHrdParametersPresentFlag(0) 338 #endif339 288 ,m_vclHrdParametersPresentFlag(0) 340 289 ,m_subPicCpbParamsPresentFlag(false) … … 342 291 ,m_duCpbRemovalDelayLengthMinus1(0) 343 292 ,m_subPicCpbParamsInPicTimingSEIFlag(false) 344 #if L0044_DU_DPB_OUTPUT_DELAY_HRD345 293 ,m_dpbOutputDelayDuLengthMinus1(0) 346 #endif347 294 ,m_bitRateScale(0) 348 295 ,m_cpbSizeScale(0) … … 353 300 354 301 virtual ~TComHRD() {} 355 #if !L0043_TIMING_INFO356 Void setTimingInfoPresentFlag ( Bool flag ) { m_timingInfoPresentFlag = flag; }357 Bool getTimingInfoPresentFlag ( ) { return m_timingInfoPresentFlag; }358 359 Void setNumUnitsInTick ( UInt value ) { m_numUnitsInTick = value; }360 UInt getNumUnitsInTick ( ) { return m_numUnitsInTick; }361 362 Void setTimeScale ( UInt value ) { m_timeScale = value; }363 UInt getTimeScale ( ) { return m_timeScale; }364 #endif365 302 366 303 Void setNalHrdParametersPresentFlag ( Bool flag ) { m_nalHrdParametersPresentFlag = flag; } … … 382 319 Bool getSubPicCpbParamsInPicTimingSEIFlag () { return m_subPicCpbParamsInPicTimingSEIFlag; } 383 320 384 #if L0044_DU_DPB_OUTPUT_DELAY_HRD385 321 Void setDpbOutputDelayDuLengthMinus1 (UInt value ) { m_dpbOutputDelayDuLengthMinus1 = value; } 386 322 UInt getDpbOutputDelayDuLengthMinus1 () { return m_dpbOutputDelayDuLengthMinus1; } 387 #endif388 323 389 324 Void setBitRateScale ( UInt value ) { m_bitRateScale = value; } … … 426 361 Void setDuCpbSizeValueMinus1 ( Int layer, Int cpbcnt, Int nalOrVcl, UInt value ) { m_HRD[layer].ducpbSizeValue[cpbcnt][nalOrVcl] = value; } 427 362 UInt getDuCpbSizeValueMinus1 ( Int layer, Int cpbcnt, Int nalOrVcl ) { return m_HRD[layer].ducpbSizeValue[cpbcnt][nalOrVcl]; } 428 #if L0363_DU_BIT_RATE429 363 Void setDuBitRateValueMinus1 ( Int layer, Int cpbcnt, Int nalOrVcl, UInt value ) { m_HRD[layer].duBitRateValue[cpbcnt][nalOrVcl] = value; } 430 364 UInt getDuBitRateValueMinus1 (Int layer, Int cpbcnt, Int nalOrVcl ) { return m_HRD[layer].duBitRateValue[cpbcnt][nalOrVcl]; } 431 #endif432 365 Void setCbrFlag ( Int layer, Int cpbcnt, Int nalOrVcl, UInt value ) { m_HRD[layer].cbrFlag[cpbcnt][nalOrVcl] = value; } 433 366 Bool getCbrFlag ( Int layer, Int cpbcnt, Int nalOrVcl ) { return m_HRD[layer].cbrFlag[cpbcnt][nalOrVcl]; } … … 435 368 Void setNumDU ( UInt value ) { m_numDU = value; } 436 369 UInt getNumDU ( ) { return m_numDU; } 437 #if L0045_CONDITION_SIGNALLING438 370 Bool getCpbDpbDelaysPresentFlag() { return getNalHrdParametersPresentFlag() || getVclHrdParametersPresentFlag(); } 439 #endif440 371 }; 441 372 442 #if L0043_TIMING_INFO443 373 class TimingInfo 444 374 { … … 471 401 Void setNumTicksPocDiffOneMinus1 (Int x ) { m_numTicksPocDiffOneMinus1 = x; } 472 402 }; 473 #endif474 403 475 404 class TComVPS … … 483 412 UInt m_numReorderPics[MAX_TLAYER]; 484 413 UInt m_uiMaxDecPicBuffering[MAX_TLAYER]; 485 UInt m_uiMaxLatencyIncrease[MAX_TLAYER]; 414 UInt m_uiMaxLatencyIncrease[MAX_TLAYER]; // Really max latency increase plus 1 (value 0 expresses no limit) 486 415 487 416 UInt m_numHrdParameters; … … 507 436 TComPTL m_pcPTL; 508 437 #endif 509 #if SIGNAL_BITRATE_PICRATE_IN_VPS510 TComBitRatePicRateInfo m_bitRatePicRateInfo;511 #endif512 #if L0043_TIMING_INFO513 438 TimingInfo m_timingInfo; 514 #endif515 516 439 #if H_MV 517 440 /// VPS EXTENSION SYNTAX ELEMENTS … … 648 571 TComPTL* getPTL() { return &m_pcPTL; } 649 572 #endif 650 #if SIGNAL_BITRATE_PICRATE_IN_VPS651 TComBitRatePicRateInfo *getBitratePicrateInfo() { return &m_bitRatePicRateInfo; }652 #endif653 #if L0043_TIMING_INFO654 573 TimingInfo* getTimingInfo() { return &m_timingInfo; } 655 #endif656 574 #if H_MV 657 575 Void setAvcBaseLayerFlag( Bool val ) { m_avcBaseLayerFlag = val; } … … 878 796 Int m_log2MaxMvLengthVertical; 879 797 TComHRD m_hrdParameters; 880 #if L0043_TIMING_INFO881 798 TimingInfo m_timingInfo; 882 #else883 Bool m_pocProportionalToTimingFlag;884 Int m_numTicksPocDiffOneMinus1;885 #endif886 799 #if H_MV 887 800 Bool m_tileBoundariesAlignedFlag; 888 801 #endif 802 889 803 public: 890 804 TComVUI() … … 918 832 ,m_log2MaxMvLengthHorizontal(15) 919 833 ,m_log2MaxMvLengthVertical(15) 920 #if !L0043_TIMING_INFO921 ,m_pocProportionalToTimingFlag(false)922 ,m_numTicksPocDiffOneMinus1(0)923 #endif924 834 #if H_MV 925 835 ,m_tileBoundariesAlignedFlag(true) … … 1019 929 1020 930 TComHRD* getHrdParameters () { return &m_hrdParameters; } 1021 #if L0043_TIMING_INFO1022 931 TimingInfo* getTimingInfo() { return &m_timingInfo; } 1023 #else 1024 Bool getPocProportionalToTimingFlag() {return m_pocProportionalToTimingFlag; } 1025 Void setPocProportionalToTimingFlag(Bool x) {m_pocProportionalToTimingFlag = x;} 1026 Int getNumTicksPocDiffOneMinus1() {return m_numTicksPocDiffOneMinus1;} 1027 Void setNumTicksPocDiffOneMinus1(Int x) { m_numTicksPocDiffOneMinus1 = x;} 1028 #endif 1029 #if H_MV 1030 Bool getTileBoundariesAlignedFlag( ) { return m_tileBoundariesAlignedFlag; } 932 #if H_MV 933 Bool getTileBoundariesAlignedFlag( ) { return m_tileBoundariesAlignedFlag; } 1031 934 Void setTileBoundariesAlignedFlag( Bool flag ) { m_tileBoundariesAlignedFlag = flag; } 1032 935 #endif … … 1070 973 Bool m_useAMP; 1071 974 1072 #if !L0034_COMBINED_LIST_CLEANUP1073 Bool m_bUseLComb;1074 #endif1075 1076 975 // Parameter 1077 976 Int m_bitDepthY; … … 1102 1001 TComScalingList* m_scalingList; //!< ScalingList class pointer 1103 1002 UInt m_uiMaxDecPicBuffering[MAX_TLAYER]; 1104 UInt m_uiMaxLatencyIncrease[MAX_TLAYER]; 1003 UInt m_uiMaxLatencyIncrease[MAX_TLAYER]; // Really max latency increase plus 1 (value 0 expresses no limit) 1105 1004 1106 1005 Bool m_useDF; … … 1203 1102 1204 1103 // Tool list 1205 #if !L0034_COMBINED_LIST_CLEANUP1206 Void setUseLComb (Bool b) { m_bUseLComb = b; }1207 Bool getUseLComb () { return m_bUseLComb; }1208 #endif1209 1210 1104 Bool getUseLossless () { return m_useLossless; } 1211 1105 Void setUseLossless ( Bool b ) { m_useLossless = b; } … … 1554 1448 Int m_deblockingFilterBetaOffsetDiv2; //< beta offset for deblocking filter 1555 1449 Int m_deblockingFilterTcOffsetDiv2; //< tc offset for deblocking filter 1556 #if L0034_COMBINED_LIST_CLEANUP1557 1450 Int m_list1IdxToList0Idx[MAX_NUM_REF]; 1558 1451 Int m_aiNumRefIdx [2]; // for multiple reference of current slice 1559 #else1560 Int m_aiNumRefIdx [3]; // for multiple reference of current slice1561 1562 Int m_iRefIdxOfLC[2][MAX_NUM_REF_LC];1563 Int m_eListIdFromIdxOfLC[MAX_NUM_REF_LC];1564 Int m_iRefIdxFromIdxOfLC[MAX_NUM_REF_LC];1565 Int m_iRefIdxOfL1FromRefIdxOfL0[MAX_NUM_REF_LC];1566 Int m_iRefIdxOfL0FromRefIdxOfL1[MAX_NUM_REF_LC];1567 Bool m_bRefPicListModificationFlagLC;1568 Bool m_bRefPicListCombinationFlag;1569 #endif1570 1452 1571 1453 Bool m_bCheckLDC; … … 1608 1490 1609 1491 Bool m_abEqualRef [2][MAX_NUM_REF][MAX_NUM_REF]; 1610 #if !L0034_COMBINED_LIST_CLEANUP1611 Bool m_bNoBackPredFlag;1612 #endif1613 1492 UInt m_uiTLayer; 1614 1493 Bool m_bTLayerSwitchingFlag; … … 1685 1564 #endif 1686 1565 #endif 1687 1688 1566 public: 1689 1567 TComSlice(); … … 1761 1639 UInt getARPStepNum( ) { return m_nARPStepNum; } 1762 1640 #endif 1763 1764 1641 Int getDepth () { return m_iDepth; } 1765 1642 UInt getColFromL0Flag () { return m_colFromL0Flag; } … … 1769 1646 Bool getCheckLDC () { return m_bCheckLDC; } 1770 1647 Bool getMvdL1ZeroFlag () { return m_bLMvdL1Zero; } 1771 #if H_MV && !H_MV_FIX1071 // This is a temporary fix of the temporary fix L01771772 Int getNumRpsCurrTempList( TComReferencePictureSet* rps = NULL );1773 #else1774 1648 Int getNumRpsCurrTempList(); 1775 #endif1776 #if L0034_COMBINED_LIST_CLEANUP1777 1649 Int getList1IdxToList0Idx ( Int list1Idx ) { return m_list1IdxToList0Idx[list1Idx]; } 1778 #else1779 Int getRefIdxOfLC (RefPicList e, Int iRefIdx) { return m_iRefIdxOfLC[e][iRefIdx]; }1780 Int getListIdFromIdxOfLC(Int iRefIdx) { return m_eListIdFromIdxOfLC[iRefIdx]; }1781 Int getRefIdxFromIdxOfLC(Int iRefIdx) { return m_iRefIdxFromIdxOfLC[iRefIdx]; }1782 Int getRefIdxOfL0FromRefIdxOfL1(Int iRefIdx) { return m_iRefIdxOfL0FromRefIdxOfL1[iRefIdx];}1783 Int getRefIdxOfL1FromRefIdxOfL0(Int iRefIdx) { return m_iRefIdxOfL1FromRefIdxOfL0[iRefIdx];}1784 Bool getRefPicListModificationFlagLC() {return m_bRefPicListModificationFlagLC;}1785 Void setRefPicListModificationFlagLC(Bool bflag) {m_bRefPicListModificationFlagLC=bflag;}1786 Bool getRefPicListCombinationFlag() {return m_bRefPicListCombinationFlag;}1787 Void setRefPicListCombinationFlag(Bool bflag) {m_bRefPicListCombinationFlag=bflag;}1788 #endif1789 1650 Void setReferenced(Bool b) { m_bRefenced = b; } 1790 1651 Bool isReferenced() { return m_bRefenced; } … … 1861 1722 1862 1723 static Void sortPicList ( TComList<TComPic*>& rcListPic ); 1863 #if L0034_COMBINED_LIST_CLEANUP1864 1724 Void setList1IdxToList0Idx(); 1865 #else1866 Bool getNoBackPredFlag() { return m_bNoBackPredFlag; }1867 Void setNoBackPredFlag( Bool b ) { m_bNoBackPredFlag = b; }1868 Void generateCombinedList ();1869 #endif1870 1725 1871 1726 UInt getTLayer () { return m_uiTLayer; } … … 1880 1735 static Void markCurrPic ( TComPic* currPic );; 1881 1736 static Void markIvRefPicsAsUnused ( TComPicLists* ivPicLists, std::vector<Int> targetDecLayerIdSet, TComVPS* vps, Int curLayerId, Int curPoc ); 1882 1883 1884 Void xPrintRefPicList(); 1737 Void xPrintRefPicList(); 1885 1738 #endif 1886 1739 Bool isTemporalLayerSwitchingPoint( TComList<TComPic*>& rcListPic ); 1887 1740 Bool isStepwiseTemporalLayerSwitchingPointCandidate( TComList<TComPic*>& rcListPic ); 1888 1741 Int checkThatAllRefPicsAreAvailable( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool printErrors, Int pocRandomAccess = 0); 1889 #if FIX1071 && H_MV_FIX10711742 #if FIX1071 1890 1743 Void createExplicitReferencePictureSetFromReference( TComList<TComPic*>& rcListPic, TComReferencePictureSet *pReferencePictureSet, Bool isRAP); 1891 1744 #else … … 2036 1889 2037 1890 #endif 2038 2039 1891 protected: 2040 1892 TComPic* xGetRefPic (TComList<TComPic*>& rcListPic,
Note: See TracChangeset for help on using the changeset viewer.