Changeset 117 in 3DVCSoftware for branches/HTM-4.0-Orange/source/Lib/TLibCommon

Timestamp:

30 Aug 2012, 16:24:21 (12 years ago)

Author:

tech

Message:

Cleanup

Location:

branches/HTM-4.0-Orange/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (4 diffs)
• TComDataCU.h (modified) (2 diffs)
• TComRdCost.h (modified) (2 diffs)
• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (2 diffs)
• TComWedgelet.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-4.0-Orange/source/Lib/TLibCommon/TComDataCU.cpp

@@ -152 +152 @@
 #endif
 #endif
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   //add a variable to store the partition information
-  //a 2D array in part_symbol,uidepth format
+  //a 2D array in part_symbol, uidepth format
   //initialize m_partInfo to OL_END_CU
-        for (int i=0; i < OL_PART_BUF_SIZE; i++)
-        {
-                for (int j=0; j < 2; j++)
-                        m_uiPartInfo[i][j] = OL_END_CU;
-        }
+  for (Int i=0; i < OL_PART_BUF_SIZE; i++)
+  {
+    for (Int j=0; j < 2; j++)
+    {
+      m_uiPartInfo[i][j] = OL_END_CU;
+    }
+  }
 #endif
 }
@@ -466 +468 @@
 Void TComDataCU::initCU( TComPic* pcPic, UInt iCUAddr )
 {
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   TComDataCU* pcCU     = pcPic->getCU(iCUAddr);
 #endif
@@ -685 +687 @@
     m_apcCUColocated[1] = getSlice()->getRefPic( REF_PIC_LIST_1, 0)->getCU( m_uiCUAddr );
   }
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   setPartDumpFlag (pcCU->getPartDumpFlag());
 #endif
@@ -1017 +1019 @@
   memcpy(m_uiSliceStartCU,pcCU->m_uiSliceStartCU+uiPartOffset,sizeof(UInt)*m_uiNumPartition);
   memcpy(m_uiEntropySliceStartCU,pcCU->m_uiEntropySliceStartCU+uiPartOffset,sizeof(UInt)*m_uiNumPartition);
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   setPartDumpFlag (pcCU->getPartDumpFlag());
 #endif

branches/HTM-4.0-Orange/source/Lib/TLibCommon/TComDataCU.h

@@ -238 +238 @@
   UInt*         m_uiEntropySliceStartCU; ///< Start CU address of current slice
 
-#if OL_DEPTHLIMIT 
+#if OL_DEPTHLIMIT_A0044 
   //add a variable to store the partition information
-  //a 2D array in uidepth,part_symbol format
+  //a 2D array in uidepth, part_symbol format
   UInt          m_uiPartInfo[OL_PART_BUF_SIZE][2];
   UInt          m_uiPartNum;
-  Bool          b_dumpPartInfo;
+  Bool          m_dumpPartInfo;
 #endif 
   
@@ -605 +605 @@
   Void          compressMV            ();
 
-#if OL_DEPTHLIMIT
-        Void        resetPartInfo  () {m_uiPartNum = 0;};
-        Void        incrementPartInfo () {m_uiPartNum ++;};
-        Void        updatePartInfo(UInt uiSymbol, UInt uiDepth) {m_uiPartInfo[m_uiPartNum][0] = uiSymbol; m_uiPartInfo
-[m_uiPartNum][1] = uiDepth;};
-        UInt*       readPartInfo() {return (UInt*)m_uiPartInfo;};
-//      UInt            getPartNumIdx() {return m_uiPartNum;}; //added this to get the index
-//flag to signal to start dumping
-        Void            setPartDumpFlag(bool flag)      {b_dumpPartInfo = flag;};
-        Bool            getPartDumpFlag()       {return b_dumpPartInfo;};
+#if OL_DEPTHLIMIT_A0044
+  Void        resetPartInfo     () {m_uiPartNum = 0;};
+  Void        incrementPartInfo () {m_uiPartNum ++;};
+  Void        updatePartInfo(UInt uiSymbol, UInt uiDepth) { m_uiPartInfo[m_uiPartNum][0] = uiSymbol; m_uiPartInfo[m_uiPartNum][1] = uiDepth;};
+  UInt*       readPartInfo()                              { return (UInt*)m_uiPartInfo;};
+  Void        setPartDumpFlag(Bool flag)                  { m_dumpPartInfo = flag; };
+  Bool        getPartDumpFlag()                           { return m_dumpPartInfo; };
 #endif
   

branches/HTM-4.0-Orange/source/Lib/TLibCommon/TComRdCost.h

