Changeset 446 in 3DVCSoftware for branches/HTM-DEV-0.2-dev/source/Lib/TLibRenderer/TRenTop.cpp

Timestamp:

26 May 2013, 16:22:23 (11 years ago)

Author:

tech

Message:

Added missing parts.

File:

• branches/HTM-DEV-0.2-dev/source/Lib/TLibRenderer/TRenTop.cpp (modified) (10 diffs)

branches/HTM-DEV-0.2-dev/source/Lib/TLibRenderer/TRenTop.cpp

@@ -32 +32 @@
  */
 
+
 #include "TRenImage.h"
 #include "TRenTop.h"
@@ -39 +40 @@
 #include <math.h>
 #include "../TLibCommon/CommonDef.h"
+#if H_3D
+
 
 Void TRenTop::xGetDataPointers( PelImage*& rpcInputImage, PelImage*& rpcOutputImage, PelImage*& rpcInputDepth, PelImage*& rpcOutputDepth, PelImage*& rpcFilled, Bool bRenderDepth )
@@ -1588 +1591 @@
 Void TRenTop::xEnhSimilarityPlane       ( PelImagePlane** apcLeftPlane, PelImagePlane** apcRightPlane, PelImagePlane* pcFilledLeftPlane, PelImagePlane* pcFilledRightPlane, UInt uiNumberOfPlanes )
 {
+  AOF( g_bitDepthC == g_bitDepthY ); 
   AOT( m_iSimEnhBaseView != 1 && m_iSimEnhBaseView != 2 );
   Int iWidth  = (*apcRightPlane)->getWidth ();
   Int iHeight = (*apcRightPlane)->getHeight();
 
-  Int* aiHistLeft  = new Int[ g_uiIBDI_MAX + 1 ];
-  Int* aiHistRight = new Int[ g_uiIBDI_MAX + 1 ];
-  Pel* aiConvLUT   = new Pel[ g_uiIBDI_MAX + 1 ];
+  Int* aiHistLeft  = new Int[ ((Int64)1 ) << g_bitDepthY ];
+  Int* aiHistRight = new Int[ ((Int64)1 ) << g_bitDepthY ];
+  Pel* aiConvLUT   = new Pel[ ((Int64)1 ) << g_bitDepthY ];
 
   for (UInt uiCurPlane = 0; uiCurPlane < uiNumberOfPlanes; uiCurPlane++ )
   {
-    for (Int iCurVal = 0 ; iCurVal <= g_uiIBDI_MAX; iCurVal++)
+    for (Int iCurVal = 0 ; iCurVal < ( 1 << g_bitDepthY ); iCurVal++)
     {
       aiHistLeft [iCurVal] = 0;
@@ -1645 +1649 @@
     Int iCheckSumRight = 0;
 
-    for (Int iCurVal = 0 ; iCurVal <= g_uiIBDI_MAX; iCurVal++)
+    for (Int iCurVal = 0 ; iCurVal < ( 1 << g_bitDepthY ); iCurVal++)
     {
       iCheckSumLeft  += aiHistLeft [iCurVal];
@@ -1652 +1656 @@
 
 
-    while( iCurChangeVal <= g_uiIBDI_MAX )
+    while( iCurChangeVal < ( 1 << g_bitDepthY ) )
     {
       if ( iCumSumBase == iCumSumChange )
       {
-        aiConvLUT[iCurChangeVal] = Min(iCurBaseVal, g_uiIBDI_MAX);
+        aiConvLUT[iCurChangeVal] = std::min( iCurBaseVal,  ( 1 << g_bitDepthY ) - 1 );
         iCurBaseVal  ++;
         iCurChangeVal++;
         iCumSumChange += aiHistChange[iCurChangeVal];
-        if (iCurBaseVal <= g_uiIBDI_MAX )
+        if (iCurBaseVal <  ( 1 << g_bitDepthY ) )
         {
           iCumSumBase   += aiHistBase  [iCurBaseVal]  ;
@@ -1668 +1672 @@
       {
         iCurBaseVal++;
-        if (iCurBaseVal <= g_uiIBDI_MAX )
+        if (iCurBaseVal < ( 1 << g_bitDepthY ) )
         {
           iCumSumBase   += aiHistBase  [iCurBaseVal]  ;
@@ -1675 +1679 @@
       else if ( iCumSumBase > iCumSumChange)
       {
-        aiConvLUT[iCurChangeVal] = Min(iCurBaseVal, g_uiIBDI_MAX);
+        aiConvLUT[iCurChangeVal] = std::min(iCurBaseVal, ( 1 << g_bitDepthY )-1);
         iCurChangeVal++;
         iCumSumChange += aiHistChange  [iCurChangeVal]  ;
@@ -1884 +1888 @@
 Void TRenTop::temporalFilterVSRS( TComPicYuv* pcPicYuvVideoCur, TComPicYuv* pcPicYuvDepthCur, TComPicYuv* pcPicYuvVideoLast, TComPicYuv* pcPicYuvDepthLast, Bool bFirstFrame )
 {
+  AOF( g_bitDepthY == g_bitDepthC ); 
   Int iSADThres  = 100 ;  //threshold of sad in 4*4 block motion detection
 
@@ -1950 +1955 @@
             { //Weight: 0.75
               Int iFilt = (( (pcDepthLastDataBlk[iCurPosX] << 1 ) + pcDepthLastDataBlk[iCurPosX] + pcDepthCurDataBlk[iCurPosX] + 2 ) >> 2 );
-              assert( (iFilt >= 0) && (iFilt <=  g_uiIBDI_MAX) );
+              assert( (iFilt >= 0) && (iFilt <  ( 1 << g_bitDepthY ) ) );
               pcDepthCurDataBlk[iCurPosX] = pcDepthLastDataBlk[iCurPosX];
               pcDepthCurDataBlk[iCurPosX] = iFilt;
@@ -2221 +2226 @@
   if(m_aiBlkMoving         != NULL ) delete[] m_aiBlkMoving;
 }
+#endif // H_3D