Changeset 839 in 3DVCSoftware for branches/HTM-10.0rc1-dev0
- Timestamp:
- 8 Feb 2014, 01:30:30 (11 years ago)
- Location:
- branches/HTM-10.0rc1-dev0/source
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-10.0rc1-dev0/source/App/TAppEncoder/TAppEncTop.cpp
r837 r839 1097 1097 } 1098 1098 } 1099 #endif 1099 1100 } 1100 1101 … … 1855 1856 } 1856 1857 #endif 1857 1858 1858 //! \} -
branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TComTrQuant.h
r838 r839 151 151 #if RDOQ_CHROMA_LAMBDA 152 152 Void setLambdas ( const Double lambdas[3] ) { for (Int component = 0; component < 3; component++) m_lambdas[component] = lambdas[component]; } 153 Void setLambda(Double dLambdaLuma, Double dLambdaChroma) { m_dLambdaLuma = dLambdaLuma; m_dLambdaChroma = dLambdaChroma; }154 153 Void selectLambda(TextType eTType) { m_dLambda = (eTType == TEXT_LUMA) ? m_lambdas[0] : ((eTType == TEXT_CHROMA_U) ? m_lambdas[1] : m_lambdas[2]); } 155 154 #else -
branches/HTM-10.0rc1-dev0/source/Lib/TLibCommon/TypeDef.h
r838 r839 55 55 56 56 #ifndef HEVC_EXT 57 #define HEVC_EXT 257 #define HEVC_EXT 0 58 58 #endif 59 59 -
branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecSbac.h
r837 r839 94 94 Void parseSaoTypeIdx ( UInt& ruiVal ); 95 95 Void parseSaoUflc ( UInt uiLength, UInt& ruiVal ); 96 Void parseSAOBlkParam (SAOBlkParam& saoBlkParam, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail); 97 Void parseSaoSign(UInt& val); 96 98 private: 97 99 Void xReadUnarySymbol ( UInt& ruiSymbol, ContextModel* pcSCModel, Int iOffset ); -
branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecSlice.cpp
r837 r839 336 336 if(ry > 0) 337 337 { 338 aboveMergeAvail = rpcPic->getSAOMergeAvailability(iCUAddr, iCUAddr-uiWidthInLCUs); 338 339 } 339 340 … … 342 343 else 343 344 { 345 saoblkParam[SAO_Y ].modeIdc = SAO_MODE_OFF; 346 saoblkParam[SAO_Cb].modeIdc = SAO_MODE_OFF; 347 saoblkParam[SAO_Cr].modeIdc = SAO_MODE_OFF; 344 348 } 345 349 } -
branches/HTM-10.0rc1-dev0/source/Lib/TLibDecoder/TDecTop.cpp
r837 r839 679 679 m_uiSliceIdx = 0; 680 680 } 681 else 681 682 { 682 683 m_apcSlicePilot->copySliceInfo( pcPic->getPicSym()->getSlice(m_uiSliceIdx-1) ); -
branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncCfg.h
r837 r839 300 300 #if KWU_RC_VIEWRC_E0227 301 301 Bool m_bViewWiseRateCtrl; 302 #endif303 #else304 Bool m_enableRateCtrl; ///< Flag for using rate control algorithm305 Int m_targetBitrate; ///< target bitrate306 Int m_numLCUInUnit; ///< Total number of LCUs in a frame should be divided by the NumLCUInUnit307 308 #if KWU_RC_MADPRED_E0227309 UInt m_depthMADPred;310 #endif311 #if KWU_RC_VIEWRC_E0227312 Bool m_bViewWiseRateCtrl;313 #endif314 302 #endif 315 303 Bool m_TransquantBypassEnableFlag; ///< transquant_bypass_enable_flag setting in PPS. … … 830 818 Void setUseViewWiseRateCtrl (Bool b) { m_bViewWiseRateCtrl = b; } 831 819 #endif 832 #else833 Bool getUseRateCtrl () { return m_enableRateCtrl; }834 Void setUseRateCtrl (Bool flag) { m_enableRateCtrl = flag; }835 Int getTargetBitrate () { return m_targetBitrate; }836 Void setTargetBitrate (Int target) { m_targetBitrate = target; }837 Int getNumLCUInUnit () { return m_numLCUInUnit; }838 Void setNumLCUInUnit (Int numLCUs) { m_numLCUInUnit = numLCUs; }839 840 #if KWU_RC_MADPRED_E0227841 UInt getUseDepthMADPred () { return m_depthMADPred; }842 Void setUseDepthMADPred (UInt b) { m_depthMADPred = b; }843 #endif844 #if KWU_RC_VIEWRC_E0227845 Bool getUseViewWiseRateCtrl () { return m_bViewWiseRateCtrl; }846 Void setUseViewWiseRateCtrl (Bool b) { m_bViewWiseRateCtrl = b; }847 #endif848 #endif849 820 Bool getTransquantBypassEnableFlag() { return m_TransquantBypassEnableFlag; } 850 821 Void setTransquantBypassEnableFlag(Bool flag) { m_TransquantBypassEnableFlag = flag; } -
branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncCu.cpp
r838 r839 2238 2238 else 2239 2239 #endif 2240 2240 2241 rpcTempCU->getTotalCost() = m_pcRdCost->calcRdCost( rpcTempCU->getTotalBits(), rpcTempCU->getTotalDistortion() ); 2241 2242 #if H_3D_INTER_SDC -
branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncSearch.cpp
r838 r839 3950 3950 pcCU->getCUMvField(REF_PIC_LIST_0)->setAllMvField( cMvFieldNeighbours[0 + 2*uiMergeCand], ePartSize, uiAbsPartIdx, 0, iPUIdx ); 3951 3951 pcCU->getCUMvField(REF_PIC_LIST_1)->setAllMvField( cMvFieldNeighbours[1 + 2*uiMergeCand], ePartSize, uiAbsPartIdx, 0, iPUIdx ); 3952 } 3952 3953 3953 #if NTT_STORE_SPDV_VSP_G0148 3954 }3954 } 3955 3955 #endif 3956 3956 #if H_3D_VSP && !NTT_STORE_SPDV_VSP_G0148 -
branches/HTM-10.0rc1-dev0/source/Lib/TLibEncoder/TEncTop.cpp
r837 r839 601 601 m_uiNumAllPicCoded += iNumEncoded; 602 602 } 603 603 #endif 604 604 // ==================================================================================================================== 605 605 // Protected member functions
Note: See TracChangeset for help on using the changeset viewer.