@@ -378 +378 @@
 #endif
 #if LGE_WVSO_A0119
-  Int                                                                                   m_iDWeight;
-  Int                                                                                   m_iVSOWeight;
+  Int                     m_iDWeight;
+  Int                     m_iVSOWeight;
   Int                     m_iVSDWeight;
   Bool                    m_bWVSO;
@@ -417 +417 @@
   UInt    getVSOMode( )                  { return m_uiVSOMode; }
 #if LGE_WVSO_A0119
-  Void    setWVSO ( Bool bIn )         { m_bWVSO = bIn; }; 
-  Bool    getWVSO ( )                  { return m_bWVSO;};
-  Void          setDWeight ( Int iDWeight )                     { m_iDWeight = iDWeight; };
-  Int                   getDWeight ()                                                                           { return m_iDWeight; };
-  Void          setVSOWeight ( Int iVSOWeight ) { m_iVSOWeight = iVSOWeight; };
-  Int                   getVSOWeight ()                                                                 { return m_iVSOWeight; };
-  Void          setVSDWeight ( Int iVSDWeight ) { m_iVSDWeight = iVSDWeight; };
-  Int                   getVSDWeight ()                                                                 { return m_iVSDWeight; };
+  Void    setWVSO ( Bool bIn )            { m_bWVSO = bIn; }; 
+  Bool    getWVSO ( )                     { return m_bWVSO;};
+  Void    setDWeight   ( Int iDWeight   ) { m_iDWeight = iDWeight; };
+  Int     getDWeight   ()                 { return m_iDWeight; };
+  Void    setVSOWeight ( Int iVSOWeight ) { m_iVSOWeight = iVSOWeight; };
+  Int     getVSOWeight ()                 { return m_iVSOWeight; };
+  Void    setVSDWeight ( Int iVSDWeight ) { m_iVSDWeight = iVSDWeight; };
+  Int     getVSDWeight ()                 { return m_iVSDWeight; };
 #endif 
 #if HHI_VSO_DIST_INT

branches/HTM-4.0-Orange/source/Lib/TLibCommon/TComSlice.cpp

@@ -1441 +1441 @@
 , m_bUseDMM                   (false)
 #endif
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
 , m_bDepthPartitionLimiting   (false)
 #endif

branches/HTM-4.0-Orange/source/Lib/TLibCommon/TComSlice.h

@@ -354 +354 @@
 #endif
 
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   Bool m_bDepthPartitionLimiting;
 #endif
@@ -623 +623 @@
 #endif
 
-#if OL_DEPTHLIMIT
+#if OL_DEPTHLIMIT_A0044
   Void setUseDPL(Bool b) {m_bDepthPartitionLimiting = b; }
   Bool getUseDPL()       {return m_bDepthPartitionLimiting;}

branches/HTM-4.0-Orange/source/Lib/TLibCommon/TComWedgelet.h

@@ -198 +198 @@
   static UInt xGetSAD16         ( WedgeDistParam* pcDtParam );
   static UInt xGetSAD32         ( WedgeDistParam* pcDtParam );
-  //static UInt xGetSAD64         ( WedgeDistParam* pcDtParam );
 
   static UInt xGetSSE4          ( WedgeDistParam* pcDtParam );
@@ -204 +203 @@
   static UInt xGetSSE16         ( WedgeDistParam* pcDtParam );
   static UInt xGetSSE32         ( WedgeDistParam* pcDtParam );
-  //static UInt xGetSSE64         ( WedgeDistParam* pcDtParam );
 
 };// END CLASS DEFINITION TComWedgeDist

branches/HTM-4.0-Orange/source/Lib/TLibCommon/TypeDef.h

@@ -96 +96 @@
 #define LGE_WVSO_A0119                    1 // JCT2-A0119 Depth Metric with a weighted depth fidelity term
 
-#define OL_DEPTHLIMIT                     1 //JCT2-A0044
-#if OL_DEPTHLIMIT
+#define OL_DEPTHLIMIT_A0044               1 //JCT2-A0044
+#if OL_DEPTHLIMIT_A0044
 #define OL_DO_NOT_LIMIT_INTRA_SLICES_PART 1 //Turn this on to not perform depth limiting for I-SLICES.
-#define OL_END_CU                         MAX_INT //Default for initialising the partition information buffer
+#define OL_END_CU                         MAX_INT //Default for initializing the partition information buffer
 #define OL_PART_BUF_SIZE                  86 //maximum number of possible partition bits in a CU
 #endif