Changeset 747 in 3DVCSoftware
- Timestamp:
- 17 Dec 2013, 21:57:52 (11 years ago)
- Location:
- branches/HTM-9.0r1-F0122
- Files:
-
- 24 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-9.0r1-F0122/source/App/TAppDecoder/TAppDecTop.cpp
r655 r747 286 286 #endif 287 287 } 288 #if H_3D 288 #if H_3DV 289 289 if ( allLayersDecoded || !bitstreamFile ) 290 290 { -
branches/HTM-9.0r1-F0122/source/App/TAppEncoder/TAppEncCfg.cpp
r724 r747 243 243 {"main-stereo", Profile::MAINSTEREO}, 244 244 {"main-multiview", Profile::MAINMULTIVIEW}, 245 #if H_3D 245 #if H_3DV 246 246 {"main-3d" , Profile::MAIN3D}, 247 247 #endif … … 775 775 ("ViewSynthesisPred", m_viewSynthesisPredFlag, true , "view synthesis prediction " ) 776 776 #endif 777 #if H_3D 777 #if H_3DV 778 778 ("IvMvScaling", m_ivMvScalingFlag , true , "inter view motion vector scaling" ) 779 779 #endif … … 2461 2461 printf("ViewSynthesisPred:%d ", m_viewSynthesisPredFlag ); 2462 2462 #endif 2463 #if H_3D 2463 #if H_3DV 2464 2464 printf("IvMvScaling:%d ", m_ivMvScalingFlag ? 1 : 0 ); 2465 2465 #endif -
branches/HTM-9.0r1-F0122/source/App/TAppEncoder/TAppEncCfg.h
r724 r747 141 141 Bool m_viewSynthesisPredFlag; 142 142 #endif 143 #if H_3D 143 #if H_3DV 144 144 Bool m_ivMvScalingFlag; 145 145 #endif -
branches/HTM-9.0r1-F0122/source/App/TAppEncoder/TAppEncTop.cpp
r735 r747 1651 1651 for ( Int layer = 0; layer <= vps.getMaxLayersMinus1(); layer++ ) 1652 1652 { 1653 #if H_3DV 1653 1654 Bool isDepth = ( vps.getDepthId( layer ) == 1 ) ; 1654 1655 Bool isLayerZero = ( layer == 0 ); 1656 #endif 1655 1657 1656 1658 #if H_3D_ARP … … 1715 1717 #endif 1716 1718 } 1717 #if H_3D 1719 #if H_3DV 1718 1720 vps.setIvMvScalingFlag( m_ivMvScalingFlag ); 1719 1721 #endif -
branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComDataCU.cpp
r724 r747 4057 4057 4058 4058 numValidMergeCand = getSlice()->getMaxNumMergeCand(); 4059 #if H_3D 4059 #if H_3DV 4060 4060 ////////////////////////////////// 4061 4061 //////// DERIVE LOCATIONS //////// … … 4724 4724 iCount += numA1B1B0; 4725 4725 #else 4726 #if H_3D 4726 #if H_3DV 4727 4727 //////////////////////////// 4728 4728 //////// LEFT (A1) ///////// … … 4815 4815 return; 4816 4816 } 4817 #if H_3D 4817 #if H_3DV 4818 4818 //////////////////////////// 4819 4819 //////// ABOVE (B1) //////// … … 4925 4925 } 4926 4926 4927 #if H_3D 4927 #if H_3DV 4928 4928 ////////////////////////////////// 4929 4929 //////// ABOVE RIGHT (B0) //////// … … 5128 5128 iCount += numA0B2; 5129 5129 #else 5130 #if H_3D 5130 #if H_3DV 5131 5131 /////////////////////////////////// 5132 5132 //////// LEFT BOTTOM (A0) //////// … … 5185 5185 return; 5186 5186 } 5187 #if H_3D 5187 #if H_3DV 5188 5188 /////////////////////////////////// 5189 5189 //////// LEFT ABOVE (B2) //////// … … 5297 5297 numValidMergeCand = iCount; 5298 5298 #else 5299 #if H_3D 5299 #if H_3DV 5300 5300 ///////////////////////////////// 5301 5301 //////// Collocate (COL) //////// … … 5532 5532 } 5533 5533 numValidMergeCand = getSlice()->getMaxNumMergeCand(); 5534 #if H_3D 5534 #if H_3DV 5535 5535 ////////////////////////////////// 5536 5536 //////// DERIVE LOCATIONS //////// … … 5735 5735 #endif 5736 5736 5737 #if H_3D 5737 #if H_3DV 5738 5738 //////////////////////////// 5739 5739 //////// LEFT (A1) ///////// … … 5826 5826 return; 5827 5827 } 5828 #if H_3D 5828 #if H_3DV 5829 5829 //////////////////////////// 5830 5830 //////// ABOVE (B1) //////// … … 5936 5936 } 5937 5937 5938 #if H_3D 5938 #if H_3DV 5939 5939 ////////////////////////////////// 5940 5940 //////// ABOVE RIGHT (B0) //////// … … 6090 6090 } 6091 6091 #endif 6092 #if H_3D 6092 #if H_3DV 6093 6093 /////////////////////////////////// 6094 6094 //////// LEFT BOTTOM (A0) //////// … … 6147 6147 return; 6148 6148 } 6149 #if H_3D 6149 #if H_3DV 6150 6150 /////////////////////////////////// 6151 6151 //////// LEFT ABOVE (B2) //////// … … 6239 6239 } 6240 6240 #endif 6241 #if H_3D 6241 #if H_3DV 6242 6242 ///////////////////////////////// 6243 6243 //////// Collocate (COL) //////// … … 7164 7164 + ( iPartWidth/m_pcPic->getMinCUWidth() )/2]; 7165 7165 } 7166 #if H_3D 7166 #if H_3DV 7167 7167 Void TComDataCU::compressMV(Int scale) 7168 7168 #else … … 7170 7170 #endif 7171 7171 { 7172 #if H_3D 7172 #if H_3DV 7173 7173 Int scaleFactor = (4 / scale ) * AMVP_DECIMATION_FACTOR / m_unitSize; 7174 7174 #else -
branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComDataCU.h
r724 r747 660 660 Void getMvPredAbove ( TComMv& rcMvPred ) { rcMvPred = m_cMvFieldB.getMv(); } 661 661 Void getMvPredAboveRight ( TComMv& rcMvPred ) { rcMvPred = m_cMvFieldC.getMv(); } 662 #if H_3D 662 #if H_3DV 663 663 Void compressMV ( Int scale ); 664 664 #else -
branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComPic.cpp
r655 r747 156 156 deleteSEIs(m_SEIs); 157 157 } 158 #if H_3D 158 #if H_3DV 159 159 Void TComPic::compressMotion(Int scale) 160 160 #else … … 166 166 { 167 167 TComDataCU* pcCU = pPicSym->getCU(uiCUAddr); 168 #if H_3D 168 #if H_3DV 169 169 pcCU->compressMV(scale); 170 170 #else -
branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComPic.h
r655 r747 184 184 Void setNumReorderPics(Int i, UInt tlayer) { m_numReorderPics[tlayer] = i; } 185 185 Int getNumReorderPics(UInt tlayer) { return m_numReorderPics[tlayer]; } 186 #if H_3D 186 #if H_3DV 187 187 Void compressMotion(Int scale); 188 188 #else -
branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComSlice.cpp
r724 r747 1811 1811 } 1812 1812 #endif 1813 #if H_3D 1813 #if H_3DV 1814 1814 m_ivMvScalingFlag = true; 1815 1815 #endif … … 3029 3029 { 3030 3030 Bool setupLUT = false; 3031 #if H_3DV 3031 3032 Int layerIdInVPS = getVPS()->getLayerIdInNuh( m_layerId ); 3032 3033 #endif 3033 3034 #if H_3D_VSP 3034 3035 setupLUT = setupLUT || getVPS()->getViewSynthesisPredFlag( layerIdInVPS); -
branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TComSlice.h
r724 r747 616 616 Int* m_iIdx2DepthValue [MAX_NUM_LAYERS ]; 617 617 #endif 618 #if H_3D 618 #if H_3DV 619 619 Bool m_ivMvScalingFlag; 620 620 #endif … … 858 858 #endif 859 859 860 #if H_3DV 860 861 Bool getIvMvScalingFlag ( ) { return m_ivMvScalingFlag; } 861 862 Void setIvMvScalingFlag ( Bool b ) { m_ivMvScalingFlag = b; } 863 #endif 862 864 #if H_3D_INTER_SDC 863 865 Bool getInterSDCFlag ( Int layerIdInVps ) { return m_bInterSDCFlag[layerIdInVps]; } -
branches/HTM-9.0r1-F0122/source/Lib/TLibCommon/TypeDef.h
r735 r747 74 74 75 75 #if H_3D 76 #define H_3DV 1 // QC_F0122 MV-HEVC with depth support 77 // This macro equal to 1 indicates 3D-HEVC 78 // This macro equal to 0 indicates MV-HEVC plus depth coding 79 // CY: H_3D is now mainly used to control the common framework, common high-level syntax (HLS) and 80 // common encoder optimization for both 3D-HEVC and MV-HEVC. 81 // H_3DV controls all the other 3D-HEVC features, including coding tools and different HLS. 82 76 83 #define H_3D_QTLPC 1 // OL_QTLIMIT_PREDCODING_B0068 //JCT3V-B0068 77 84 // HHI_QTLPC_RAU_OFF_C0160 // JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units … … 82 89 // SAIT_VSO_EST_A0033, JCT3V-A0033 modification 3 83 90 // LGE_WVSO_A0119 91 #if H_3DV 84 92 #define H_3D_NBDV 1 // Neighboring block disparity derivation 85 93 // QC_JCT3V-A0097 … … 180 188 #define KWU_RC_MADPRED_E0227 0 ///< JCT3V-E0227, inter-view MAD prediction 181 189 190 #endif // H_3DV 191 #else 192 #define H_3DV 0 // QC_F0122 MV-HEVC with depth support, this value shall always be 0 here 182 193 #endif // H_3D 183 194 … … 248 259 ///////////////////////////////////////////////////////////////////////////////////////// 249 260 250 #if H_3D 261 #if H_3DV 251 262 252 263 #define FIX_MISSING_MACRO_R690 1 // Missing macro in integration to revision 690 … … 772 783 MAIN10 = 2, 773 784 MAINSTILLPICTURE = 3, 774 #if H_MV 785 #if H_MV || !H_3DV 775 786 MAINSTEREO = 4, 776 787 MAINMULTIVIEW = 5, 777 #if H_3D 788 #if H_3D && H_3DV 778 789 MAIN3D = 6, 779 790 #endif -
branches/HTM-9.0r1-F0122/source/Lib/TLibDecoder/TDecCAVLC.cpp
r724 r747 813 813 if( depthFlag ) 814 814 { 815 #if H_3DV 815 816 READ_FLAG( uiCode, "use_qtl_flag" ); 816 817 pcSPS->setUseQTL( uiCode ); 817 818 READ_FLAG( uiCode, "use_pc_flag" ); 818 819 pcSPS->setUsePC( uiCode ); 820 #else 821 pcSPS->setUsePC( 0 ); 822 #endif 819 823 } 820 824 #endif … … 1320 1324 } 1321 1325 } 1326 #if H_3DV 1322 1327 READ_FLAG( uiCode, "iv_mv_scaling_flag"); pcVPS->setIvMvScalingFlag( uiCode == 1 ? true : false ); 1328 #endif 1323 1329 } 1324 1330 #endif -
branches/HTM-9.0r1-F0122/source/Lib/TLibDecoder/TDecGop.cpp
r655 r747 224 224 rpcPic->destroyNonDBFilterInfo(); 225 225 } 226 #if H_3D 226 #if H_3DV 227 227 rpcPic->compressMotion(2); 228 228 #endif 229 #if !H_3D 229 #if !H_3DV 230 230 rpcPic->compressMotion(); 231 231 #endif -
branches/HTM-9.0r1-F0122/source/Lib/TLibDecoder/TDecSbac.cpp
r724 r747 851 851 852 852 UInt uiSymbol; 853 #if H_3D_QTLPC 853 #if H_3D_QTLPC && H_3DV 854 854 Bool bParseSplitFlag = true; 855 855 … … 878 878 DTRACE_CABAC_T( "\tSplitFlag\n" ) 879 879 #endif 880 #if H_3D_QTLPC 880 #if H_3D_QTLPC && H_3DV 881 881 } 882 882 else … … 901 901 PartSize eMode; 902 902 903 #if H_3D_QTLPC 903 #if H_3D_QTLPC && H_3DV 904 904 Bool bParsePartSize = true; 905 905 TComSPS *sps = pcCU->getPic()->getSlice(0)->getSPS(); … … 925 925 if ( pcCU->isIntra( uiAbsPartIdx ) ) 926 926 { 927 #if H_3D_QTLPC 927 #if H_3D_QTLPC && H_3DV 928 928 if(bParsePartSize) 929 929 { … … 938 938 } 939 939 eMode = uiSymbol ? SIZE_2Nx2N : SIZE_NxN; 940 #if H_3D_QTLPC 940 #if H_3D_QTLPC && H_3DV 941 941 } 942 942 #endif … … 956 956 else 957 957 { 958 #if H_3D_QTLPC 958 #if H_3D_QTLPC && H_3DV 959 959 if(bParsePartSize) 960 960 { … … 999 999 DTRACE_CU("part_mode", eMode ) 1000 1000 #endif 1001 #if H_3D_QTLPC 1001 #if H_3D_QTLPC && H_3DV 1002 1002 } 1003 1003 #endif -
branches/HTM-9.0r1-F0122/source/Lib/TLibEncoder/TEncCavlc.cpp
r724 r747 600 600 Void TEncCavlc::codeSPSExtension2( TComSPS* pcSPS, Int viewIndex, Bool depthFlag ) 601 601 { 602 #if H_3D_QTLPC 602 #if H_3D_QTLPC && H_3DV 603 603 //GT: This has to go to VPS 604 604 if( depthFlag ) -
branches/HTM-9.0r1-F0122/source/Lib/TLibEncoder/TEncGOP.cpp
r724 r747 1827 1827 pcPic->destroyNonDBFilterInfo(); 1828 1828 } 1829 #if H_3D 1829 #if H_3DV 1830 1830 pcPic->compressMotion(2); 1831 1831 #endif 1832 #if !H_3D 1832 #if !H_3DV 1833 1833 pcPic->compressMotion(); 1834 1834 #endif -
branches/HTM-9.0r1-F0122/source/Lib/TLibEncoder/TEncTop.cpp
r724 r747 403 403 { 404 404 #endif 405 #if H_3D 405 #if H_3DV 406 406 TComPic* picLastCoded = getPic( getGOPEncoder()->getPocLastCoded() ); 407 407 if( picLastCoded ) … … 766 766 767 767 #if H_3D_QTLPC 768 #if H_3DV 768 769 m_cSPS.setUseQTL( m_bUseQTL ); 769 770 m_cSPS.setUsePC ( m_bUsePC ); 771 #else 772 m_cSPS.setUseQTL( m_bUseQTL ); 773 m_cSPS.setUsePC ( 0 ); 774 #endif 770 775 #endif 771 776
Note: See TracChangeset for help on using the changeset viewer.