Changeset 1217 in SHVCSoftware

Timestamp:

8 Jul 2015, 23:47:38 (9 years ago)

Author:

seregin

Message:

macro cleanup: R0164_CGS_LUT_BUGFIX

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (7 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -58 +58 @@
 #if CGS_3D_ASYMLUT
 #define CGS_GCC_NO_VECTORIZATION         1      ///< disable victorization to avoid issues with some compilers
-#define R0164_CGS_LUT_BUGFIX             1      ///< JCTVC-R0164: Bug fix with LUT syntax
 #define R0164_CGS_LUT_BUGFIX_CHECK       0      ///< JCTVC-R0164: Add traces explicitly/non-explicitly encoded vertices and check if 3DLUT is correctly filled
 #define R0179_ENC_OPT_3DLUT_SIZE         0      ///< JCTVC-R0179: RD decision based LUT size selection 

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -3552 +3552 @@
 #endif
   xParse3DAsymLUTOctant( pc3DAsymLUT , 0 , 0 , 0 , 0 , 1 << pc3DAsymLUT->getCurOctantDepth() );
-#if R0164_CGS_LUT_BUGFIX
 #if R0164_CGS_LUT_BUGFIX_CHECK
   printf("============= Before 'xCuboidsFilledCheck()': ================\n");
@@ -3560 +3559 @@
   pc3DAsymLUT->display();
 #endif
-#endif
 }
 
@@ -3590 +3588 @@
     for( Int l = 0 ; l < nYPartNum ; l++ )
     {
-#if R0164_CGS_LUT_BUGFIX
-      Int shift = pc3DAsymLUT->getCurOctantDepth() - nDepth ;
-#endif
+      Int shift = pc3DAsymLUT->getCurOctantDepth() - nDepth;
+
       for( Int nVertexIdx = 0 ; nVertexIdx < 4 ; nVertexIdx++ )
       {
@@ -3604 +3601 @@
           xReadParam( deltaV, nFLCbits );
         }
-#if R0164_CGS_LUT_BUGFIX
+
         pc3DAsymLUT->setCuboidVertexResTree( yIdx + (l<<shift) , uIdx , vIdx , nVertexIdx , deltaY , deltaU , deltaV );
-        for (Int m = 1; m < (1<<shift); m++) {
+
+        for( Int m = 1; m < (1<<shift); m++ )
+        {
           pc3DAsymLUT->setCuboidVertexResTree( yIdx + (l<<shift) + m , uIdx , vIdx , nVertexIdx , 0 , 0 , 0 );
 #if R0164_CGS_LUT_BUGFIX_CHECK
@@ -3612 +3611 @@
 #endif
         }
-#else
-        pc3DAsymLUT->setCuboidVertexResTree( yIdx + l , uIdx , vIdx , nVertexIdx , deltaY , deltaU , deltaV );
-#endif
       }
 #if R0164_CGS_LUT_BUGFIX_CHECK
@@ -3620 +3616 @@
 #endif
     }
-#if R0164_CGS_LUT_BUGFIX
-    for ( Int u=0 ; u<nLength ; u++ ) {
-      for ( Int v=0 ; v<nLength ; v++ ) {
-        if ( u!=0 || v!=0 ) {
-          for ( Int y=0 ; y<nLength*nYPartNum ; y++ ) {
+
+    for( Int u=0; u<nLength; u++ )
+    {
+      for( Int v=0; v<nLength; v++ )
+      {
+        if( u!=0 || v!=0 )
+        {
+          for( Int y=0 ; y<nLength*nYPartNum ; y++ )
+          {
             for( Int nVertexIdx = 0 ; nVertexIdx < 4 ; nVertexIdx++ )
             {
@@ -3636 +3636 @@
       }
     }
-#endif
   }
 }

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -2606 +2606 @@
     for( Int l = 0 ; l < nYPartNum ; l++ )
     {
-#if R0164_CGS_LUT_BUGFIX      
       Int shift = pc3DAsymLUT->getCurOctantDepth() - nDepth ;
-#endif
+
       for( Int nVertexIdx = 0 ; nVertexIdx < 4 ; nVertexIdx++ )
       {
-#if R0164_CGS_LUT_BUGFIX 
         SYUVP sRes = pc3DAsymLUT->getCuboidVertexResTree( yIdx + (l<<shift) , uIdx , vIdx , nVertexIdx );
-#else
-        SYUVP sRes = pc3DAsymLUT->getCuboidVertexResTree( yIdx + l , uIdx , vIdx , nVertexIdx );
-#endif
+
         UInt uiCodeVertex = sRes.Y != 0 || sRes.U != 0 || sRes.V != 0;
         WRITE_FLAG( uiCodeVertex , "coded_vertex_flag" );