Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComMotionInfo.cpp

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TLibCommon/TComMotionInfo.cpp (modified) (15 diffs)

trunk/source/Lib/TLibCommon/TComMotionInfo.cpp

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -40 +40 @@
 #include "assert.h"
 #include <stdlib.h>
-#if H_3D_SPIVMP
+#if NH_3D_SPIVMP
 #include "TComDataCU.h"
 #include "TComPic.h"
@@ -61 +61 @@
   assert(m_pcMvd    == NULL);
   assert(m_piRefIdx == NULL);
-  
+
   m_pcMv     = new TComMv[ uiNumPartition ];
   m_pcMvd    = new TComMv[ uiNumPartition ];
   m_piRefIdx = new Char  [ uiNumPartition ];
-  
+
   m_uiNumPartition = uiNumPartition;
 }
@@ -74 +74 @@
   assert(m_pcMvd    != NULL);
   assert(m_piRefIdx != NULL);
-  
+
   delete[] m_pcMv;
   delete[] m_pcMvd;
   delete[] m_piRefIdx;
-  
+
   m_pcMv     = NULL;
   m_pcMvd    = NULL;
   m_piRefIdx = NULL;
-  
+
   m_uiNumPartition = 0;
 }
@@ -95 +95 @@
   {
     m_pcMv [ i ].setZero();
-    m_pcMvd[ i ].setZero();      
+    m_pcMvd[ i ].setZero();
   }
   assert( sizeof( *m_piRefIdx ) == 1 );
@@ -104 +104 @@
 {
   Int iSizeInTComMv = sizeof( TComMv ) * iNumPartSrc;
-  
+
   memcpy( m_pcMv     + iPartAddrDst, pcCUMvFieldSrc->m_pcMv,     iSizeInTComMv );
   memcpy( m_pcMvd    + iPartAddrDst, pcCUMvFieldSrc->m_pcMvd,    iSizeInTComMv );
@@ -119 +119 @@
   Int iSizeInTComMv = sizeof( TComMv ) * uiNumPart;
   Int iOffset = uiOffset + iPartAddrDst;
-  
+
   memcpy( pcCUMvFieldDst->m_pcMv     + iOffset, m_pcMv     + uiOffset, iSizeInTComMv );
   memcpy( pcCUMvFieldDst->m_pcMvd    + iOffset, m_pcMvd    + uiOffset, iSizeInTComMv );
@@ -135 +135 @@
   p += iPartAddr;
   Int numElements = m_uiNumPartition >> ( 2 * uiDepth );
-  
+
   switch( eCUMode )
   {
@@ -144 +144 @@
       }
       break;
-      
+
     case SIZE_2NxN:
       numElements >>= 1;
@@ -152 +152 @@
       }
       break;
-      
+
     case SIZE_Nx2N:
       numElements >>= 2;
@@ -161 +161 @@
       }
       break;
-      
+
     case SIZE_NxN:
       numElements >>= 2;
@@ -328 +328 @@
 }
 
-#if H_3D_SPIVMP
+#if NH_3D_SPIVMP
 Void TComCUMvField::setMvFieldSP( TComDataCU* pcCU, UInt uiAbsPartIdx, TComMvField cMvField, Int iWidth, Int iHeight  )
 {
-  uiAbsPartIdx += pcCU->getZorderIdxInCU();
+  uiAbsPartIdx += pcCU->getZorderIdxInCtu();
   Int iStartPelX = g_auiRasterToPelX[g_auiZscanToRaster[uiAbsPartIdx]];
   Int iStartPelY = g_auiRasterToPelY[g_auiZscanToRaster[uiAbsPartIdx]];
@@ -341 +341 @@
     for (Int j=iStartPelX; j < iEndPelX; j += pcCU->getPic()->getMinCUWidth())
     {
-      Int iCurrRaster = i / pcCU->getPic()->getMinCUHeight() * pcCU->getPic()->getNumPartInWidth() + j/pcCU->getPic()->getMinCUWidth();
+      Int iCurrRaster = i / pcCU->getPic()->getMinCUHeight() * pcCU->getPic()->getNumPartInCtuWidth() + j/pcCU->getPic()->getMinCUWidth();
       Int uiPartAddr = g_auiRasterToZscan[iCurrRaster];
-      uiPartAddr -= pcCU->getZorderIdxInCU();  
+      uiPartAddr -= pcCU->getZorderIdxInCtu();  
 
       m_pcMv[uiPartAddr] = cMvField.getMv();
@@ -360 +360 @@
   Int N = scale * scale;
   assert( N > 0 && N <= m_uiNumPartition);
-  
+
   for ( Int uiPartIdx = 0; uiPartIdx < m_uiNumPartition; uiPartIdx += N )
   {
-    TComMv cMv(0,0); 
-    PredMode predMode = MODE_INTRA;
+    TComMv cMv(0,0);
     Int iRefIdx = 0;
-    
+
     cMv = m_pcMv[ uiPartIdx ];
-    predMode = static_cast<PredMode>( pePredMode[ uiPartIdx ] );
+    PredMode predMode = static_cast<PredMode>( pePredMode[ uiPartIdx ] );
     iRefIdx = m_piRefIdx[ uiPartIdx ];
     for ( Int i = 0; i < N; i++ )
@@ -377 +376 @@
     }
   }
-} 
+}
 //! \}