Changeset 473 in 3DVCSoftware for branches/HTM-DEV-0.3-dev1
- Timestamp:
- 17 Jun 2013, 15:56:57 (11 years ago)
- Location:
- branches/HTM-DEV-0.3-dev1/source
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-DEV-0.3-dev1/source/App/TAppDecoder/TAppDecCfg.h
r446 r473 84 84 #if H_MV 85 85 , m_maxLayerId(0) 86 , m_pchReconFiles(NULL)87 86 #endif 88 87 , m_pchReconFile(NULL) -
branches/HTM-DEV-0.3-dev1/source/App/TAppDecoder/TAppDecTop.cpp
r459 r473 95 95 m_pchReconFile = NULL; 96 96 } 97 #if H_3D_FIX 98 if (m_pchScaleOffsetFile) 99 { 100 free (m_pchScaleOffsetFile); 101 m_pchScaleOffsetFile = NULL; 102 } 103 #endif 97 104 } 98 105 … … 146 153 Int pocLastPic = -MAX_INT; 147 154 148 Int layerIdLastPic = 0;149 155 Int layerIdCurrPic = 0; 150 156 … … 223 229 if ( bNewPicture || !bitstreamFile ) 224 230 { 225 layerIdLastPic = layerIdCurrPic;226 231 layerIdCurrPic = nalu.m_layerId; 227 232 -
branches/HTM-DEV-0.3-dev1/source/Lib/TAppCommon/TAppComCamPara.cpp
r446 r473 965 965 //--- determine (virtual) camera parameter shift between view order index 1 and base view (view order index 0) --- 966 966 Double dCamPosShift, dPicPosShift; 967 #if H_3D_PDM_CAM_PARAS 967 968 Int iMinVOI = (1<<30); 969 #endif 968 970 Int iMinAbsVOI = (1<<30); 969 971 Int iMinAbsVOIId = 0; … … 973 975 if( iAbsVOI < iMinAbsVOI ) 974 976 { 977 #if H_3D_PDM_CAM_PARAS 975 978 iMinVOI = m_aiViewOrderIndex[ iBaseId ]; 979 #endif 976 980 iMinAbsVOI = iAbsVOI; 977 981 iMinAbsVOIId = iBaseId; -
branches/HTM-DEV-0.3-dev1/source/Lib/TLibCommon/TComSlice.cpp
r467 r473 1521 1521 1522 1522 #if H_3D_DIM_DLT 1523 Void TComVPS::setDepthLUTs(Int layerIdInVps, Int* idx 2DepthValue, Int iNumDepthValues)1524 { 1525 if( idx 2DepthValue == NULL || iNumDepthValues == 0 ) // default mapping only1523 Void TComVPS::setDepthLUTs(Int layerIdInVps, Int* idxToDepthValueTable, Int iNumDepthValues) 1524 { 1525 if( idxToDepthValueTable == NULL || iNumDepthValues == 0 ) // default mapping only 1526 1526 return; 1527 1527 1528 1528 // copy idx2DepthValue to internal array 1529 memcpy(m_iIdx2DepthValue[layerIdInVps], idx 2DepthValue, iNumDepthValues*sizeof(UInt));1529 memcpy(m_iIdx2DepthValue[layerIdInVps], idxToDepthValueTable, iNumDepthValues*sizeof(UInt)); 1530 1530 1531 1531 UInt uiMaxDepthValue = ((1 << g_bitDepthY)-1); -
branches/HTM-DEV-0.3-dev1/source/Lib/TLibCommon/TypeDef.h
r467 r473 88 88 // PKU_QC_DEPTH_INTRA_UNI_D0195 89 89 // RWTH_SDC_DLT_B0036 90 #define H_3D_FIX 1 // Temporary for minor fixes 90 91 #endif 91 92 … … 101 102 #define H_3D_VSO_RM_ASSERTIONS 0 // Output VSO assertions 102 103 #define H_3D_VSO_SYNTH_DIST_OUT 0 // Output of synthesized view distortion instead of depth distortion in encoder output 104 #define H_3D_VSO_FIX 0 // This fix should be enabled after verification 103 105 #endif 104 106 -
branches/HTM-DEV-0.3-dev1/source/Lib/TLibDecoder/TDecTop.cpp
r459 r473 52 52 m_aaiCodedScale = new Int* [ MAX_NUM_LAYERS ]; 53 53 m_aiViewId = new Int [ MAX_NUM_LAYERS ]; 54 #if !H_3D_FIX 54 55 m_aiLayerIdx = new Int [ MAX_NUM_LAYERS ]; 56 #endif 55 57 56 58 m_bViewReceived = new Bool [ MAX_NUM_LAYERS ]; -
branches/HTM-DEV-0.3-dev1/source/Lib/TLibDecoder/TDecTop.h
r446 r473 89 89 Int** m_aaiCodedScale; 90 90 Int* m_aiViewId; 91 #if !H_3D_FIX 91 92 Int* m_aiLayerIdx; 93 #endif 92 94 93 95 Bool* m_bViewReceived; -
branches/HTM-DEV-0.3-dev1/source/Lib/TLibEncoder/TEncSearch.cpp
r471 r473 2787 2787 2788 2788 #if H_3D_VSO // M35 2789 #if H_3D_VSO_FIX // This fix should be enabled after verification 2789 2790 Double dLambda; 2790 2791 if ( m_pcRdCost->getUseLambdaScaleVSO() ) … … 2794 2795 2795 2796 Double cost = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda(); 2797 #else 2798 Double cost = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda(); 2799 #endif 2796 2800 #else 2797 2801 Double cost = (Double)uiSad + (Double)iModeBits * m_pcRdCost->getSqrtLambda();
Note: See TracChangeset for help on using the changeset viewer.