Changeset 115 in 3DVCSoftware for trunk/source/Lib/TLibCommon

Timestamp:

30 Aug 2012, 14:52:41 (12 years ago)

Author:

tech

Message:

Integrated revision 114. with:

• A0119: VSO Depth Fidelity
• A0044: Depth Quadtree Prediction

Location:

trunk/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)
• TypeDef.h (modified) (1 diff)

trunk/source/Lib/TLibCommon/TComDataCU.cpp

@@ -152 +152 @@
 #endif
 #endif
+#if OL_DEPTHLIMIT
+  //add a variable to store the partition information
+  //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;
+        }
+#endif
 }
 
@@ -456 +466 @@
 Void TComDataCU::initCU( TComPic* pcPic, UInt iCUAddr )
 {
+#if OL_DEPTHLIMIT
+  TComDataCU* pcCU     = pcPic->getCU(iCUAddr);
+#endif
 
   m_pcPic              = pcPic;
@@ -672 +685 @@
     m_apcCUColocated[1] = getSlice()->getRefPic( REF_PIC_LIST_1, 0)->getCU( m_uiCUAddr );
   }
+#if OL_DEPTHLIMIT
+  setPartDumpFlag (pcCU->getPartDumpFlag());
+#endif
 }
 
@@ -1001 +1017 @@
   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
+  setPartDumpFlag (pcCU->getPartDumpFlag());
+#endif
 }
 

trunk/source/Lib/TLibCommon/TComDataCU.h

@@ -237 +237 @@
   UInt*         m_uiSliceStartCU;    ///< Start CU address of current slice
   UInt*         m_uiEntropySliceStartCU; ///< Start CU address of current slice
+
+#if OL_DEPTHLIMIT 
+  //add a variable to store the partition information
+  //a 2D array in uidepth,part_symbol format
+  UInt          m_uiPartInfo[OL_PART_BUF_SIZE][2];
+  UInt          m_uiPartNum;
+  Bool          b_dumpPartInfo;
+#endif 
   
   // -------------------------------------------------------------------------------------------------------------------
@@ -596 +604 @@
   
   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;};
+#endif
   
   // -------------------------------------------------------------------------------------------------------------------

trunk/source/Lib/TLibCommon/TComRdCost.h

@@ -377 +377 @@
   Bool                    m_bUseEstimatedVSD; 
 #endif
+#if LGE_WVSO_A0119
+  Int                                                                                   m_iDWeight;
+  Int                                                                                   m_iVSOWeight;
+  Int                     m_iVSDWeight;
+  Bool                    m_bWVSO;
+#endif
 
   Bool                    m_bUseVSO;
@@ -410 +416 @@
   Void    setVSOMode( UInt uiIn);
   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; };
+#endif 
 #if HHI_VSO_DIST_INT
   Void    setAllowNegDist ( Bool bAllowNegDist );

trunk/source/Lib/TLibCommon/TComSlice.cpp

@@ -1441 +1441 @@
 , m_bUseDMM                   (false)
 #endif
+#if OL_DEPTHLIMIT
+, m_bDepthPartitionLimiting   (false)
+#endif
 {
   // AMVP parameter

trunk/source/Lib/TLibCommon/TComSlice.h

@@ -354 +354 @@
 #endif
 
+#if OL_DEPTHLIMIT
+  Bool m_bDepthPartitionLimiting;
+#endif
+
 #if DEPTH_MAP_GENERATION
   UInt  m_uiPredDepthMapGeneration;
@@ -619 +623 @@
 #endif
 
+#if OL_DEPTHLIMIT
+  Void setUseDPL(Bool b) {m_bDepthPartitionLimiting = b; }
+  Bool getUseDPL()       {return m_bDepthPartitionLimiting;}
+#endif
+
   Void initMultiviewSPS      ( UInt uiViewId, Int iViewOrderIdx = 0, UInt uiCamParPrecision = 0, Bool bCamParSlice = false, Int** aaiScale = 0, Int** aaiOffset = 0 );
   Void initMultiviewSPSDepth ( UInt uiViewId, Int iViewOrderIdx );

trunk/source/Lib/TLibCommon/TypeDef.h

@@ -94 +94 @@
 #define SAIT_VSO_EST_A0033                1 // JCT2-A0033 modification 3
 #define LGE_VSO_EARLY_SKIP_A0093          1 // JCT2-A0093 modification 4
-
+#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_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_PART_BUF_SIZE                  86 //maximum number of possible partition bits in a CU
+#endif
 
 #define HHI_INTERVIEW_SKIP                1