Changeset 1431 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

10 Aug 2015, 20:28:49 (10 years ago)

Author:

seregin

Message:

scaling factors 1x

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• CommonDef.h (modified) (1 diff)
• TComMv.h (modified) (1 diff)
• TComSlice.cpp (modified) (1 diff)
• TComUpsampleFilter.cpp (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/CommonDef.h

@@ -121 +121 @@
 static const Double MAX_DOUBLE =                             1.7e+308; ///< max. value of Double-type value
 
+#if SVC_EXTENSION
+static const Int    POS_SCALING_FACTOR_1X =                     65536; ///< position scaling factor equal to 1x
+static const Int    MV_SCALING_FACTOR_1X =                      4096 ; ///< MV scaling factor equal to 1x
+#endif
+
 // ====================================================================================================================
 // Coding tool configuration

branches/SHM-dev/source/Lib/TLibCommon/TComMv.h

@@ -167 +167 @@
   const TComMv scaleMv( Int iScaleX, Int iScaleY ) const
   {
-    Int mvx = iScaleX == 4096 ? getHor() : Clip3( -32768, 32767, (iScaleX * getHor() + 127 + (iScaleX * getHor() < 0)) >> 8 );
-    Int mvy = iScaleY == 4096 ? getVer() : Clip3( -32768, 32767, (iScaleY * getVer() + 127 + (iScaleY * getVer() < 0)) >> 8 );
+    Int mvx = iScaleX == MV_SCALING_FACTOR_1X ? getHor() : Clip3( -32768, 32767, (iScaleX * getHor() + 127 + (iScaleX * getHor() < 0)) >> 8 );
+    Int mvy = iScaleY == MV_SCALING_FACTOR_1X ? getVer() : Clip3( -32768, 32767, (iScaleY * getVer() + 127 + (iScaleY * getVer() < 0)) >> 8 );
     return TComMv( mvx, mvy );
   }

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -510 +510 @@
         // motion resampling constraint
         // Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction
-        if( !( m_pcPic->getPosScalingFactor(refLayerIdc, 0) == 65536 && m_pcPic->getPosScalingFactor(refLayerIdc, 1) == 65536 ) || !scalingOffset || !sameBitDepths 
+        if( !( m_pcPic->getPosScalingFactor(refLayerIdc, 0) == POS_SCALING_FACTOR_1X && m_pcPic->getPosScalingFactor(refLayerIdc, 1) == POS_SCALING_FACTOR_1X ) || !scalingOffset || !sameBitDepths 
 #if CGS_3D_ASYMLUT
           || getPPS()->getCGSFlag()

branches/SHM-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

@@ -113 +113 @@
 
   // non-normative software optimization for certain simple resampling cases
-  if( scaleX == 65536 && scaleY == 65536 ) // ratio 1x
+  if( scaleX == POS_SCALING_FACTOR_1X && scaleY == POS_SCALING_FACTOR_1X ) // ratio 1x
   {
     piSrcY = piSrcBufY;