changeset 822:995b6235dffc

Merged multicoreware/xhevc into default
author Deepthi Devaki Akkoorath <deepthidevaki@multicorewareinc.com>
date Thu, 25 Apr 2013 16:08:03 +0530
parents a2483d531f95 (current diff) ceded0279117 (diff)
children 94205c681a97
files
diffstat 3 files changed, 5 insertions(+-), 5 deletions(-) [+]
line wrap: on
line diff
--- a/cfg/encoder_I_15P.cfg	Thu Apr 25 16:03:31 2013 +0530
+++ b/cfg/encoder_I_15P.cfg	Thu Apr 25 16:08:03 2013 +0530
@@ -50,7 +50,7 @@ LoopFilterTcOffset_div2       : 0       
 InternalBitDepth              : 8           # codec operating bit-depth
 
 #=========== Coding Tools =================
-SAO                           : 1           # Sample adaptive offset  (0: OFF, 1: ON)
+SAO                           : 0           # Sample adaptive offset  (0: OFF, 1: ON)
 AMP                           : 1           # Asymmetric motion partitions (0: OFF, 1: ON)
 TransformSkip                 : 1           # Transform skipping (0: OFF, 1: ON)
 TransformSkipFast             : 1           # Fast Transform skipping (0: OFF, 1: ON)
--- a/source/Lib/TLibCommon/TComPrediction.cpp	Thu Apr 25 16:03:31 2013 +0530
+++ b/source/Lib/TLibCommon/TComPrediction.cpp	Thu Apr 25 16:08:03 2013 +0530
@@ -206,7 +206,7 @@ Void TComPrediction::xPredIntraAng(Int b
     // Do the DC prediction
     if (modeDC)
     {
-        Pel dcval = predIntraGetPredValDC(pSrc, srcStride, width, height, blkAboveAvailable, blkLeftAvailable);
+        UChar dcval = (UChar) predIntraGetPredValDC(pSrc, srcStride, width, height, blkAboveAvailable, blkLeftAvailable);
 
         for (k = 0; k < blkSize; k++)
         {
@@ -279,7 +279,7 @@ Void TComPrediction::xPredIntraAng(Int b
             {
                 for (k = 0; k < blkSize; k++)
                 {
-                    pDst[k * dstStride] = Clip3(0, (1 << bitDepth) - 1, static_cast<Int> (pDst[k * dstStride]) + ((refSide[k + 1] - refSide[0]) >> 1));
+                    pDst[k * dstStride] = Clip3(0, (1 << bitDepth) - 1, static_cast<Short> (pDst[k * dstStride]) + ((refSide[k + 1] - refSide[0]) >> 1));
                 }
             }
         }
--- a/source/Lib/TLibEncoder/TEncSearch.cpp	Thu Apr 25 16:03:31 2013 +0530
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp	Thu Apr 25 16:08:03 2013 +0530
@@ -5888,7 +5888,7 @@ Void TEncSearch::xExtDIFUpSamplingH(TCom
     Int filterSize = NTAPS_LUMA;
     Int halfFilterSize = (filterSize >> 1);
 
-    srcPtr = (Short*)pattern->getROIY() - halfFilterSize * srcStride - 1;
+    srcPtr = (Pel*)pattern->getROIY() - halfFilterSize * srcStride - 1;
 
     dstPtr = m_filteredBlock[0][0].getLumaAddr();
     filterCopy(srcPtr + halfFilterSize * srcStride + 1, srcStride, dstPtr, dstStride, width, height);
@@ -6057,7 +6057,7 @@ Void TEncSearch::xExtDIFUpSamplingQ(TCom
 
         // Generate @ 3,0
         intPtr = filteredBlockTmp[0].getLumaAddr() + (halfFilterSize - 1) * intStride + 1;
-        dstPtr = (Short*)m_filteredBlock[3][0].getLumaAddr();
+        dstPtr = (Pel*)m_filteredBlock[3][0].getLumaAddr();
         if (halfPelRef.getVer() > 0)
         {
             intPtr += intStride;