Changeset 207 in 3DVCSoftware for branches/HTM-5.0-dev0/source

Timestamp:

10 Dec 2012, 18:21:28 (12 years ago)

Author:

tech

Message:

Re-enabled FCO, Fixed compiler warning.

Location:

branches/HTM-5.0-dev0/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (2 diffs)

branches/HTM-5.0-dev0/source/App/TAppDecoder/TAppDecTop.cpp

@@ -111 +111 @@
     newPicture[i] = false;
 #if FLEX_CODING_ORDER_M23723
+#if  FIX_FCO_COMP_WARNING
+    m_fcoOrder[i] = ' ';
+#else
     m_fcoOrder[i]=NULL;
+#endif
 #endif
 

branches/HTM-5.0-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -47 +47 @@
 #define FIX_DEL_NULLPTR                   1
 #define FIX_MISUSE_REFINDEX               1
+#define FIX_FCO_COMP_WARNING              1
 #define DV_V_RESTRICTION_B0037            1   // JCT3V-B0037 disparity vector vertical range restriction
 
@@ -63 +64 @@
 
 // FCO 
-#define FLEX_CODING_ORDER_M23723          0
+#define FLEX_CODING_ORDER_M23723          1
 #if FLEX_CODING_ORDER_M23723
   #define DISABLE_FCO_FOR_VSO             0 // Optional compile settings to disable VSO with FCO.