Changeset 529 in 3DVCSoftware

Timestamp:

8 Jul 2013, 03:55:46 (11 years ago)

Author:

mitsubishi-htm

Message:

-intermediate version. equivalent to previous

Location:

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComPrediction.cpp (modified) (6 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComDataCU.cpp

@@ -2189 +2189 @@
   setSubPart<Char>( iVSPFlag, m_piVSPFlag, uiAbsPartIdx, uiDepth, uiPartIdx );
 }
-
 #endif
 

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComPrediction.cpp

@@ -572 +572 @@
 Void TComPrediction::xPredInterUniVSP( TComDataCU* pcCU, UInt uiPartAddr, Int iWidth, Int iHeight, RefPicList eRefPicList, TComYuv*& rpcYuvPred, Bool bi )
 {
-  UInt uiAbsPartIdx = pcCU->getZorderIdxInCU();
-
-  // Step 1: get depth reference
+  // Get depth reference
   Int depthRefViewIdx = pcCU->getDvInfo(uiPartAddr).m_aVIdxCan;
   TComPic* pRefPicBaseDepth = pcCU->getSlice()->getIvPic (true, depthRefViewIdx );
@@ -581 +579 @@
   assert(pcBaseViewDepthPicYuv != NULL);
 
-  // Step 2: get texture reference
+  // Get texture reference
   Int iRefIdx = pcCU->getCUMvField( eRefPicList )->getRefIdx( uiPartAddr );
   assert(iRefIdx >= 0);
@@ -588 +586 @@
   assert(pcBaseViewTxtPicYuv != NULL);
 
-  // Step 3: initialize the LUT according to the reference viewIdx
+  // Initialize LUT according to the reference viewIdx
   Int txtRefViewIdx = pRefPicBaseTxt->getViewIndex();
   Int* pShiftLUT    = pcCU->getSlice()->getDepthToDisparityB( txtRefViewIdx );
   assert( txtRefViewIdx < pcCU->getSlice()->getViewIndex() );
 
-  // Step 4: Do compensation
+  // Do compensation
   TComMv cDv  = pcCU->getCUMvField( eRefPicList )->getMv( uiPartAddr ); // cDv is the disparity vector derived from the neighbors
   pcCU->clipMv(cDv);
+  UInt uiAbsPartIdx = pcCU->getZorderIdxInCU();
   Int iBlkX = ( pcCU->getAddr() % pRefPicBaseDepth->getFrameWidthInCU() ) * g_uiMaxCUWidth  + g_auiRasterToPelX[ g_auiZscanToRaster[ uiAbsPartIdx ] ];
   Int iBlkY = ( pcCU->getAddr() / pRefPicBaseDepth->getFrameWidthInCU() ) * g_uiMaxCUHeight + g_auiRasterToPelY[ g_auiZscanToRaster[ uiAbsPartIdx ] ];
@@ -752 +751 @@
   TComYuv* pcMbYuv;
   Int      iRefIdx[2] = {-1, -1};
+  Bool     bi = (pcCU->getCUMvField( REF_PIC_LIST_0 )->getRefIdx( uiPartAddr ) >= 0 && pcCU->getCUMvField( REF_PIC_LIST_1 )->getRefIdx( uiPartAddr ) >= 0);
 
   for ( Int iRefList = 0; iRefList < 2; iRefList++ )
@@ -760 +760 @@
     if ( iRefIdx[iRefList] < 0 )
       continue;
-
     assert( iRefIdx[iRefList] < pcCU->getSlice()->getNumRefIdx(eRefPicList) );
 
     pcMbYuv = &m_acYuvPred[iRefList];
-    if( pcCU->getCUMvField( REF_PIC_LIST_0 )->getRefIdx( uiPartAddr ) >= 0 && pcCU->getCUMvField( REF_PIC_LIST_1 )->getRefIdx( uiPartAddr ) >= 0 )
-      xPredInterUniVSP ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv, true );
-    else
-      xPredInterUniVSP ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv );
+    xPredInterUniVSP ( pcCU, uiPartAddr, iWidth, iHeight, eRefPicList, pcMbYuv, bi );
   }
 
@@ -1583 +1579 @@
       assert( ref[refOffset] >= 0 && ref[refOffset]<= 255 );
       m_if.filterHorLuma( &ref[refOffset], refStride, &dst[xTxt], dstStride, nTxtPerDepthX, nTxtPerDepthY, xFrac, !bi );
-
     }
     ref   += refStride*nTxtPerDepthY;