Changeset 530 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h

Timestamp:

8 Jul 2013, 19:40:03 (11 years ago)

Author:

mitsubishi-htm

Message:

-VSP remaining stuff wrapped up.
-4x4 VSP in effect.

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h (modified) (2 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.h

@@ -227 +227 @@
 #if H_3D_VSP
   Bool          xAddVspCand( UChar ucVspMergePos, Int mrgCandIdx, DisInfo* pDInfo, Int& iCount,
-                             Bool* abCandIsInter, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* vspIdxTrue );
+                             Bool* abCandIsInter, TComMvField* pcMvFieldNeighbours, UChar* puhInterDirNeighbours, Int* vspFlag );
 #endif
 
@@ -561 +561 @@
                                             , Int* vspFlag
 #endif
-                                            , Int& numValidMergeCand
-                                            , Int mrgCandIdx = -1 );
+                                            , Int& numValidMergeCand, Int mrgCandIdx = -1 );
 #if H_3D_VSP
   Char*         getVSPFlag        ()                        { return m_piVSPFlag;          }