Changeset 210 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComSlice.h
- Timestamp:
- 11 Dec 2012, 18:52:43 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/Lib/TLibCommon/TComSlice.h
r189 r210 144 144 #endif 145 145 146 #if VIDYO_VPS_INTEGRATION 146 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 147 147 /// VPS class 148 148 … … 156 156 157 157 UInt m_uiExtensionType; 158 158 #if !QC_MVHEVC_B0046 159 159 Bool m_bDependentFlag[MAX_LAYER_NUM]; 160 #else 161 UInt m_uiNumHRDParameter; 162 UInt m_numAddiLayerOperationPoints; 163 UInt m_numAddiProLevelSets; 164 UInt m_numDirectRefLayer[MAX_LAYER_NUM]; 165 UInt m_numDirectRefID[MAX_LAYER_NUM][MAX_LAYER_NUM]; 166 UInt m_numOpLayerIdMinus1[MAX_LAYER_NUM]; 167 UInt m_numOpLayerId[MAX_LAYER_NUM][MAX_LAYER_NUM]; 168 #endif 160 169 UInt m_uiViewId[MAX_LAYER_NUM]; 170 #if !QC_MVHEVC_B0046 161 171 Bool m_bDepthFlag[MAX_LAYER_NUM]; 172 #endif 162 173 Int m_iViewOrderIdx[MAX_LAYER_NUM]; 174 #if !QC_MVHEVC_B0046 163 175 UInt m_uiDependentLayer[MAX_LAYER_NUM]; 176 #endif 164 177 165 178 UInt m_numReorderPics[MAX_TLAYER]; … … 182 195 Bool getTemporalNestingFlag () { return m_uiMaxLayers; } 183 196 Void setTemporalNestingFlag (UInt t) { m_bTemporalIdNestingFlag = t; } 184 197 #if !QC_MVHEVC_B0046 185 198 Void setExtensionType(UInt v) { m_uiExtensionType = v; } 186 199 UInt getExtensionType() { return m_uiExtensionType; } … … 188 201 Void setDependentFlag(Bool d, UInt layer) { m_bDependentFlag[layer] = d; } 189 202 Bool getDependentFlag(UInt layer) { return m_bDependentFlag[layer]; } 190 203 #endif 191 204 Void setViewId(UInt v, UInt layer) { m_uiViewId[layer] = v; } 192 205 UInt getViewId(UInt layer) { return m_uiViewId[layer]; } 193 206 #if !QC_MVHEVC_B0046 194 207 Void setDepthFlag(Bool d, UInt layer) { m_bDepthFlag[layer] = d; } 195 208 Bool getDepthFlag(UInt layer) { return m_bDepthFlag[layer]; } 196 209 #endif 197 210 Void setViewOrderIdx(Int v, UInt layer) { m_iViewOrderIdx[layer] = v; } 198 211 Int getViewOrderIdx(UInt layer) { return m_iViewOrderIdx[layer]; } 199 212 #if !QC_MVHEVC_B0046 200 213 Void setDependentLayer(UInt v, UInt layer) { m_uiDependentLayer[layer] = v; } 201 214 UInt getDependentLayer(UInt layer) { return m_uiDependentLayer[layer]; } 202 215 #endif 203 216 Void setNumReorderPics(UInt v, UInt tLayer) { m_numReorderPics[tLayer] = v; } 204 217 UInt getNumReorderPics(UInt tLayer) { return m_numReorderPics[tLayer]; } … … 209 222 Void setMaxLatencyIncrease(UInt v, UInt tLayer) { m_uiMaxLatencyIncrease[tLayer] = v; } 210 223 UInt getMaxLatencyIncrease(UInt tLayer) { return m_uiMaxLatencyIncrease[tLayer]; } 211 224 #if QC_MVHEVC_B0046 225 Void setNumHRDParameters(UInt n) { m_uiNumHRDParameter = n; } 226 UInt getNumHRDParameters() { return m_uiNumHRDParameter; } 227 Void setNumDirectRefLayer(UInt n, UInt layer) { m_numDirectRefLayer[layer] = n; }; 228 UInt getNumDirectRefLayer(UInt layer) { return m_numDirectRefLayer[layer]; }; 229 Void setDirectRefLayerId (UInt n, UInt layer, UInt refId) { m_numDirectRefID[layer][refId] = n; assert(refId < MAX_NUM_REF ); }; 230 UInt getDirectRefLayerId ( UInt layer, UInt refId) { return m_numDirectRefID[layer][refId]; }; 231 UInt getNumAddiLayerOperationPoints( ) { return m_numAddiLayerOperationPoints; }; 232 Void setNumAddiLayerOperationPoints(UInt n) { m_numAddiLayerOperationPoints = n; }; 233 Void setNumAddiProLevelSets (UInt n) { m_numAddiProLevelSets = n;} 234 UInt getNumAddiProLevelSets ( ) { return m_numAddiProLevelSets;} 235 236 Void setNumOpLayerIdMinus1 (UInt n, UInt layer) { m_numOpLayerIdMinus1[layer] = n;} 237 UInt getNumOpLayerIdMinus1 (UInt layer ) { return m_numOpLayerIdMinus1[layer];} 238 239 Void setNumOpLayerId (UInt n, UInt layer, UInt OpId) { m_numOpLayerId[layer][OpId] = n;} 240 UInt getNumOpLayerId (UInt layer, UInt OpId ) { return m_numOpLayerId[layer][OpId];} 241 242 #endif 212 243 }; 213 244 … … 218 249 { 219 250 private: 220 #if VIDYO_VPS_INTEGRATION 251 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 221 252 Int m_VPSId; 222 253 #endif … … 363 394 #endif 364 395 396 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723 397 Bool m_bUseDMM34; 398 #endif 399 365 400 #if OL_QTLIMIT_PREDCODING_B0068 366 401 Bool m_bUseQTLPC; … … 391 426 TComSPS(); 392 427 virtual ~TComSPS(); 393 #if VIDYO_VPS_INTEGRATION 428 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 394 429 Int getVPSId () { return m_VPSId; } 395 430 Void setVPSId (Int i) { m_VPSId = i; } … … 643 678 #endif 644 679 680 #if HHI_DMM_PRED_TEX && FLEX_CODING_ORDER_M23723 681 Bool getUseDMM34() { return m_bUseDMM34; } 682 Void setUseDMM34( Bool b ) { m_bUseDMM34 = b; } 683 #endif 684 645 685 #if OL_QTLIMIT_PREDCODING_B0068 646 686 Void setUseQTLPC( Bool b ) { m_bUseQTLPC = b; } … … 1221 1261 1222 1262 // access channel 1223 #if VIDYO_VPS_INTEGRATION 1263 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 1224 1264 TComVPS* m_pcVPS; 1265 #endif 1266 #if QC_IV_AS_LT_B0046 1267 Bool m_bWasLongTerm[2][MAX_NUM_REF+1]; //was long-term picture 1225 1268 #endif 1226 1269 TComSPS* m_pcSPS; … … 1297 1340 Int m_aaiCodedOffset[2][MAX_VIEW_NUM]; 1298 1341 1299 #if SONY_COLPIC_AVAILABILITY 1342 #if SONY_COLPIC_AVAILABILITY|QC_MVHEVC_B0046 1300 1343 Int m_iViewOrderIdx; 1301 1344 #endif … … 1311 1354 Void initTiles(); 1312 1355 1313 #if VIDYO_VPS_INTEGRATION 1356 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 1314 1357 Void setVPS ( TComVPS* pcVPS ) { m_pcVPS = pcVPS; } 1315 1358 TComVPS* getVPS () { return m_pcVPS; } 1316 1359 #endif 1360 #if QC_IV_AS_LT_B0046 1361 Void setWasLongTerm( Bool lt, RefPicList e, Int iRefIdx ) { m_bWasLongTerm[e][iRefIdx] = lt; } 1362 Bool getWasLongTerm( RefPicList e, Int iRefIdx ) { return m_bWasLongTerm[e][iRefIdx] ; } 1363 #endif 1364 1317 1365 Void setSPS ( TComSPS* pcSPS ) { m_pcSPS = pcSPS; } 1318 1366 TComSPS* getSPS () { return m_pcSPS; } … … 1587 1635 Void setViewId( Int viewId ) { m_viewId = viewId; } 1588 1636 Int getViewId() { return m_viewId; } 1637 #if QC_MVHEVC_B0046 1638 Void setViewOrderIdx(Int v, UInt layer) { m_iViewOrderIdx = v; } 1639 Int getViewOrderIdx() { return m_iViewOrderIdx; } 1640 #endif 1589 1641 Void setIsDepth( Bool isDepth ) { m_isDepth = isDepth; } 1590 1642 Bool getIsDepth() { return m_isDepth; } … … 1655 1707 } 1656 1708 1709 #if QC_MVHEVC_B0046 1710 Void clearPSList() 1711 { 1712 m_paramsetMap.clear(); 1713 } 1714 #endif 1657 1715 private: 1658 1716 std::map<Int,T *> m_paramsetMap; … … 1665 1723 ParameterSetManager(); 1666 1724 virtual ~ParameterSetManager(); 1667 #if VIDYO_VPS_INTEGRATION 1725 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 1668 1726 //! store video parameter set and take ownership of it 1669 1727 Void storeVPS(TComVPS *vps) { m_vpsMap.storePS( vps->getVPSId(), vps); }; … … 1671 1729 TComVPS* getVPS(Int vpsId) { return m_vpsMap.getPS(vpsId); }; 1672 1730 TComVPS* getFirstVPS() { return m_vpsMap.getFirstPS(); }; 1731 #if QC_MVHEVC_B0046 1732 Void clearVPS() { m_vpsMap.clearPSList(); }; 1733 Void clearSPS() { m_spsMap.clearPSList(); }; 1734 Void clearPPS() { m_ppsMap.clearPSList(); }; 1735 #endif 1673 1736 #endif 1674 1737 //! store sequence parameter set and take ownership of it … … 1693 1756 ParameterSetMap<TComPPS> m_ppsMap; 1694 1757 ParameterSetMap<TComAPS> m_apsMap; 1695 #if VIDYO_VPS_INTEGRATION 1758 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 1696 1759 ParameterSetMap<TComVPS> m_vpsMap; 1697 1760 #endif
Note: See TracChangeset for help on using the changeset viewer.