Changeset 231 in 3DVCSoftware for branches/HTM-5.1-dev3-MERL/source/Lib/TLibEncoder/TEncSearch.h

Timestamp:

26 Jan 2013, 19:36:53 (12 years ago)

Author:

mitsubishi-htm

Message:

-Integration of JCT3V-C0152 & JCT3V-C0131
-This check-in enable C0131 only

File:

• branches/HTM-5.1-dev3-MERL/source/Lib/TLibEncoder/TEncSearch.h (modified) (3 diffs)

branches/HTM-5.1-dev3-MERL/source/Lib/TLibEncoder/TEncSearch.h

@@ -152 +152 @@
   UInt  xPatternRefinement( TComPattern* pcPatternKey,
                            TComMv baseRefMv,
-                           Int iFrac, TComMv& rcMvFrac );
+                           Int iFrac, TComMv& rcMvFrac);
   
   typedef struct
@@ -513 +513 @@
                                     Int& numValidMergeCand
 #endif
+#if MERL_VSP_C0152
+                                  , Int* iVSPIndexTrue
+#endif
                                    );
   // -------------------------------------------------------------------------------------------------------------------
@@ -579 +582 @@
                                     TComMv&       rcMvQter,
                                     UInt&         ruiCost 
-                                   ,Bool biPred
-                                   );
+                                   ,Bool biPred);
   
   Void xExtDIFUpSamplingH( TComPattern* pcPattern, Bool biPred  );