Changeset 231 in 3DVCSoftware for branches/HTM-5.1-dev3-MERL/source/Lib/TLibRenderer

Timestamp:

26 Jan 2013, 19:36:53 (12 years ago)

Author:

mitsubishi-htm

Message:

-Integration of JCT3V-C0152 & JCT3V-C0131
-This check-in enable C0131 only

Location:

branches/HTM-5.1-dev3-MERL/source/Lib/TLibRenderer

Files:

• TRenFilter.cpp (modified) (2 diffs)
• TRenInterpFilter.h (modified) (1 diff)
• TRenSingleModel.h (modified) (1 diff)
• TRenTop.cpp (modified) (4 diffs)

branches/HTM-5.1-dev3-MERL/source/Lib/TLibRenderer/TRenFilter.cpp

@@ -1154 +1154 @@
 }
 
-
 // Down Sampling
 // Down sample luma
@@ -1224 +1223 @@
   }
 }
-
 
 Void TRenFilter::xInterpHorChroma( Pel* piSrc, Int iSrcStride, Int iSrcStepX, Int iSrcStepY, Int iWidth, Int iHeight, Pel* piDst, Int iDstStride, Int iDstStepX, Int iDstStepY, FpChromaIntFilt fpFilter )

branches/HTM-5.1-dev3-MERL/source/Lib/TLibRenderer/TRenInterpFilter.h

@@ -72 +72 @@
   __inline Void xCTI_FilterQuarter1Hor(Pel* piSrc, Int iSrcStride, Int iSrcStep, Int iWidth, Int iHeight, Int iDstStride, Int iDstStep, Pel*& rpiDst);
   __inline Void xCTI_FilterQuarter1Hor(Int* piSrc, Int iSrcStride, Int iSrcStep, Int iWidth, Int iHeight, Int iDstStride, Int iDstStep, Pel*& rpiDst);
-  
+
   __inline Void xCTI_FilterHalfVer (Pel* piSrc, Int iSrcStride, Int iSrcStep, Int iWidth, Int iHeight, Int iDstStride, Int iDstStep, Int*& rpiDst, Int iDstStridePel, Pel*& rpiDstPel );
   __inline Void xCTI_FilterHalfVer (Pel* piSrc, Int iSrcStride, Int iSrcStep, Int iWidth, Int iHeight, Int iDstStride, Int iDstStep, Int*& rpiDst );

branches/HTM-5.1-dev3-MERL/source/Lib/TLibRenderer/TRenSingleModel.h

@@ -33 +33 @@
 
 #if !QC_MVHEVC_B0046
-#ifndef __TRENSINGLEMODEL__ 
+#ifndef __TRENSINGLEMODEL__
 #define __TRENSINGLEMODEL__
 

branches/HTM-5.1-dev3-MERL/source/Lib/TLibRenderer/TRenTop.cpp

@@ -193 +193 @@
 }
 
-
 Void TRenTop::xConvertOutputData( PelImage* pcOrgOutputImage, PelImage* pcConvOutputImage, Bool bMirror )
 {
@@ -1450 +1449 @@
 
     for( Int iXPos = iSourcePos + 1; iXPos <  iWidth; iXPos++)
-        {
+    {
       for( UInt uiCurPlane = 0; uiCurPlane < uiNumberOfPlanes; uiCurPlane++)
-          {
+      {
         apcOutputData[uiCurPlane][iXPos] = apcInputData[uiCurPlane][iSourcePos];
       }
-            }
+    }
 
     // Fill Left Gap
@@ -1469 +1468 @@
       {
         apcOutputData[uiCurPlane][iXPos] = apcInputData[uiCurPlane][iSourcePos];
-          }
-        }
+      }
+    }
 
     // Go to next line
@@ -2154 +2153 @@
     {
       m_aaiSubPelShift[uiEntry] = new Int[ iNumEntries ];
-        }
+    }
 
     TRenFilter::setSubPelShiftLUT(m_iRelShiftLUTPrec, m_aaiSubPelShift, -1);