Changeset 539 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Timestamp:

19 Jul 2013, 17:02:35 (12 years ago)

Author:

orange

Message:

Integrated QTLPC and added new line mark at the end of TComWedgelet.cpp for MERL

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Files:

• TComPic.cpp (modified) (1 diff)
• TComPic.h (modified) (2 diffs)
• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPic.cpp

@@ -77 +77 @@
   m_apcPicYuv[0]      = NULL;
   m_apcPicYuv[1]      = NULL;
+#if H_3D_QTLPC
+  m_bReduceBitsQTL    = 0;
+#endif
 #if H_3D_NBDV
   m_iNumDdvCandPics   = 0;

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

@@ -96 +96 @@
 #endif
 #endif
+#if H_3D_QTLPC
+  Bool                  m_bReduceBitsQTL;
+#endif
 #if H_3D_NBDV
   UInt        m_uiRapRefIdx;
@@ -130 +133 @@
 #endif
 #endif
+
+#if H_3D_QTLPC
+  Bool          getReduceBitsFlag ()             { return m_bReduceBitsQTL;     }
+  Void          setReduceBitsFlag ( Bool bFlag ) { m_bReduceBitsQTL = bFlag;    }
+#endif
+
   Bool          getUsedByCurr()             { return m_bUsedByCurr; }
   Void          setUsedByCurr( Bool bUsed ) { m_bUsedByCurr = bUsed; }

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.cpp

@@ -1880 +1880 @@
 , m_bCamParInSliceHeader      (false)
 #endif
+#if H_3D_QTLPC
+, m_bUseQTL                   (false)
+, m_bUsePC                    (false)
+#endif
 {
   for ( Int i = 0; i < MAX_TLAYER; i++ )

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

@@ -972 +972 @@
   UInt        m_uiPCMLog2MinSize;
   Bool        m_useAMP;
+
+#if H_3D_QTLPC
+  Bool        m_bUseQTL;
+  Bool        m_bUsePC;
+#endif
 
   // Parameter
@@ -1170 +1175 @@
   Int  getMinHorizontalCtuOffsetPlus1 ( Int i )            { return m_minHorizontalCtuOffsetPlus1 [ i ];}
 #endif
+
+#if H_3D_QTLPC
+  Void setUseQTL( Bool b ) { m_bUseQTL = b;    }
+  Bool getUseQTL()         { return m_bUseQTL; }
+  Void setUsePC ( Bool b ) { m_bUsePC  = b;    }
+  Bool getUsePC ()         { return m_bUsePC;  }
+#endif
+
 #if H_3D
   Void initCamParaSPS      (  UInt uiViewIndex, UInt uiCamParPrecision = 0, Bool bCamParSlice = false, Int** aaiScale = 0, Int** aaiOffset = 0 );

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

@@ -75 +75 @@
 
 #if H_3D
+#define H_3D_QTLPC                        1   // OL_QTLIMIT_PREDCODING_B0068 //JCT3V-B0068
+                                              // HHI_QTLPC_RAU_OFF_C0160     // JCT3V-C0160 change 2: quadtree limitation and predictive coding switched off in random access units 
+
 #define H_3D_PDM_CAM_PARAS                0 ///< PDM related parts of camera parameters, should be removed if not used anymore.
 #define H_3D_VSO                          1   // VSO, View synthesis optimization, includes: