Changeset 254 in 3DVCSoftware for branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder
- Timestamp:
- 4 Feb 2013, 02:58:35 (12 years ago)
- Location:
- branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncCavlc.cpp
r210 r254 508 508 #endif 509 509 #endif 510 #if HHI_MPI 510 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 511 511 Void TEncCavlc::codeSPS( TComSPS* pcSPS, Bool bIsDepth ) 512 512 #else … … 1304 1304 #elif HHI_MPI 1305 1305 const int iExtraMergeCandidates = pcSlice->getSPS()->getUseMVI() ? 1 : 0; 1306 #elif MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 1307 const int iExtraMergeCandidates = ( pcSlice->getIsDepth() || pcSlice->getSPS()->getMultiviewMvPredMode() ) ? 1 : 0; 1306 1308 #else 1307 1309 const int iExtraMergeCandidates = pcSlice->getSPS()->getMultiviewMvPredMode() ? 1 : 0; -
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncCavlc.h
r210 r254 118 118 #endif 119 119 120 #if HHI_MPI 120 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 121 121 Void codeSPS ( TComSPS* pcSPS, Bool bIsDepth ); 122 122 #else -
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncEntropy.cpp
r244 r254 133 133 #endif 134 134 135 #if HHI_MPI 135 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 136 136 Void TEncEntropy::encodeSPS( TComSPS* pcSPS, Bool bIsDepth ) 137 137 { -
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncEntropy.h
r244 r254 80 80 #endif 81 81 82 #if HHI_MPI 82 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 83 83 virtual Void codeSPS ( TComSPS* pcSPS, Bool bIsDepth ) = 0; 84 84 #else … … 246 246 #endif 247 247 // SPS 248 #if HHI_MPI 248 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 249 249 Void encodeSPS ( TComSPS* pcSPS, Bool bIsDepth ); 250 250 #else -
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncGOP.cpp
r210 r254 247 247 std::vector<TComAPS>& vAPS = m_pcEncTop->getAPS(); 248 248 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 249 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 250 m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, uiPOCCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getEncTop()->getVPS(), m_pcEncTop->getSPS(), m_pcEncTop->getPPS(), m_pcEncTop->getIsDepth() ); 251 #else 249 252 m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, uiPOCCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getEncTop()->getVPS(), m_pcEncTop->getSPS(), m_pcEncTop->getPPS() ); 253 #endif 250 254 #else 251 255 m_pcSliceEncoder->initEncSlice ( pcPic, iPOCLast, uiPOCCurr, iNumPicRcvd, iGOPid, pcSlice, m_pcEncTop->getSPS(), m_pcEncTop->getPPS() ); … … 906 910 pcSlice->getSPS()->setNumSubstreams( pcSlice->getPPS()->getNumSubstreams() ); 907 911 #endif 908 #if HHI_MPI 912 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 909 913 m_pcEntropyCoder->encodeSPS(pcSlice->getSPS(), m_pcEncTop->getIsDepth()); 910 914 #else -
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncSbac.cpp
r210 r254 404 404 #endif 405 405 406 #if HHI_MPI 406 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 407 407 Void TEncSbac::codeSPS( TComSPS* pcSPS, Bool bIsDepth ) 408 408 #else -
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncSbac.h
r210 r254 102 102 #endif 103 103 104 #if HHI_MPI 104 #if HHI_MPI || OL_QTLIMIT_PREDCODING_B0068 105 105 Void codeSPS ( TComSPS* pcSPS, Bool bIsDepth ); 106 106 #else -
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncSlice.cpp
r210 r254 163 163 */ 164 164 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 165 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 166 Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS * pVPS, TComSPS* pSPS, TComPPS *pPPS, bool isDepth ) 167 #else 165 168 Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS * pVPS, TComSPS* pSPS, TComPPS *pPPS ) 169 #endif 166 170 #else 167 171 Void TEncSlice::initEncSlice( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS ) … … 470 474 #elif HHI_MPI 471 475 const int iExtraMergeCandidates = pSPS->getUseMVI() ? 1 : 0; 476 #elif MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 477 const int iExtraMergeCandidates = ( isDepth || pSPS->getMultiviewMvPredMode() ) ? 1 : 0; 472 478 #else 473 479 const int iExtraMergeCandidates = pSPS->getMultiviewMvPredMode() ? 1 : 0; -
branches/HTM-5.1-dev2-Mediatek/source/Lib/TLibEncoder/TEncSlice.h
r210 r254 111 111 /// preparation of slice encoding (reference marking, QP and lambda) 112 112 #if VIDYO_VPS_INTEGRATION|QC_MVHEVC_B0046 113 #if MTK_DEPTH_MERGE_TEXTURE_CANDIDATE_C0137 114 Void initEncSlice ( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS, bool isDepth ); 115 #else 113 116 Void initEncSlice ( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComVPS* pVPS, TComSPS* pSPS, TComPPS *pPPS ); 117 #endif 114 118 #else 115 119 Void initEncSlice ( TComPic* pcPic, Int iPOCLast, UInt uiPOCCurr, Int iNumPicRcvd, Int iGOPid, TComSlice*& rpcSlice, TComSPS* pSPS, TComPPS *pPPS );
Note: See TracChangeset for help on using the changeset viewer.