Changeset 1164 in 3DVCSoftware for branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

16 Mar 2015, 12:52:20 (9 years ago)

Author:

tech

Message:

Merged 13.1-dev2-Sony

File:

• branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp (modified) (7 diffs)

branches/HTM-13.1-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2388 +2388 @@
     Int iPictureHeight = depthPicYuv->getHeight();
     
+#if !HS_DBBP_CLEAN_K0048
     Int iWidth  = uiWidth;
     Int iHeight = uiHeight;
+#endif
     
     Bool depthRefineFlag = false;
@@ -2402 +2404 @@
     }
     
+#if HS_DBBP_CLEAN_K0048
+    Int depthPosX = Clip3(0,   iPictureWidth - 1,  iBlkX + ((cDv.getHor()+2)>>2));
+    Int depthPosY = Clip3(0,   iPictureHeight - 1, iBlkY + ((cDv.getVer()+2)>>2));
+#else
     Int depthPosX = Clip3(0,   iPictureWidth - iWidth,  iBlkX + ((cDv.getHor()+2)>>2));
     Int depthPosY = Clip3(0,   iPictureHeight- iHeight, iBlkY + ((cDv.getVer()+2)>>2));
+#endif
     
     pDepthPels = depthPicYuv->getLumaAddr() + depthPosX + depthPosY * uiDepthStride;
@@ -4189 +4196 @@
               }
             }
+#if !SHARP_SUBBLOCK_CLEAN_K0044
             if (iPUHeight + iPUWidth == 12)
             {
@@ -4197 +4205 @@
               }
             }
+#endif
 
             iPartition ++;
@@ -5411 +5420 @@
   rcMv.setVer( min (iVerMax, max (iVerMin, rcMv.getVer())) );
 }
+
+#if SONY_MV_V_CONST_C0078
+Void TComDataCU::checkMV_V (TComMv&  rcMv,  RefPicList eRefPicList, int iRefIdx )
+{
+  if ( getSlice()->getSPS()->getInterViewMvVertConstraintFlag() )
+  {
+    if ( getSlice()->getRefPic( eRefPicList, iRefIdx )->getPOC() == getSlice()->getPOC() )
+    {
+        //When inter_view_mv_vert_constraint_flag is equal to 1,
+        //the vertical component of the motion vectors used for inter-layer prediction 
+        //shall be equal to or less than 56 in units of luma samples
+        assert ( rcMv.getVer() <= (56<<2) );
+    }
+  }
+}
+#endif
 
 UInt TComDataCU::getIntraSizeIdx(UInt uiAbsPartIdx)
@@ -6918 +6943 @@
 
               }
+#if !SHARP_SUBBLOCK_CLEAN_K0044
               if (iSPHeight + iSPWidth == 12)
               {
@@ -6926 +6952 @@
                 }
               }
+#endif
               iPartition ++;
             }