Changeset 872 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComYuv.cpp

Timestamp:

27 Mar 2014, 10:11:29 (11 years ago)

Author:

tech

Message:

Merged HTM-10.0-dev0@871. (MV-HEVC 7 HLS)

File:

• trunk/source/Lib/TLibCommon/TComYuv.cpp (modified) (7 diffs)

trunk/source/Lib/TLibCommon/TComYuv.cpp

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2013, ITU/ISO/IEC
+* Copyright (c) 2010-2014, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -110 +110 @@
   {
     ::memcpy( pDst, pSrc, sizeof(Pel)*iWidth);
-
 #if ENC_DEC_TRACE && H_MV_ENC_DEC_TRAC
     if ( g_traceCopyBack && g_nSymbolCounter >= g_stopAtCounter )
@@ -121 +120 @@
     }
 #endif
-
     pDst += iDstStride;
     pSrc += iSrcStride;
@@ -616 +614 @@
     {
 #if DISABLING_CLIP_FOR_BIPREDME
-      pDst[x ] = (pDst[x ]<<1) - pSrc[x ] ;
+      pDst[x ] = 2 * pDst[x] - pSrc[x];
 #else
-      pDst[x ] = Clip( (pDst[x ]<<1) - pSrc[x ] );
+      pDst[x ] = ClipY(2 * pDst[x] - pSrc[x]);
 #endif
     }
@@ -636 +634 @@
     {
 #if DISABLING_CLIP_FOR_BIPREDME
-      pDstU[x ] = (pDstU[x ]<<1) - pSrcU[x ] ;
-      pDstV[x ] = (pDstV[x ]<<1) - pSrcV[x ] ;
+      pDstU[x ] = 2 * pDstU[x] - pSrcU[x];
+      pDstV[x ] = 2 * pDstV[x] - pSrcV[x];
 #else
-      pDstU[x ] = Clip( (pDstU[x ]<<1) - pSrcU[x ] );
-      pDstV[x ] = Clip( (pDstV[x ]<<1) - pSrcV[x ] );
+      pDstU[x ] = ClipC(2 * pDstU[x] - pSrcU[x]);
+      pDstV[x ] = ClipC(2 * pDstV[x] - pSrcV[x]);
 #endif
     }
@@ -649 +647 @@
   }
 }
-
 #if H_3D
 Void TComYuv::addClipPartLuma( TComYuv* pcYuvSrc0, TComYuv* pcYuvSrc1, UInt uiTrUnitIdx, UInt uiPartSize )
@@ -843 +840 @@
 #endif
 #endif
+
 //! \}