Changeset 753 in 3DVCSoftware for branches/HTM-9.1-dev0-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

22 Dec 2013, 20:21:39 (10 years ago)

Author:

rwth

Message:

• finalize H_3D_DELTA_DLT implementation

File:

• branches/HTM-9.1-dev0-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)

branches/HTM-9.1-dev0-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -412 +412 @@
           if ( pcDLT->getUseDLTFlag( i ) )
           {
-            UInt uiNumDepthValues     = 0;
             Bool bDltBitMapRepFlag    = false;
             UInt uiMaxDiff            = 0xffffffff;
@@ -430 +429 @@
               bDltBitMapRepFlag = false;
             }
+            
+            UInt uiNumDepthValues = 0;
+            Int  aiIdx2DepthValue[256];
 
             // Bit map
             if ( bDltBitMapRepFlag )
             {
-              UInt uiNumDepthValues = 0;
-              Int  aiIdx2DepthValue[256]; 
-
               for (UInt d=0; d<256; d++)
               {
@@ -446 +445 @@
                 }
               }
-
-              pcDLT->setDepthLUTs(i, aiIdx2DepthValue, uiNumDepthValues);
             }
             // Diff Coding
@@ -454 +451 @@
               READ_CODE(8, uiNumDepthValues, "num_depth_values_in_dlt[i]");   // num_entry
 
+#if !H_3D_DELTA_DLT
               if ( pcDLT->getInterViewDltPredEnableFlag( i ) == false )       // Single-view DLT Diff Coding
+#endif
               {
                 // The condition if( pcVPS->getNumDepthValues(i) > 0 ) is always true since for Single-view Diff Coding, there is at least one depth value in depth component. 
-
-                Int* aiIdx2DepthValue = (Int*) calloc(uiNumDepthValues, sizeof(Int));
 
                 if (uiNumDepthValues > 1)
@@ -501 +498 @@
                 }
 
-                pcDLT->setDepthLUTs(i, aiIdx2DepthValue, uiNumDepthValues);
-
-                free(aiIdx2DepthValue);
-              }              
+              }
             }
+            
+#if H_3D_DELTA_DLT
+            if( pcDLT->getInterViewDltPredEnableFlag( i ) )
+            {
+              // interpret decoded values as delta DLT
+              AOF( pcVPS->getDepthId( 1 ) == 1 );
+              AOF( i > 1 );
+              // assumes ref layer id to be 1
+              Int* piRefDLT = pcDLT->idx2DepthValue( 1 );
+              UInt uiRefNum = pcDLT->getNumDepthValues( 1 );
+              pcDLT->setDeltaDLT(i, piRefDLT, uiRefNum, aiIdx2DepthValue, uiNumDepthValues);
+            }
+            else
+            {
+              // store final DLT
+              pcDLT->setDepthLUTs(i, aiIdx2DepthValue, uiNumDepthValues);
+            }
+#else
+            // store final DLT
+            pcDLT->setDepthLUTs(i, aiIdx2DepthValue, uiNumDepthValues);
+#endif
           }
         }