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


Ignore:
Timestamp:
8 Jun 2012, 02:09:02 (12 years ago)
Author:
samsung-htm
Message:
 
Location:
branches/HTM-3.0-Samsung/source/Lib/TLibCommon
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-3.0-Samsung/source/Lib/TLibCommon/CommonDef.h

    r70 r73  
    138138#define PDM_NO_INTER_UPDATE               1         // no update for inter (but not inter-view) predicted blocks
    139139#define PDM_MERGE_POS                     0         // position of pdm in merge list (0..4)
     140#if SAIT_IMPROV_MOTION_PRED_M24829
     141#define PDM_AMVP_POS                      0         // position of pdm in amvp list  (0..3)
     142#else
    140143#define PDM_AMVP_POS                      2         // position of pdm in amvp list  (0..3)
     144#endif
    141145#define PDM_OUTPUT_PRED_DEPTH_MAP         0         // output prediction depth map (for debugging)
    142146
  • branches/HTM-3.0-Samsung/source/Lib/TLibCommon/TComDepthMapGenerator.cpp

    r71 r73  
    14781478  Int           iCurrPosY;
    14791479  pcPredDepthMap->getTopLeftSamplePos( pcCU->getAddr(), pcCU->getZorderIdxInCU() + uiPartAddr, iCurrPosX, iCurrPosY );
     1480#if SAIT_IMPROV_MOTION_PRED_M24829 // max disparity within PU
     1481  int DiWidth=iCurrPosX+(iWidth  >> m_uiSubSampExpX);
     1482  int DiHeight=iCurrPosY+(iHeight >> m_uiSubSampExpY);
     1483  int maxDepth=INT_MIN;
     1484  for(int y=iCurrPosY; y<DiHeight ;y++) {
     1485          for(int x=iCurrPosX; x<DiWidth; x++) {
     1486                  if(piPredDepthMap[ x + y * iCurrStride ] > maxDepth) {
     1487                          maxDepth = piPredDepthMap[ x + y * iCurrStride ];
     1488                  }
     1489          }
     1490  }
     1491  iCurrPosX  += ( ( iWidth  >> m_uiSubSampExpX ) - 1 ) >> 1;
     1492  iCurrPosY  += ( ( iHeight >> m_uiSubSampExpY ) - 1 ) >> 1;
     1493  riPrdDepth  = maxDepth;
     1494#else
    14801495  iCurrPosX  += ( ( iWidth  >> m_uiSubSampExpX ) - 1 ) >> 1;
    14811496  iCurrPosY  += ( ( iHeight >> m_uiSubSampExpY ) - 1 ) >> 1;
    14821497  riPrdDepth  = piPredDepthMap[ iCurrPosX + iCurrPosY * iCurrStride ];
     1498#endif
    14831499  if( piPosX )
    14841500  {
  • branches/HTM-3.0-Samsung/source/Lib/TLibCommon/TypeDef.h

    r70 r73  
    6868#define HHI_FULL_PEL_DEPTH_MAP_MV_ACC   1   // full-pel mv accuracy for depth maps
    6969
     70#if HHI_INTER_VIEW_MOTION_PRED
     71#define SAIT_IMPROV_MOTION_PRED_M24829  1   // improved inter-view motion vector prediction
     72#else
     73#define SAIT_IMPROV_MOTION_PRED_M24829  0   
     74#endif
    7075
    7176#if HHI_INTER_VIEW_RESIDUAL_PRED
Note: See TracChangeset for help on using the changeset viewer.