Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComMotionInfo.h
- Timestamp:
- 13 Aug 2015, 17:38:13 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/Lib/TLibCommon/TComMotionInfo.h
r1196 r1313 50 50 // ==================================================================================================================== 51 51 52 #if H_3D_SPIVMP52 #if NH_3D_SPIVMP 53 53 class TComDataCU; 54 54 #endif … … 60 60 } AMVPInfo; 61 61 62 #if H_3D_NBDV62 #if NH_3D_NBDV 63 63 typedef struct _DisCand 64 64 { 65 65 TComMv m_acNBDV; // DV from NBDV 66 #if H_3D_NBDV_REF66 #if NH_3D_NBDV_REF 67 67 TComMv m_acDoNBDV; // DV from DoNBDV 68 68 #endif … … 107 107 Int getHor () const { return m_acMv.getHor(); } 108 108 Int getVer () const { return m_acMv.getVer(); } 109 #if H_3D_IV_MERGE109 #if NH_3D_IV_MERGE 110 110 Bool operator== ( const TComMvField& rcMv ) const 111 111 { … … 167 167 Void setAllRefIdx ( Int iRefIdx, PartSize eMbMode, Int iPartAddr, UInt uiDepth, Int iPartIdx=0 ); 168 168 Void setAllMvField( TComMvField const & mvField, PartSize eMbMode, Int iPartAddr, UInt uiDepth, Int iPartIdx=0 ); 169 #if H_3D_SPIVMP169 #if NH_3D_SPIVMP 170 170 Void setMvFieldSP ( TComDataCU* pcCU, UInt uiAbsPartIdx, TComMvField cMvField, Int iWidth, Int iHeight ); 171 171 #endif 172 #if H_3D_VSP172 #if NH_3D_VSP 173 173 Void setMv ( Int iIdx, TComMv const & rcMv ) { m_pcMv[iIdx] = rcMv; } 174 174 Void setRefIdx ( Int iIdx, Int iRefIdx ) { m_piRefIdx[iIdx] = iRefIdx; } … … 192 192 //! \} 193 193 194 #if H_3D_IV_MERGE 194 #if NH_3D_MLC 195 /// class for container of merge candidate 195 196 class TComMotionCand 196 197 { … … 199 200 TComMvField m_cMvField[2]; 200 201 UChar m_uDir; 201 #if H_3D_VSP202 #if NH_3D_VSP 202 203 Int m_iVspFlag; 203 #endif 204 #endif 205 #if NH_3D_SPIVMP 204 206 Bool m_bSPIVMPFlag; 207 #endif 205 208 206 209 public: … … 209 212 m_bAvailable = false; 210 213 m_uDir = 0; 211 #if H_3D_VSP214 #if NH_3D_VSP 212 215 m_iVspFlag = 0; 213 216 #endif 217 #if NH_3D_SPIVMP 214 218 m_bSPIVMPFlag = false; 219 #endif 215 220 } 216 221 … … 226 231 m_bAvailable = false; 227 232 m_uDir = 0; 228 #if H_3D_VSP233 #if NH_3D_VSP 229 234 m_iVspFlag = 0; 230 235 #endif 236 #if NH_3D_SPIVMP 231 237 m_bSPIVMPFlag = false; 238 #endif 232 239 m_cMvField[0].setMvField(cZeroMv, NOT_VALID); 233 240 m_cMvField[1].setMvField(cZeroMv, NOT_VALID); … … 235 242 236 243 Void setCand(TComMvField* pcMvFieldNeighbours, UChar uhInterDirNeighbours 237 #if H_3D_VSP244 #if NH_3D_VSP 238 245 , Int vspFlag 239 246 #endif 247 #if NH_3D_SPIVMP 240 248 , Bool bSPIVMPFlag 249 #endif 241 250 ) 242 251 { … … 245 254 m_cMvField[1] = pcMvFieldNeighbours[1]; 246 255 m_uDir = uhInterDirNeighbours; 247 #if H_3D_VSP256 #if NH_3D_VSP 248 257 m_iVspFlag = vspFlag; 249 258 #endif 259 #if NH_3D_SPIVMP 250 260 m_bSPIVMPFlag = bSPIVMPFlag; 251 } 252 253 261 #endif 262 } 263 254 264 Void getCand(Int iCount, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours 255 #if H_3D_VSP265 #if NH_3D_VSP 256 266 , Int* vspFlag 257 267 #endif 268 #if NH_3D_SPIVMP 258 269 , Bool* pbSPIVMPFlag 270 #endif 259 271 ) 260 272 { … … 262 274 pcMvFieldNeighbours[(iCount<<1) + 1] = m_cMvField[1]; 263 275 puhInterDirNeighbours[iCount] = m_uDir; 264 #if H_3D_VSP276 #if NH_3D_VSP 265 277 vspFlag[iCount] = m_iVspFlag; 266 278 #endif 279 #if NH_3D_SPIVMP 267 280 pbSPIVMPFlag[iCount] = m_bSPIVMPFlag; 281 #endif 268 282 } 269 283 };
Note: See TracChangeset for help on using the changeset viewer.