Changeset 1159 in 3DVCSoftware for branches

Timestamp:

4 Mar 2015, 02:11:05 (10 years ago)

Author:

samsung-htm

Message:

Fix K0033

Location:

branches/HTM-13.1-dev1-Samsung2/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

branches/HTM-13.1-dev1-Samsung2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5977 +5977 @@
 Bool TComDataCU::getNeighDepth ( UInt uiPartIdx, UInt uiPartAddr, Pel* pNeighDepth, Int index )
 {
-
+#if NEIGHBORING_PIX_AVAILABILITY_FIX
+  UInt  uiPartIdxLT, uiPartIdxRT;
+  this->deriveLeftRightTopIdxAdi( uiPartIdxLT, uiPartIdxRT, 0, 0 );
+  UInt uiMidPart, uiPartNeighbor;  
+  TComDataCU* pcCUNeighbor;
+  Bool bDepAvail = false;
+  Pel *pDepth  = this->getPic()->getPicYuvRec()->getLumaAddr();
+  Int iDepStride =  this->getPic()->getPicYuvRec()->getStride();
+
+  Int xP, yP, nPSW, nPSH;
+  this->getPartPosition( uiPartIdx, xP, yP, nPSW, nPSH );
+
+  switch( index )
+  {
+  case 0: // Mid Left
+    uiMidPart = g_auiZscanToRaster[uiPartIdxLT] + (nPSH>>1) / this->getPic()->getMinCUHeight() * this->getPic()->getNumPartInWidth();
+    pcCUNeighbor = this->getPULeft( uiPartNeighbor, g_auiRasterToZscan[uiMidPart] );
+    if ( pcCUNeighbor )
+    {
+      if( !this->getSlice()->getPPS()->getConstrainedIntraPred() )
+      {
+        *pNeighDepth = pDepth[ (yP+(nPSH>>1)) * iDepStride + (xP-1) ];
+        bDepAvail = true;
+      }
+      else if ( pcCUNeighbor->getPredictionMode( uiPartNeighbor ) == MODE_INTRA )
+      {
+        *pNeighDepth = pDepth[ (yP+(nPSH>>1)) * iDepStride + (xP-1) ];
+        bDepAvail = true;
+      }
+    }
+    break;
+  case 1: // Mid Above
+    uiMidPart = g_auiZscanToRaster[uiPartIdxLT] + (nPSW>>1) / this->getPic()->getMinCUWidth();
+    pcCUNeighbor = this->getPUAbove( uiPartNeighbor, g_auiRasterToZscan[uiMidPart] );
+    if( pcCUNeighbor )
+    {
+      if( !this->getSlice()->getPPS()->getConstrainedIntraPred() )
+      {
+        *pNeighDepth = pDepth[ (yP-1) * iDepStride + (xP + (nPSW>>1)) ];
+        bDepAvail = true;
+      }
+      else if ( pcCUNeighbor->getPredictionMode( uiPartNeighbor ) == MODE_INTRA )
+      {
+        *pNeighDepth = pDepth[ (yP-1) * iDepStride + (xP + (nPSW>>1)) ];
+        bDepAvail = true;
+      }
+    }
+    break;
+  default:
+    break;
+  }
+
+  return bDepAvail;
+#else
   Bool bDepAvail = false;
   Pel *pDepth  = this->getPic()->getPicYuvRec()->getLumaAddr();
@@ -6006 +6059 @@
   }
   return bDepAvail;
+#endif
 }
 #else

branches/HTM-13.1-dev1-Samsung2/source/Lib/TLibCommon/TypeDef.h

@@ -81 +81 @@
 #if H_3D
 #define SEC_DEPTH_INTRA_SKIP_MODE_K0033   1   // Depth intra skip mode
+#if SEC_DEPTH_INTRA_SKIP_MODE_K0033
+#define NEIGHBORING_PIX_AVAILABILITY_FIX  1
+#endif
+
 
 #define H_3D_QTLPC                        1   // OL_QTLIMIT_PREDCODING_B0068 //JCT3V-B0068