Changeset 166 in 3DVCSoftware for branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComDataCU.h

Timestamp:

1 Nov 2012, 19:22:41 (12 years ago)

Author:

mitsubishi-htm

Message:

Initial integration of VSP into HTM 4.0.1. The version used for JCT3V-B0102 at Shanghai meeting.

• VC9 project/solution files updated. Other Visual C++ project/solution files are not updated.
• Linux make file updated.

TODO

• A second release is expected to include some bug fix and improvements on the interface, e.g. to move switches from macro definition to the configuration file.
• A third release is expected after being integrated within HTM 5.x, which is to be used for CE1.h anchor.

File:

• branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComDataCU.h (modified) (2 diffs)

branches/HTM-4.0.1-VSP-dev0/source/Lib/TLibCommon/TComDataCU.h

@@ -265 +265 @@
   Bool          xAddMVPCand           ( AMVPInfo* pInfo, RefPicList eRefPicList, Int iRefIdx, UInt uiPartUnitIdx, MVP_DIR eDir );
   Bool          xAddMVPCandOrder      ( AMVPInfo* pInfo, RefPicList eRefPicList, Int iRefIdx, UInt uiPartUnitIdx, MVP_DIR eDir );
+#if FORCE_REF_VSP==2
+  inline bool   xAddVspSkip(UChar ucVspMergePos, Bool bVspMvZeroDone, UInt uiDepth, Bool* abCandIsInter, Int& iCount,
+                            UChar* puhInterDirNeighbours, TComMvField* pcMvFieldNeighbours, Int mrgCandIdx);
+#endif
 
   Void          deriveRightBottomIdx        ( PartSize eCUMode, UInt uiPartIdx, UInt& ruiPartIdxRB );
@@ -656 +660 @@
   Bool          isIntra   ( UInt uiPartIdx )  { return m_pePredMode[ uiPartIdx ] == MODE_INTRA; }
   Bool          isSkipped ( UInt uiPartIdx );                                                     ///< SKIP (no residual)
+#if FORCE_REF_VSP==1
+  Int           isVspMode ( UInt uiPartIdx )  { return m_pePredMode[ uiPartIdx ] == MODE_SYNTH; }
+#elif FORCE_REF_VSP==2 
+  Int           isVspMode ( UInt uiPartIdx );
+  Int           isVspMode ( UInt uiPartIdx, TComMv cCompMv );
+#endif
   
   // -------------------------------------------------------------------------------------------------------------------