Changeset 1412 in 3DVCSoftware for branches/HTM-16.2-dev/source/Lib/TLibCommon/TComMotionInfo.cpp

Timestamp:

12 Apr 2018, 11:12:21 (7 years ago)

Author:

tech

Message:

• Update HM-16.18
• Cleanups
• Encoder Extension

-- Representation formats
-- Parameter set sharing
-- GOP configuration

File:

• branches/HTM-16.2-dev/source/Lib/TLibCommon/TComMotionInfo.cpp (modified) (6 diffs)

branches/HTM-16.2-dev/source/Lib/TLibCommon/TComMotionInfo.cpp

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -40 +40 @@
 #include "assert.h"
 #include <stdlib.h>
-#if NH_3D_SPIVMP
+#if NH_3D
 #include "TComDataCU.h"
 #include "TComPic.h"
@@ -330 +330 @@
 }
 
-#if NH_3D_SPIVMP
+#if NH_3D
 Void TComCUMvField::setMvFieldSP( TComDataCU* pcCU, UInt uiAbsPartIdx, TComMvField cMvField, Int iWidth, Int iHeight  )
 {
@@ -358 +358 @@
  * \param scale      Factor by which to subsample motion information
  */
+#if REDUCED_ENCODER_MEMORY
+Void TComCUMvField::compress(SChar *pePredMode, const SChar* pePredModeSource, const Int scale, const TComCUMvField &source)
+{
+  const Int numSubpartsWithIdenticalMotion = scale * scale;
+  assert( numSubpartsWithIdenticalMotion > 0 && numSubpartsWithIdenticalMotion <= m_uiNumPartition);
+  assert(source.m_uiNumPartition == m_uiNumPartition);
+
+  for ( Int partIdx = 0; partIdx < m_uiNumPartition; partIdx += numSubpartsWithIdenticalMotion )
+  {
+    TComMv cMv(0,0);
+    Int iRefIdx = 0;
+
+    cMv = source.m_pcMv[ partIdx ];
+    PredMode predMode = static_cast<PredMode>( pePredModeSource[ partIdx ] );
+    iRefIdx = source.m_piRefIdx[ partIdx ];
+    for ( Int i = 0; i < numSubpartsWithIdenticalMotion; i++ )
+    {
+      m_pcMv[ partIdx + i ] = cMv;
+      pePredMode[ partIdx + i ] = predMode;
+      m_piRefIdx[ partIdx + i ] = iRefIdx;
+    }
+  }
+}
+#else
+
 Void TComCUMvField::compress(SChar* pePredMode, Int scale)
 {
@@ -379 +404 @@
   }
 }
+#endif
 
 #if NH_MV
@@ -405 +431 @@
 }
 
-#if NH_3D_MLC
+#if NH_3D
 Void TComMotionCand::print( Int i )
 {