Changeset 644 in SHVCSoftware for trunk/source/Lib/TLibCommon/TComSlice.h
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/SHM-5.1-dev (added) merged: 599-600,602-643
- Property svn:mergeinfo changed
-
trunk/source
- Property svn:mergeinfo changed
/branches/SHM-5.0-dev/source merged: 601 /branches/SHM-5.1-dev/source (added) merged: 600,602-643
- Property svn:mergeinfo changed
-
trunk/source/Lib/TLibCommon/TComSlice.h
r595 r644 231 231 { 232 232 ProfileTierLevel m_generalPTL; 233 ProfileTierLevel m_subLayerPTL [6]; // max. value of max_sub_layers_minus1 is 6234 Bool m_subLayerProfilePresentFlag [6];235 Bool m_subLayerLevelPresentFlag [6];233 ProfileTierLevel m_subLayerPTL [MAX_TLAYER-1]; // max. value of max_sub_layers_minus1 is MAX_TLAYER-1 ( = 6 ) 234 Bool m_subLayerProfilePresentFlag [MAX_TLAYER-1]; 235 Bool m_subLayerLevelPresentFlag [MAX_TLAYER-1]; 236 236 237 237 public: … … 568 568 Bool m_crossLayerIrapAlignFlag; 569 569 #endif 570 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 571 Bool m_crossLayerAlignedIdrOnlyFlag; 572 #endif 570 573 #if O0225_MAX_TID_FOR_REF_LAYERS 571 574 UInt m_maxTidIlRefPicsPlus1[MAX_VPS_LAYER_ID_PLUS1 - 1][MAX_VPS_LAYER_ID_PLUS1]; … … 599 602 #endif 600 603 #if N0160_VUI_EXT_ILP_REF 601 Bool 602 Int 603 Bool 604 Int 604 Bool m_ilpRestrictedRefLayersFlag; 605 Int m_minSpatialSegmentOffsetPlus1[MAX_VPS_LAYER_ID_PLUS1][MAX_VPS_LAYER_ID_PLUS1]; 606 Bool m_ctuBasedOffsetEnabledFlag [MAX_VPS_LAYER_ID_PLUS1][MAX_VPS_LAYER_ID_PLUS1]; 607 Int m_minHorizontalCtuOffsetPlus1 [MAX_VPS_LAYER_ID_PLUS1][MAX_VPS_LAYER_ID_PLUS1]; 605 608 #endif 606 609 #if VPS_VUI_VIDEO_SIGNAL 607 Bool 608 Int 609 Int 610 Int 611 Bool 612 Int 613 Int 614 Int 610 Bool m_vidSigPresentVpsFlag; 611 Int m_vpsVidSigInfo; 612 Int m_vpsVidSigIdx[MAX_VPS_LAYER_ID_PLUS1]; 613 Int m_vpsVidFormat[16]; 614 Bool m_vpsFullRangeFlag[16]; 615 Int m_vpsColorPrimaries[16]; 616 Int m_vpsTransChar[16]; 617 Int m_vpsMatCoeff[16]; 615 618 #endif 616 619 #if VPS_VUI_BITRATE_PICRATE 617 Bool m_bitRatePresentVpsFlag; 618 Bool m_picRatePresentVpsFlag; 619 Bool m_bitRatePresentFlag [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 620 Bool m_picRatePresentFlag [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 621 Int m_avgBitRate [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 622 Int m_maxBitRate [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 623 Int m_constPicRateIdc [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 624 Int m_avgPicRate [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 625 #endif 620 Bool m_bitRatePresentVpsFlag; 621 Bool m_picRatePresentVpsFlag; 622 Bool m_bitRatePresentFlag [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 623 Bool m_picRatePresentFlag [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 624 Int m_avgBitRate [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 625 Int m_maxBitRate [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 626 Int m_constPicRateIdc [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 627 Int m_avgPicRate [MAX_VPS_LAYER_SETS_PLUS1][MAX_TLAYER]; 628 #endif 629 630 #if P0312_VERT_PHASE_ADJ 631 Bool m_vpsVuiVertPhaseInUseFlag; 632 #endif 633 634 #if P0300_ALT_OUTPUT_LAYER_FLAG 635 Bool m_altOutputLayerFlag[MAX_VPS_LAYER_SETS_PLUS1]; 636 #else 626 637 #if O0153_ALT_OUTPUT_LAYER_FLAG 627 638 Bool m_altOutputLayerFlag; 639 #endif 628 640 #endif 629 641 #if REPN_FORMAT_IN_VPS … … 635 647 #if VIEW_ID_RELATED_SIGNALING 636 648 #if O0109_VIEW_ID_LEN 637 Int 649 Int m_viewIdLen; 638 650 #else 639 Int 640 #endif 641 Int 651 Int m_viewIdLenMinus1; 652 #endif 653 Int m_viewIdVal [MAX_LAYERS]; 642 654 #endif 643 655 … … 650 662 Bool m_recursiveRefLayerFlag[MAX_NUM_LAYER_IDS][MAX_NUM_LAYER_IDS]; // flag to indicate if j-th layer is a direct or indirect reference layer of i-th layer 651 663 #endif 664 #if SPS_DPB_PARAMS 665 Int m_TolsIdx; 666 #endif 652 667 #if VPS_DPB_SIZE_TABLE 653 Bool m_subLayerFlagInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1];654 Bool m_subLayerDpbInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];655 Int m_maxVpsDecPicBufferingMinus1 [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS][MAX_TLAYER];668 Bool m_subLayerFlagInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1]; 669 Bool m_subLayerDpbInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS]; 670 Int m_maxVpsDecPicBufferingMinus1 [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS][MAX_TLAYER]; 656 671 #if RESOLUTION_BASED_DPB 657 Int m_maxVpsLayerDecPicBuffMinus1 [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS][MAX_TLAYER];658 #endif 659 Int m_maxVpsNumReorderPics [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];660 Int m_maxVpsLatencyIncreasePlus1 [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];672 Int m_maxVpsLayerDecPicBuffMinus1 [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS][MAX_TLAYER]; 673 #endif 674 Int m_maxVpsNumReorderPics [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS]; 675 Int m_maxVpsLatencyIncreasePlus1 [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS]; 661 676 #if CHANGE_NUMSUBDPB_IDX 662 Int m_numSubDpbs [MAX_VPS_LAYER_SETS_PLUS1];677 Int m_numSubDpbs [MAX_VPS_LAYER_SETS_PLUS1]; 663 678 #else 664 Int m_numSubDpbs [MAX_VPS_OP_LAYER_SETS_PLUS1];679 Int m_numSubDpbs [MAX_VPS_OP_LAYER_SETS_PLUS1]; 665 680 #endif 666 681 #endif … … 670 685 #endif 671 686 687 #if O0164_MULTI_LAYER_HRD 688 Bool m_vpsVuiBspHrdPresentFlag; 689 UInt m_vpsNumBspHrdParametersMinus1; 690 Bool m_bspCprmsPresentFlag[MAX_VPS_LAYER_SETS_PLUS1]; 691 TComHRD *m_bspHrd; 692 UInt m_numBitstreamPartitions[MAX_VPS_LAYER_SETS_PLUS1]; 693 Bool m_layerInBspFlag[MAX_VPS_LAYER_SETS_PLUS1][8][MAX_LAYERS]; 694 UInt m_numBspSchedCombinations[MAX_VPS_LAYER_SETS_PLUS1]; 695 UInt m_bspCombHrdIdx[MAX_VPS_LAYER_SETS_PLUS1][16][16]; 696 UInt m_bspCombSchedIdx[MAX_VPS_LAYER_SETS_PLUS1][16][16]; 697 #endif 698 699 #if P0182_VPS_VUI_PS_FLAG 700 UInt m_SPSId[MAX_LAYERS]; 701 UInt m_PPSId[MAX_LAYERS]; 702 UInt m_baseLayerPSCompatibilityFlag[MAX_LAYERS]; 703 #endif 704 672 705 #if !P0307_REMOVE_VPS_VUI_OFFSET 673 706 #if VPS_VUI_OFFSET 674 Int m_vpsVuiOffset;707 Int m_vpsVuiOffset; 675 708 #endif 676 709 #endif 677 710 #if P0307_VPS_NON_VUI_EXTENSION 678 Int m_vpsNonVuiExtLength;711 Int m_vpsNonVuiExtLength; 679 712 #endif 680 713 #if RESOLUTION_BASED_DPB 681 Int m_subDpbAssigned [MAX_VPS_LAYER_SETS_PLUS1][MAX_LAYERS];714 Int m_subDpbAssigned [MAX_VPS_LAYER_SETS_PLUS1][MAX_LAYERS]; 682 715 #endif 683 716 #endif //SVC_EXTENSION … … 692 725 m_cprmsPresentFlag = new Bool [ getNumHrdParameters() ]; 693 726 } 727 728 #if O0164_MULTI_LAYER_HRD 729 Void createBspHrdParamBuffer(UInt numHrds) 730 { 731 m_bspHrd = new TComHRD[ numHrds ]; 732 // m_hrdOpSetIdx = new UInt [ getNumHrdParameters() ]; 733 // m_cprmsPresentFlag = new Bool [ getNumHrdParameters() ]; 734 } 735 #endif 694 736 695 737 TComHRD* getHrdParameters ( UInt i ) { return &m_hrdParameters[ i ]; } … … 875 917 Bool getCrossLayerPictureTypeAlignFlag() { return m_crossLayerPictureTypeAlignFlag; } 876 918 Void setCrossLayerPictureTypeAlignFlag(Bool x) { m_crossLayerPictureTypeAlignFlag = x; } 919 #endif 920 #if P0068_CROSS_LAYER_ALIGNED_IDR_ONLY_FOR_IRAP_FLAG 921 Bool getCrossLayerAlignedIdrOnlyFlag() { return m_crossLayerAlignedIdrOnlyFlag; } 922 Void setCrossLayerAlignedIdrOnlyFlag(Bool x) { m_crossLayerAlignedIdrOnlyFlag = x; } 877 923 #endif 878 924 #if N0147_IRAP_ALIGN_FLAG … … 892 938 #endif 893 939 #if VPS_TSLAYERS 894 895 896 897 940 Bool getMaxTSLayersPresentFlag() { return m_maxTSLayersPresentFlag ;} 941 Void setMaxTSLayersPresentFlag(Bool x) { m_maxTSLayersPresentFlag = x;} 942 UInt getMaxTSLayersMinus1(Int layerId) { return m_maxTSLayerMinus1[layerId];} 943 Void setMaxTSLayersMinus1(Int layerId, UInt maxTSublayer) { m_maxTSLayerMinus1[layerId] = maxTSublayer;} 898 944 #endif 899 945 #if M0040_ADAPTIVE_RESOLUTION_CHANGE … … 924 970 #endif 925 971 #if N0160_VUI_EXT_ILP_REF 926 Bool getIlpRestrictedRefLayersFlag ( ) { return m_ilpRestrictedRefLayersFlag ;}927 Void setIlpRestrictedRefLayersFlag ( Int val ) { m_ilpRestrictedRefLayersFlag = val;}928 929 Int getMinSpatialSegmentOffsetPlus1( Int currLayerId, Int refLayerId ) { return m_minSpatialSegmentOffsetPlus1[currLayerId][refLayerId];}930 Void setMinSpatialSegmentOffsetPlus1( Int currLayerId, Int refLayerId, Int val ) { m_minSpatialSegmentOffsetPlus1[currLayerId][refLayerId] = val;}931 932 Bool getCtuBasedOffsetEnabledFlag ( Int currLayerId, Int refLayerId ) { return m_ctuBasedOffsetEnabledFlag[currLayerId][refLayerId];}933 Void setCtuBasedOffsetEnabledFlag ( Int currLayerId, Int refLayerId, Bool flag ) { m_ctuBasedOffsetEnabledFlag[currLayerId][refLayerId] = flag;}934 935 Int getMinHorizontalCtuOffsetPlus1 ( Int currLayerId, Int refLayerId ) { return m_minHorizontalCtuOffsetPlus1[currLayerId][refLayerId];}936 Void setMinHorizontalCtuOffsetPlus1 ( Int currLayerId, Int refLayerId, Int val ) { m_minHorizontalCtuOffsetPlus1[currLayerId][refLayerId] = val;}972 Bool getIlpRestrictedRefLayersFlag ( ) { return m_ilpRestrictedRefLayersFlag ;} 973 Void setIlpRestrictedRefLayersFlag ( Int val ) { m_ilpRestrictedRefLayersFlag = val;} 974 975 Int getMinSpatialSegmentOffsetPlus1( Int currLayerId, Int refLayerId ) { return m_minSpatialSegmentOffsetPlus1[currLayerId][refLayerId];} 976 Void setMinSpatialSegmentOffsetPlus1( Int currLayerId, Int refLayerId, Int val ) { m_minSpatialSegmentOffsetPlus1[currLayerId][refLayerId] = val;} 977 978 Bool getCtuBasedOffsetEnabledFlag ( Int currLayerId, Int refLayerId ) { return m_ctuBasedOffsetEnabledFlag[currLayerId][refLayerId];} 979 Void setCtuBasedOffsetEnabledFlag ( Int currLayerId, Int refLayerId, Bool flag ) { m_ctuBasedOffsetEnabledFlag[currLayerId][refLayerId] = flag;} 980 981 Int getMinHorizontalCtuOffsetPlus1 ( Int currLayerId, Int refLayerId ) { return m_minHorizontalCtuOffsetPlus1[currLayerId][refLayerId];} 982 Void setMinHorizontalCtuOffsetPlus1 ( Int currLayerId, Int refLayerId, Int val ) { m_minHorizontalCtuOffsetPlus1[currLayerId][refLayerId] = val;} 937 983 #endif 938 984 #if VPS_VUI_VIDEO_SIGNAL 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 985 Bool getVideoSigPresentVpsFlag() { return m_vidSigPresentVpsFlag; } 986 Void setVideoSigPresentVpsFlag(Bool x) { m_vidSigPresentVpsFlag = x; } 987 Int getNumVideoSignalInfo() { return m_vpsVidSigInfo; } 988 Void setNumVideoSignalInfo(Int x) { m_vpsVidSigInfo = x; } 989 Int getVideoSignalInfoIdx(Int idx) { return m_vpsVidSigIdx[idx]; } 990 Void setVideoSignalInfoIdx(Int idx, Int x) { m_vpsVidSigIdx[idx] = x; } 991 Int getVideoVPSFormat(Int idx) { return m_vpsVidFormat[idx]; } 992 Void setVideoVPSFormat(Int idx, Int x) { m_vpsVidFormat[idx] = x; } 993 Bool getVideoFullRangeVpsFlag(Int idx) { return m_vpsFullRangeFlag[idx];} 994 Void setVideoFullRangeVpsFlag(Int idx, Bool x) { m_vpsFullRangeFlag[idx] = x; } 995 Int getColorPrimaries(Int idx) { return m_vpsColorPrimaries[idx]; } 996 Void setColorPrimaries(Int idx, Int x) { m_vpsColorPrimaries[idx] = x; } 997 Int getTransCharacter(Int idx) { return m_vpsTransChar[idx]; } 998 Void setTransCharacter(Int idx, Int x) { m_vpsTransChar[idx] = x; } 999 Int getMaxtrixCoeff(Int idx) { return m_vpsMatCoeff[idx]; } 1000 Void setMaxtrixCoeff(Int idx, Int x) { m_vpsMatCoeff[idx] = x; } 955 1001 #endif 956 1002 #if VPS_VUI_BITRATE_PICRATE 957 Bool getBitRatePresentVpsFlag() { return m_bitRatePresentVpsFlag; } 958 Void setBitRatePresentVpsFlag(Bool x) { m_bitRatePresentVpsFlag = x; } 959 Bool getPicRatePresentVpsFlag() { return m_picRatePresentVpsFlag; } 960 Void setPicRatePresentVpsFlag(Bool x) { m_picRatePresentVpsFlag = x; } 961 962 Bool getBitRatePresentFlag(Int i, Int j) { return m_bitRatePresentFlag[i][j]; } 963 Void setBitRatePresentFlag(Int i, Int j, Bool x) { m_bitRatePresentFlag[i][j] = x; } 964 Bool getPicRatePresentFlag(Int i, Int j) { return m_picRatePresentFlag[i][j]; } 965 Void setPicRatePresentFlag(Int i, Int j, Bool x) { m_picRatePresentFlag[i][j] = x; } 966 967 Int getAvgBitRate(Int i, Int j) { return m_avgBitRate[i][j]; } 968 Void setAvgBitRate(Int i, Int j, Int x) { m_avgBitRate[i][j] = x; } 969 Int getMaxBitRate(Int i, Int j) { return m_maxBitRate[i][j]; } 970 Void setMaxBitRate(Int i, Int j, Int x) { m_maxBitRate[i][j] = x; } 971 972 Int getConstPicRateIdc(Int i, Int j) { return m_constPicRateIdc[i][j]; } 973 Void setConstPicRateIdc(Int i, Int j, Int x) { m_constPicRateIdc[i][j] = x; } 974 Int getAvgPicRate(Int i, Int j) { return m_avgPicRate[i][j]; } 975 Void setAvgPicRate(Int i, Int j, Int x) { m_avgPicRate[i][j] = x; } 976 #endif 1003 Bool getBitRatePresentVpsFlag() { return m_bitRatePresentVpsFlag; } 1004 Void setBitRatePresentVpsFlag(Bool x) { m_bitRatePresentVpsFlag = x; } 1005 Bool getPicRatePresentVpsFlag() { return m_picRatePresentVpsFlag; } 1006 Void setPicRatePresentVpsFlag(Bool x) { m_picRatePresentVpsFlag = x; } 1007 1008 Bool getBitRatePresentFlag(Int i, Int j) { return m_bitRatePresentFlag[i][j]; } 1009 Void setBitRatePresentFlag(Int i, Int j, Bool x) { m_bitRatePresentFlag[i][j] = x; } 1010 Bool getPicRatePresentFlag(Int i, Int j) { return m_picRatePresentFlag[i][j]; } 1011 Void setPicRatePresentFlag(Int i, Int j, Bool x) { m_picRatePresentFlag[i][j] = x; } 1012 1013 Int getAvgBitRate(Int i, Int j) { return m_avgBitRate[i][j]; } 1014 Void setAvgBitRate(Int i, Int j, Int x) { m_avgBitRate[i][j] = x; } 1015 Int getMaxBitRate(Int i, Int j) { return m_maxBitRate[i][j]; } 1016 Void setMaxBitRate(Int i, Int j, Int x) { m_maxBitRate[i][j] = x; } 1017 1018 Int getConstPicRateIdc(Int i, Int j) { return m_constPicRateIdc[i][j]; } 1019 Void setConstPicRateIdc(Int i, Int j, Int x) { m_constPicRateIdc[i][j] = x; } 1020 Int getAvgPicRate(Int i, Int j) { return m_avgPicRate[i][j]; } 1021 Void setAvgPicRate(Int i, Int j, Int x) { m_avgPicRate[i][j] = x; } 1022 #endif 1023 #if O0164_MULTI_LAYER_HRD 1024 Bool getVpsVuiBspHrdPresentFlag() { return m_vpsVuiBspHrdPresentFlag; } 1025 Void setVpsVuiBspHrdPresentFlag(Bool x) { m_vpsVuiBspHrdPresentFlag = x; } 1026 UInt getVpsNumBspHrdParametersMinus1() { return m_vpsNumBspHrdParametersMinus1; } 1027 Void setVpsNumBspHrdParametersMinus1(UInt i) { m_vpsNumBspHrdParametersMinus1 = i; } 1028 Bool getBspCprmsPresentFlag(UInt i) { return m_bspCprmsPresentFlag[i]; } 1029 Void setBspCprmsPresentFlag(UInt i, Bool val) { m_bspCprmsPresentFlag[i] = val; } 1030 TComHRD* getBspHrd(UInt i) { return &m_bspHrd[i]; } 1031 UInt getNumBitstreamPartitions(UInt i) { return m_numBitstreamPartitions[i]; } 1032 Void setNumBitstreamPartitions(UInt i, UInt val) { m_numBitstreamPartitions[i] = val; } 1033 UInt getLayerInBspFlag(UInt h, UInt i, UInt j) { return m_layerInBspFlag[h][i][j]; } 1034 Void setLayerInBspFlag(UInt h, UInt i, UInt j, UInt val) { m_layerInBspFlag[h][i][j] = val; } 1035 UInt getNumBspSchedCombinations(UInt i) { return m_numBspSchedCombinations[i]; } 1036 Void setNumBspSchedCombinations(UInt i, UInt val) { m_numBspSchedCombinations[i] = val; } 1037 UInt getBspCombHrdIdx(UInt h, UInt i, UInt j) { return m_bspCombHrdIdx[h][i][j]; } 1038 Void setBspCombHrdIdx(UInt h, UInt i, UInt j, UInt val) { m_bspCombHrdIdx[h][i][j] = val; } 1039 UInt getBspCombSchedIdx(UInt h, UInt i, UInt j) { return m_bspCombSchedIdx[h][i][j]; } 1040 Void setBspCombSchedIdx(UInt h, UInt i, UInt j, UInt val) { m_bspCombSchedIdx[h][i][j] = val; } 1041 #endif 1042 #if P0182_VPS_VUI_PS_FLAG 1043 Int getSPSId (Int layer) { return m_SPSId[layer]; } 1044 Void setSPSId (Int layer, Int val) { m_SPSId[layer] = val; } 1045 Int getPPSId (Int layer) { return m_PPSId[layer]; } 1046 Void setPPSId (Int layer, Int val) { m_PPSId[layer] = val; } 1047 Void setBaseLayerPSCompatibilityFlag (Int layer, int val) { m_baseLayerPSCompatibilityFlag[layer] = val; } 1048 Int getBaseLayerPSCompatibilityFlag (Int layer) { return m_baseLayerPSCompatibilityFlag[layer];} 1049 #endif 1050 1051 #if P0312_VERT_PHASE_ADJ 1052 Bool getVpsVuiVertPhaseInUseFlag() { return m_vpsVuiVertPhaseInUseFlag; } 1053 Void setVpsVuiVertPhaseInUseFlag(Bool x) { m_vpsVuiVertPhaseInUseFlag = x; } 1054 #endif 1055 1056 #if P0300_ALT_OUTPUT_LAYER_FLAG 1057 Bool getAltOuputLayerFlag(Int idx) { return m_altOutputLayerFlag[idx]; } 1058 Void setAltOuputLayerFlag(Int idx, Bool x) { m_altOutputLayerFlag[idx] = x; } 1059 #else 977 1060 #if O0153_ALT_OUTPUT_LAYER_FLAG 978 1061 Bool getAltOuputLayerFlag() { return m_altOutputLayerFlag; } 979 1062 Void setAltOuputLayerFlag(Bool x) { m_altOutputLayerFlag = x; } 980 1063 #endif 1064 #endif 981 1065 #if REPN_FORMAT_IN_VPS 982 1066 Bool getRepFormatIdxPresentFlag() { return m_repFormatIdxPresentFlag; } … … 988 1072 RepFormat* getVpsRepFormat(Int idx) { return &m_vpsRepFormat[idx]; } 989 1073 990 Int getVpsRepFormatIdx(Int idx) { return m_vpsRepFormatIdx[idx]; }991 Void setVpsRepFormatIdx(Int idx, Int x) { m_vpsRepFormatIdx[idx] = x; }1074 Int getVpsRepFormatIdx(Int idx) { return m_vpsRepFormatIdx[idx]; } 1075 Void setVpsRepFormatIdx(Int idx, Int x) { m_vpsRepFormatIdx[idx] = x; } 992 1076 #endif 993 1077 #if VIEW_ID_RELATED_SIGNALING 994 1078 #if O0109_VIEW_ID_LEN 995 Void setViewIdLen( Int val ) { m_viewIdLen = val;}996 Int 1079 Void setViewIdLen( Int val ) { m_viewIdLen = val; } 1080 Int getViewIdLen( ) { return m_viewIdLen; } 997 1081 #else 998 Void setViewIdLenMinus1( Int val ) { m_viewIdLenMinus1 = val;}999 Int getViewIdLenMinus1( ){ return m_viewIdLenMinus1; }1000 #endif 1001 1002 Void setViewIdVal( Int viewOrderIndex, Int val ) { m_viewIdVal[viewOrderIndex] = val;}1003 Int getViewIdVal( Int viewOrderIndex ){ return m_viewIdVal[viewOrderIndex]; }1004 Int 1005 1006 Int getViewIndex ( Int layerIdInNuh ){ return getScalabilityId( getLayerIdInVps(layerIdInNuh), VIEW_ORDER_INDEX ); }1007 1008 Int 1009 Int 1082 Void setViewIdLenMinus1( Int val ) { m_viewIdLenMinus1 = val; } 1083 Int getViewIdLenMinus1( ) { return m_viewIdLenMinus1; } 1084 #endif 1085 1086 Void setViewIdVal( Int viewOrderIndex, Int val ) { m_viewIdVal[viewOrderIndex] = val; } 1087 Int getViewIdVal( Int viewOrderIndex ) { return m_viewIdVal[viewOrderIndex]; } 1088 Int getScalabilityId(Int, ScalabilityType scalType ); 1089 1090 Int getViewIndex ( Int layerIdInNuh ) { return getScalabilityId( getLayerIdInVps(layerIdInNuh), VIEW_ORDER_INDEX ); } 1091 1092 Int getNumViews(); 1093 Int scalTypeToScalIdx( ScalabilityType scalType ); 1010 1094 #endif 1011 1095 #if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED 1012 1096 #if VPS_EXTN_OFFSET 1013 Int 1014 Void 1097 Int getExtensionOffset() { return m_extensionOffset; } 1098 Void setExtensionOffset( UInt offset ) { m_extensionOffset = offset; } 1015 1099 #endif 1016 1100 #endif … … 1020 1104 #endif 1021 1105 #if VPS_DPB_SIZE_TABLE 1022 Bool 1023 Void 1024 1025 Bool 1026 Void 1106 Bool getSubLayerFlagInfoPresentFlag(Int i) {return m_subLayerFlagInfoPresentFlag[i]; } 1107 Void setSubLayerFlagInfoPresentFlag(Int i, Bool x) {m_subLayerFlagInfoPresentFlag[i] = x; } 1108 1109 Bool getSubLayerDpbInfoPresentFlag(Int i, Int j) {return m_subLayerDpbInfoPresentFlag[i][j]; } 1110 Void setSubLayerDpbInfoPresentFlag(Int i, Int j, Bool x) {m_subLayerDpbInfoPresentFlag[i][j] = x; } 1027 1111 1028 1112 // For the 0-th output layer set, use the date from the active SPS for base layer. 1029 Int 1030 Void 1113 Int getMaxVpsDecPicBufferingMinus1(Int i, Int k, Int j) { assert(i != 0); return m_maxVpsDecPicBufferingMinus1[i][k][j]; } 1114 Void setMaxVpsDecPicBufferingMinus1(Int i, Int k, Int j, Int x) { m_maxVpsDecPicBufferingMinus1[i][k][j] = x; } 1031 1115 1032 1116 #if RESOLUTION_BASED_DPB 1033 Int 1034 Void 1035 #endif 1036 1037 Int getMaxVpsNumReorderPics(Int i, Int j){ assert(i != 0); return m_maxVpsNumReorderPics[i][j]; }1038 Void 1039 1040 Int getMaxVpsLatencyIncreasePlus1(Int i, Int j){ assert(i != 0); return m_maxVpsLatencyIncreasePlus1[i][j]; }1041 Void 1042 1043 Int 1044 Void 1045 Void 1117 Int getMaxVpsLayerDecPicBuffMinus1(Int i, Int k, Int j) { assert(i != 0); return m_maxVpsLayerDecPicBuffMinus1[i][k][j]; } 1118 Void setMaxVpsLayerDecPicBuffMinus1(Int i, Int k, Int j, Int x) { m_maxVpsLayerDecPicBuffMinus1[i][k][j] = x; } 1119 #endif 1120 1121 Int getMaxVpsNumReorderPics(Int i, Int j) { assert(i != 0); return m_maxVpsNumReorderPics[i][j]; } 1122 Void setMaxVpsNumReorderPics(Int i, Int j, Int x) { m_maxVpsNumReorderPics[i][j] = x; } 1123 1124 Int getMaxVpsLatencyIncreasePlus1(Int i, Int j) { assert(i != 0); return m_maxVpsLatencyIncreasePlus1[i][j]; } 1125 Void setMaxVpsLatencyIncreasePlus1(Int i, Int j, Int x) { m_maxVpsLatencyIncreasePlus1[i][j] = x; } 1126 1127 Int getNumSubDpbs(Int i) { return m_numSubDpbs[i]; } 1128 Void setNumSubDpbs(Int i, Int x) { m_numSubDpbs[i] = x; } 1129 Void determineSubDpbInfoFlags(); 1046 1130 #endif 1047 1131 … … 1053 1137 #if !P0307_REMOVE_VPS_VUI_OFFSET 1054 1138 #if VPS_VUI_OFFSET 1055 Int 1056 Void 1139 Int getVpsVuiOffset() { return m_vpsVuiOffset; } 1140 Void setVpsVuiOffset(Int x) { m_vpsVuiOffset = x; } 1057 1141 #endif 1058 1142 #endif 1059 1143 #if P0307_VPS_NON_VUI_EXTENSION 1060 Int 1061 Void 1144 Int getVpsNonVuiExtLength() { return m_vpsNonVuiExtLength; } 1145 Void setVpsNonVuiExtLength(Int x) { m_vpsNonVuiExtLength = x; } 1062 1146 #endif 1063 1147 #if RESOLUTION_BASED_DPB 1064 Void assignSubDpbIndices(); 1065 Int getSubDpbAssigned (Int lsIdx, Int layerIdx) { return m_subDpbAssigned[lsIdx][layerIdx]; } 1066 Int findLayerIdxInLayerSet ( Int lsIdx, Int nuhLayerId ); 1148 Void assignSubDpbIndices(); 1149 Int getSubDpbAssigned (Int lsIdx, Int layerIdx) { return m_subDpbAssigned[lsIdx][layerIdx]; } 1150 Int findLayerIdxInLayerSet ( Int lsIdx, Int nuhLayerId ); 1151 #endif 1152 #if O0164_MULTI_LAYER_HRD 1153 Void setBspHrdParameters( UInt hrdIdx, UInt frameRate, UInt numDU, UInt bitRate, Bool randomAccess ); 1067 1154 #endif 1068 1155 #endif //SVC_EXTENSION … … 1077 1164 Int m_winTopOffset; 1078 1165 Int m_winBottomOffset; 1166 #if P0312_VERT_PHASE_ADJ 1167 Bool m_vertPhasePositionEnableFlag; 1168 #endif 1079 1169 public: 1080 1170 Window() … … 1084 1174 , m_winTopOffset (0) 1085 1175 , m_winBottomOffset (0) 1176 #if P0312_VERT_PHASE_ADJ 1177 , m_vertPhasePositionEnableFlag(false) 1178 #endif 1086 1179 { } 1087 1180 1088 1181 Bool getWindowEnabledFlag() const { return m_enabledFlag; } 1089 Void resetWindow() { m_enabledFlag = false; m_winLeftOffset = m_winRightOffset = m_winTopOffset = m_winBottomOffset = 0; } 1182 #if P0312_VERT_PHASE_ADJ 1183 Void resetWindow() { m_enabledFlag = false; m_winLeftOffset = m_winRightOffset = m_winTopOffset = m_winBottomOffset = 0; m_vertPhasePositionEnableFlag = false; } 1184 #else 1185 Void resetWindow() { m_enabledFlag = false; m_winLeftOffset = m_winRightOffset = m_winTopOffset = m_winBottomOffset = 0;} 1186 #endif 1090 1187 Int getWindowLeftOffset() const { return m_enabledFlag ? m_winLeftOffset : 0; } 1091 1188 Void setWindowLeftOffset(Int val) { m_winLeftOffset = val; m_enabledFlag = true; } … … 1097 1194 Void setWindowBottomOffset(Int val) { m_winBottomOffset = val; m_enabledFlag = true; } 1098 1195 1196 #if P0312_VERT_PHASE_ADJ 1197 Bool getVertPhasePositionEnableFlag() const { return m_vertPhasePositionEnableFlag; } 1198 Void setVertPhasePositionEnableFlag(Bool val) { m_vertPhasePositionEnableFlag = val; } 1199 Void setWindow(Int offsetLeft, Int offsetLRight, Int offsetLTop, Int offsetLBottom, Bool vertPhasePositionEnableFlag = 0) 1200 #else 1099 1201 Void setWindow(Int offsetLeft, Int offsetLRight, Int offsetLTop, Int offsetLBottom) 1202 #endif 1100 1203 { 1101 1204 m_enabledFlag = true; … … 1104 1207 m_winTopOffset = offsetLTop; 1105 1208 m_winBottomOffset = offsetLBottom; 1209 #if P0312_VERT_PHASE_ADJ 1210 m_vertPhasePositionEnableFlag = vertPhasePositionEnableFlag; 1211 #endif 1106 1212 } 1107 1213 }; … … 1353 1459 1354 1460 #if SVC_EXTENSION 1355 UInt m_layerId;1461 UInt m_layerId; 1356 1462 UInt m_numScaledRefLayerOffsets; 1463 #if P0312_VERT_PHASE_ADJ 1464 Bool m_vertPhasePositionEnableFlag[MAX_LAYERS]; 1465 #endif 1357 1466 #if O0098_SCALED_REF_LAYER_ID 1358 1467 UInt m_scaledRefLayerId[MAX_LAYERS]; … … 1360 1469 Window m_scaledRefLayerWindow[MAX_LAYERS]; 1361 1470 #if REPN_FORMAT_IN_VPS 1362 Bool m_updateRepFormatFlag;1471 Bool m_updateRepFormatFlag; 1363 1472 #if O0096_REP_FORMAT_INDEX 1364 UInt m_updateRepFormatIndex;1473 UInt m_updateRepFormatIndex; 1365 1474 #endif 1366 1475 #endif 1367 1476 #if SCALINGLIST_INFERRING 1368 Bool m_inferScalingListFlag;1369 UInt m_scalingListRefLayerId;1477 Bool m_inferScalingListFlag; 1478 UInt m_scalingListRefLayerId; 1370 1479 #endif 1371 1480 #endif //SVC_EXTENSION … … 1507 1616 1508 1617 #if SVC_EXTENSION 1509 Void setLayerId(UInt layerId) { m_layerId = layerId; } 1510 UInt getLayerId() { return m_layerId; } 1511 UInt getNumScaledRefLayerOffsets() { return m_numScaledRefLayerOffsets; } 1512 Void setNumScaledRefLayerOffsets(Int x) { m_numScaledRefLayerOffsets = x; } 1618 Void setLayerId(UInt layerId) { m_layerId = layerId; } 1619 UInt getLayerId() { return m_layerId; } 1620 UInt getNumScaledRefLayerOffsets() { return m_numScaledRefLayerOffsets; } 1621 Void setNumScaledRefLayerOffsets(Int x) { m_numScaledRefLayerOffsets = x; } 1622 #if P0312_VERT_PHASE_ADJ 1623 Bool getVertPhasePositionEnableFlag(Int x) { return m_vertPhasePositionEnableFlag[x]; } 1624 Void setVertPhasePositionEnableFlag(Int x, Bool b) { m_vertPhasePositionEnableFlag[x] = b; } 1625 #endif 1513 1626 #if O0098_SCALED_REF_LAYER_ID 1514 1627 UInt getScaledRefLayerId(Int x) { return m_scaledRefLayerId[x]; } 1515 Void setScaledRefLayerId(Int x, UInt id) { m_scaledRefLayerId[x] = id; }1628 Void setScaledRefLayerId(Int x, UInt id) { m_scaledRefLayerId[x] = id; } 1516 1629 Window& getScaledRefLayerWindowForLayer( Int layerId ); 1517 1630 #endif … … 1624 1737 Bool m_inferScalingListFlag; 1625 1738 UInt m_scalingListRefLayerId; 1739 #endif 1740 #if POC_RESET_IDC 1741 Bool m_pocResetInfoPresentFlag; 1626 1742 #endif 1627 1743 #endif … … 1762 1878 Bool getSliceHeaderExtensionPresentFlag () { return m_sliceHeaderExtensionPresentFlag; } 1763 1879 Void setSliceHeaderExtensionPresentFlag (Bool val) { m_sliceHeaderExtensionPresentFlag = val; } 1880 #if POC_RESET_IDC 1881 Bool getPocResetInfoPresentFlag () { return m_pocResetInfoPresentFlag; } 1882 Void setPocResetInfoPresentFlag (const Bool val) { m_pocResetInfoPresentFlag = val; } 1883 #endif 1764 1884 }; 1765 1885 … … 1899 2019 Int m_activeNumILRRefIdx; //< Active inter-layer reference pictures 1900 2020 Int m_interLayerPredLayerIdc [MAX_VPS_LAYER_ID_PLUS1]; 2021 #if P0312_VERT_PHASE_ADJ 2022 Bool m_vertPhasePositionFlag[MAX_VPS_LAYER_ID_PLUS1]; 2023 #endif 1901 2024 #if POC_RESET_FLAG 1902 2025 Bool m_bPocResetFlag; … … 1906 2029 #if O0149_CROSS_LAYER_BLA_FLAG 1907 2030 Bool m_bCrossLayerBLAFlag; 2031 #endif 2032 #if NO_OUTPUT_OF_PRIOR_PICS 2033 Bool m_noOutputOfPriorPicsFlag; 2034 Bool m_noRaslOutputFlag; 2035 Bool m_handleCraAsBlaFlag; 2036 #endif 2037 #if POC_RESET_IDC_SIGNALLING 2038 Int m_pocResetIdc; 2039 Int m_pocResetPeriodId; 2040 Bool m_fullPocResetFlag; 2041 Int m_pocLsbVal; 2042 Int m_pocMsbVal; 2043 Bool m_pocMsbValRequiredFlag; 2044 Bool m_pocMsbValPresentFlag; 1908 2045 #endif 1909 2046 #endif //SVC_EXTENSION … … 1993 2130 NalUnitType getNalUnitType () const { return m_eNalUnitType; } 1994 2131 Bool getRapPicFlag (); 2132 #if NO_OUTPUT_OF_PRIOR_PICS 2133 Bool getBlaPicFlag (); 2134 Bool getCraPicFlag (); 2135 #endif 1995 2136 Bool getIdrPicFlag () { return getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_W_RADL || getNalUnitType() == NAL_UNIT_CODED_SLICE_IDR_N_LP; } 1996 2137 Bool isIRAP () const { return (getNalUnitType() >= 16) && (getNalUnitType() <= 23); } … … 2170 2311 Bool getInterLayerPredEnabledFlag () { return m_interLayerPredEnabledFlag;} 2171 2312 2313 #if P0312_VERT_PHASE_ADJ 2314 Int getVertPhasePositionFlag (UInt layerIdx) { return m_vertPhasePositionFlag[layerIdx];} 2315 Void setVertPhasePositionFlag (Bool b, UInt layerIdx) { m_vertPhasePositionFlag[layerIdx] = b; } 2316 #endif 2317 2172 2318 Void setNumMotionPredRefLayers(int i) { m_numMotionPredRefLayers = i; } 2173 2319 Int getNumMotionPredRefLayers() { return m_numMotionPredRefLayers; } … … 2214 2360 2215 2361 Void setILRPic(TComPic **pcIlpPic); 2362 #if NO_OUTPUT_OF_PRIOR_PICS 2363 Void setNoOutputOfPriorPicsFlag(const Bool x) { m_noOutputOfPriorPicsFlag = x; } 2364 Bool getNoOutputOfPriorPicsFlag() { return m_noOutputOfPriorPicsFlag; } 2365 2366 Void setNoRaslOutputFlag ( const Bool val ) { m_noRaslOutputFlag = val; } 2367 Bool getNoRaslOutputFlag () { return m_noRaslOutputFlag; } 2368 2369 Void setHandleCraAsBlaFlag ( const Bool val ) { m_handleCraAsBlaFlag = val; } 2370 Bool getHandleCraAsBlaFlag () { return m_handleCraAsBlaFlag; } 2371 2372 #endif 2373 #if POC_RESET_IDC_SIGNALLING 2374 Int getPocResetIdc () { return m_pocResetIdc; } 2375 Void setPocResetIdc (Int b) { m_pocResetIdc = b; } 2376 Int getPocResetPeriodId () { return m_pocResetPeriodId; } 2377 Void setPocResetPeriodId (Int b) { m_pocResetPeriodId = b; } 2378 Bool getFullPocResetFlag () { return m_fullPocResetFlag; } 2379 Void setFullPocResetFlag (Bool b) { m_fullPocResetFlag = b; } 2380 Int getPocLsbVal () { return m_pocLsbVal; } 2381 Void setPocLsbVal (Int b) { m_pocLsbVal = b; } 2382 Int getPocMsbVal () { return m_pocMsbVal; } 2383 Void setPocMsbVal (Int b) { m_pocMsbVal = b; } 2384 Bool getPocMsbValPresentFlag () { return m_pocMsbValPresentFlag; } 2385 Void setPocMsbValPresentFlag (Bool x) { m_pocMsbValPresentFlag = x; } 2386 Bool getPocMsbValRequiredFlag () { return m_pocMsbValRequiredFlag; } 2387 Void setPocMsbValRequiredFlag (Bool x) { m_pocMsbValRequiredFlag = x; } 2388 #endif 2216 2389 2217 2390 #endif //SVC_EXTENSION
Note: See TracChangeset for help on using the changeset viewer.
