Changeset 1373 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibCommon/TComSlice.cpp
- Timestamp:
- 6 Nov 2015, 16:18:36 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-15.2-dev/source/Lib/TLibCommon/TComSlice.cpp
r1360 r1373 118 118 , m_viewId (0) 119 119 , m_viewIndex (0) 120 #if NH_3D 120 #if NH_3D_VSO 121 121 , m_isDepth (false) 122 122 #endif … … 2182 2182 } 2183 2183 2184 #if NH_3D 2185 Int TComVPS::getLayerIdInNuh( Int viewIndex, Bool depthFlag ) const2184 #if NH_3D_VSO 2185 Int TComVPS::getLayerIdInNuh( Int viewIndex, Bool depthFlag, Int auxId ) const 2186 2186 { 2187 2187 Int foundLayerIdinNuh = -1; … … 2190 2190 { 2191 2191 Int layerIdInNuh = getLayerIdInNuh( layerIdInVps ); 2192 #if !NH_3D 2193 if( ( getViewIndex( layerIdInNuh ) == viewIndex ) && ( getAuxId( layerIdInNuh ) == ( depthFlag ? 2 : 0 ) ) ) 2194 #else 2192 2195 if( ( getViewIndex( layerIdInNuh ) == viewIndex ) && ( getDepthId( layerIdInNuh ) == ( depthFlag ? 1 : 0 ) ) ) 2196 #endif 2193 2197 { 2194 2198 foundLayerIdinNuh = layerIdInNuh; … … 2198 2202 return foundLayerIdinNuh; 2199 2203 } 2200 2204 #endif 2205 #if NH_3D 2201 2206 Void TComVPS::createCamPars(Int iNumViews) 2202 2207 { … … 3857 3862 } 3858 3863 #endif 3859 #if NH_3D 3864 #if NH_3D_QTL 3860 3865 Void TComSlice::setIvPicLists( TComPicLists* m_ivPicLists ) 3861 3866 { … … 3864 3869 for ( Int depthId = 0; depthId < 2; depthId++ ) 3865 3870 { 3866 m_ivPicsCurrPoc[ depthId ][ i ] = ( i <= m_viewIndex ) ? m_ivPicLists->getPic( i, ( depthId == 1) , getPOC() ) : NULL;3871 m_ivPicsCurrPoc[ depthId ][ i ] = ( i <= m_viewIndex ) ? m_ivPicLists->getPic( i, ( depthId == 1) , 0, getPOC() ) : NULL; 3867 3872 } 3868 3873 } 3869 3874 } 3875 #endif 3876 #if NH_3D 3870 3877 Void TComSlice::setDepthToDisparityLUTs() 3871 3878 {
Note: See TracChangeset for help on using the changeset viewer.