Changeset 1247 in 3DVCSoftware for branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder

Timestamp:

2 Jun 2015, 15:08:23 (10 years ago)

Author:

tech

Message:

Fixes:

• Windows compiler warning
• Naming DLT related syntax elements.

File:

• branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (11 diffs)

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -501 +501 @@
   TComDLT* pcDLT = pcPPS->getDLT();
 
-  READ_FLAG(uiCode, "dlt_present_flag");
+  READ_FLAG(uiCode, "dlts_present_flag");
   pcDLT->setDltPresentFlag( (uiCode == 1) ? true : false );
 
@@ -509 +509 @@
     pcDLT->setNumDepthViews( uiCode+1 );
     
-    READ_CODE(4, uiCode, "pps_bit_depth_for_depth_views_minus8");
+    READ_CODE(4, uiCode, "pps_bit_depth_for_depth_layers_minus8");
     pcDLT->setDepthViewBitDepth( (uiCode+8) );
     
@@ -526 +526 @@
         UInt uiCodeLength         = 0;
         
-        READ_FLAG(uiCode, "inter_view_dlt_pred_enable_flag[ i ]");
+        READ_FLAG(uiCode, "dlt_pred_flag[i]");
         
         if( uiCode )
@@ -536 +536 @@
         if ( pcDLT->getInterViewDltPredEnableFlag( layerId ) == false )
         {
-          READ_FLAG(uiCode, "dlt_bit_map_rep_flag[ layerId ]");
+          READ_FLAG(uiCode, "dlt_val_flags_present_flag[i]");
           bDltBitMapRepFlag = (uiCode == 1) ? true : false;
         }
@@ -552 +552 @@
           for (UInt d=0; d<256; d++)
           {
-            READ_FLAG(uiCode, "dlt_bit_map_flag[ layerId ][ j ]");
+            READ_FLAG(uiCode, "dlt_value_flag[i][j]");
             if (uiCode == 1)
             {
@@ -563 +563 @@
         else
         {
-          READ_CODE(8, uiNumDepthValues, "num_depth_values_in_dlt[i]");   // num_entry
+          READ_CODE(8, uiNumDepthValues, "num_val_delta_dlt");   // num_entry
           
           {
@@ -570 +570 @@
             if (uiNumDepthValues > 1)
             {
-              READ_CODE(8, uiCode, "max_diff[ layerId ]");
+              READ_CODE(8, uiCode, "max_diff");
               uiMaxDiff = uiCode;
             }
@@ -581 +581 @@
             {
               uiCodeLength = (UInt) gCeilLog2(uiMaxDiff + 1);
-              READ_CODE(uiCodeLength, uiCode, "min_diff_minus1[ layerId ]");
+              READ_CODE(uiCodeLength, uiCode, "min_diff_minus1");
               uiMinDiff = uiCode + 1;
             }
@@ -589 +589 @@
             }
             
-            READ_CODE(8, uiCode, "dlt_depth_value0[layerId]");   // entry0
+            READ_CODE(8, uiCode, "delta_dlt_val0");   // entry0
             aiIdx2DepthValue[0] = uiCode;
             
@@ -604 +604 @@
               for (UInt d=1; d<uiNumDepthValues; d++)
               {
-                READ_CODE(uiCodeLength, uiCode, "dlt_depth_value_diff_minus_min[ layerId ][ j ]");
+                READ_CODE(uiCodeLength, uiCode, "delta_val_diff_minus_min[k]");
                 aiIdx2DepthValue[d] = aiIdx2DepthValue[d-1] + uiMinDiff + uiCode;
               }
@@ -648 +648 @@
     {
       READ_CODE(16, uiCode, "sar_width");                             pcVUI->setSarWidth(uiCode);
-      READ_CODE(16, uiCode, "sar_height");                            pcVUI->setSarHeight(uiCode);
+      READ_CODE(16, uiCode, "sar_height");                              pcVUI->setSarHeight(uiCode);
     }
   }