Changeset 73 in 3DVCSoftware for branches/HTM-3.0-Samsung

Timestamp:

8 Jun 2012, 02:09:02 (13 years ago)

Author:

samsung-htm

Message:

 

Location:

branches/HTM-3.0-Samsung/source/Lib/TLibCommon

Files:

• CommonDef.h (modified) (1 diff)
• TComDepthMapGenerator.cpp (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/HTM-3.0-Samsung/source/Lib/TLibCommon/CommonDef.h

@@ -138 +138 @@
 #define PDM_NO_INTER_UPDATE               1         // no update for inter (but not inter-view) predicted blocks
 #define PDM_MERGE_POS                     0         // position of pdm in merge list (0..4)
+#if SAIT_IMPROV_MOTION_PRED_M24829
+#define PDM_AMVP_POS                      0         // position of pdm in amvp list  (0..3)
+#else
 #define PDM_AMVP_POS                      2         // position of pdm in amvp list  (0..3)
+#endif
 #define PDM_OUTPUT_PRED_DEPTH_MAP         0         // output prediction depth map (for debugging)
 

branches/HTM-3.0-Samsung/source/Lib/TLibCommon/TComDepthMapGenerator.cpp

@@ -1478 +1478 @@
   Int           iCurrPosY;
   pcPredDepthMap->getTopLeftSamplePos( pcCU->getAddr(), pcCU->getZorderIdxInCU() + uiPartAddr, iCurrPosX, iCurrPosY );
+#if SAIT_IMPROV_MOTION_PRED_M24829 // max disparity within PU
+  int DiWidth=iCurrPosX+(iWidth  >> m_uiSubSampExpX);
+  int DiHeight=iCurrPosY+(iHeight >> m_uiSubSampExpY);
+  int maxDepth=INT_MIN;
+  for(int y=iCurrPosY; y<DiHeight ;y++) {
+          for(int x=iCurrPosX; x<DiWidth; x++) {
+                  if(piPredDepthMap[ x + y * iCurrStride ] > maxDepth) {
+                          maxDepth = piPredDepthMap[ x + y * iCurrStride ];
+                  }
+          }
+  }
+  iCurrPosX  += ( ( iWidth  >> m_uiSubSampExpX ) - 1 ) >> 1;
+  iCurrPosY  += ( ( iHeight >> m_uiSubSampExpY ) - 1 ) >> 1;
+  riPrdDepth  = maxDepth;
+#else
   iCurrPosX  += ( ( iWidth  >> m_uiSubSampExpX ) - 1 ) >> 1;
   iCurrPosY  += ( ( iHeight >> m_uiSubSampExpY ) - 1 ) >> 1;
   riPrdDepth  = piPredDepthMap[ iCurrPosX + iCurrPosY * iCurrStride ];
+#endif
   if( piPosX )
   {

branches/HTM-3.0-Samsung/source/Lib/TLibCommon/TypeDef.h

@@ -68 +68 @@
 #define HHI_FULL_PEL_DEPTH_MAP_MV_ACC   1   // full-pel mv accuracy for depth maps
 
+#if HHI_INTER_VIEW_MOTION_PRED
+#define SAIT_IMPROV_MOTION_PRED_M24829  1   // improved inter-view motion vector prediction
+#else
+#define SAIT_IMPROV_MOTION_PRED_M24829  0   
+#endif 
 
 #if HHI_INTER_VIEW_RESIDUAL_PRED