Changeset 479 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h
- Timestamp:
- 18 Jun 2013, 23:24:53 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h
r478 r479 54 54 class TComPicLists; 55 55 #endif 56 #if H_3D_IV_MERGE57 class TComDepthMapGenerator;58 #endif59 56 // ==================================================================================================================== 60 57 // Constants … … 540 537 Int m_refLayerId [ MAX_NUM_LAYERS ][MAX_NUM_LAYERS]; 541 538 539 #if H_3D_IV_MERGE 540 Bool m_ivMvPredFlag [ MAX_NUM_LAYERS ]; 541 #endif 542 542 #endif 543 543 public: … … 673 673 Bool checkVPSExtensionSyntax(); 674 674 Int scalTypeToScalIdx ( ScalabilityType scalType ); 675 #if H_3D_IV_MERGE 676 Void setIvMvPredFlag ( Int layerIdInVps, Bool val ) { m_ivMvPredFlag[ layerIdInVps ] = val; } 677 Bool getIvMvPredFlag ( Int layerIdInVps ) { return m_ivMvPredFlag[ layerIdInVps ]; }; 678 #endif 675 679 #endif 676 680 }; … … 984 988 Int m_aaiCodedScale [2][MAX_NUM_LAYERS]; 985 989 Int m_aaiCodedOffset[2][MAX_NUM_LAYERS]; 986 #if H_3D_IV_MERGE987 UInt m_uiMultiviewMvPredMode;988 UInt m_uiPredDepthMapGeneration;989 990 UInt m_uiViewIndex;991 Bool m_bDepth;992 TComDepthMapGenerator* m_pcDepthMapGenerator;993 #endif994 990 #endif 995 991 public: … … 1135 1131 Int* getInvCodedScale () { return m_aaiCodedScale [1]; } 1136 1132 Int* getInvCodedOffset () { return m_aaiCodedOffset[1]; } 1137 #if H_3D_IV_MERGE1138 Void initCamParaSPSDepth ( UInt uiViewIndex);1139 UInt getMultiviewMvPredMode () { return m_uiMultiviewMvPredMode; }1140 UInt getPredDepthMapGeneration() { return m_uiPredDepthMapGeneration; }1141 1142 UInt getViewIndex () { return m_uiViewIndex; }1143 Bool isDepth () { return m_bDepth; }1144 Void setDepthMapGenerator( TComDepthMapGenerator* pcDepthMapGenerator ) { m_pcDepthMapGenerator = pcDepthMapGenerator; }1145 TComDepthMapGenerator* getDepthMapGenerator() { return m_pcDepthMapGenerator; }1146 Void setPredDepthMapGeneration( UInt uiViewIndex, Bool bIsDepth, UInt uiPdmGenMode = 0, UInt uiPdmMvPredMode = 0);1147 #endif1148 1133 #endif 1149 1134 }; … … 1436 1421 #endif 1437 1422 Bool m_bIsUsedAsLongTerm[2][MAX_NUM_REF+1]; 1438 #if H_3D_IV_MERGE1439 TComPic* m_pcTexturePic;1440 #endif1441 1423 Int m_iDepth; 1442 1424 … … 1510 1492 Bool m_isDepth; 1511 1493 Int m_aaiCodedScale [2][MAX_NUM_LAYERS]; 1512 Int m_aaiCodedOffset[2][MAX_NUM_LAYERS]; 1494 Int m_aaiCodedOffset[2][MAX_NUM_LAYERS]; 1495 #if H_3D_GEN 1496 TComPic* m_ivPicsCurrPoc [2][MAX_NUM_LAYERS]; 1497 #endif 1513 1498 #endif 1514 1499 #endif … … 1569 1554 TComPic* getRefPic ( RefPicList e, Int iRefIdx) { return m_apcRefPicList[e][iRefIdx]; } 1570 1555 Int getRefPOC ( RefPicList e, Int iRefIdx) { return m_aiRefPOCList[e][iRefIdx]; } 1556 #if H_3D_GEN 1557 TComPic* getIvPic ( Bool depthFlag, Int viewIndex){ return m_ivPicsCurrPoc[ depthFlag ? 1 : 0 ][ viewIndex ]; } 1558 #endif 1571 1559 #if H_3D_IV_MERGE 1572 TComPic* getTexturePic () const { return m_pcTexturePic; }1560 TComPic* getTexturePic () { return m_ivPicsCurrPoc[0][ m_viewIndex ]; } 1573 1561 #endif 1574 1562 Int getDepth () { return m_iDepth; } … … 1622 1610 Void setRefPic ( TComPic* p, RefPicList e, Int iRefIdx ) { m_apcRefPicList[e][iRefIdx] = p; } 1623 1611 Void setRefPOC ( Int i, RefPicList e, Int iRefIdx ) { m_aiRefPOCList[e][iRefIdx] = i; } 1624 #if H_3D_IV_MERGE1625 Void setTexturePic ( TComPic *pcTexturePic ) { m_pcTexturePic = pcTexturePic; }1626 #endif1627 1612 Void setNumRefIdx ( RefPicList e, Int i ) { m_aiNumRefIdx[e] = i; } 1628 1613 Void setPic ( TComPic* p ) { m_pcPic = p; } … … 1789 1774 #endif 1790 1775 #endif 1776 #if H_3D_GEN 1777 Void setIvPicLists( TComPicLists* m_ivPicLists ); 1778 #endif 1779 1791 1780 protected: 1792 1781 TComPic* xGetRefPic (TComList<TComPic*>& rcListPic, … … 1794 1783 TComPic* xGetLongTermRefPic(TComList<TComPic*>& rcListPic, Int poc, Bool pocHasMsb); 1795 1784 #if H_MV 1796 TComPic* xGetInterLayerRefPic( std::vector<TComPic*>& rcListIlPic, Int layerId ); 1785 TComPic* xGetInterLayerRefPic( std::vector<TComPic*>& rcListIlPic, Int layerId ); 1797 1786 #endif 1798 1787 };// END CLASS DEFINITION TComSlice
Note: See TracChangeset for help on using the changeset viewer.