Changeset 498 in 3DVCSoftware for branches/HTM-DEV-0.3-dev0/source/Lib/TLibDecoder

Timestamp:

26 Jun 2013, 23:47:59 (12 years ago)

Author:

tech

Message:

Further fixes and new nonctc cfg files.

Location:

branches/HTM-DEV-0.3-dev0/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (3 diffs)
• TDecSlice.cpp (modified) (1 diff)

branches/HTM-DEV-0.3-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -912 +912 @@
     for( Int sIdx = 0; sIdx < pcVPS->getNumScalabilityTypes( ) - ( pcVPS->getSplittingFlag() ? 1 : 0 ); sIdx++ )
     {
-        READ_CODE( 3, uiCode, "dimension_id_len_minus1[j]" );       pcVPS->setDimensionIdLen( sIdx, uiCode + 1 );
-    }
-        
+        READ_CODE( 3, uiCode, "dimension_id_len_minus1[j]" );       pcVPS->setDimensionIdLen( sIdx, uiCode + 1 );        
+    }
+     
+    if ( pcVPS->getSplittingFlag() )
+    {
+      pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1, pcVPS->inferLastDimsionIdLen() );       
+    }    
+
     READ_FLAG( uiCode, "vps_nuh_layer_id_present_flag" );           pcVPS->setVpsNuhLayerIdPresentFlag( uiCode == 1 ? true : false );
 
     for( Int i = 0; i <= pcVPS->getMaxLayers() - 1; i++ )
     {
-       
       if ( pcVPS->getVpsNuhLayerIdPresentFlag() && ( i > 0 ) )
       {
@@ -928 +932 @@
         pcVPS->setLayerIdInNuh( i, i );; 
       } 
-      
+
       pcVPS->setLayerIdInVps( pcVPS->getLayerIdInNuh( i ), i ); 
 
-      if ( !pcVPS->getSplittingFlag() )
-      {    
-        for( Int j = 0; j < pcVPS->getNumScalabilityTypes() ; j++ ) 
-        {
+      for( Int j = 0; j < pcVPS->getNumScalabilityTypes() ; j++ ) 
+      {
+        if ( !pcVPS->getSplittingFlag() )
+        {    
           READ_CODE( pcVPS->getDimensionIdLen( j ), uiCode, "dimension_id[i][j]" );  pcVPS->setDimensionId( i, j, uiCode );
         }
-      }
-    }
+        else
+        {
+          pcVPS->setDimensionId( i, j, pcVPS->inferDimensionId( i, j)  );
+        }
+      }
+    }
+    
 
     for( Int i = 1; i <= pcVPS->getMaxLayers() - 1; i++ )
@@ -979 +988 @@
     {
       READ_CODE( 10, uiCode, "num_add_output_layer_sets_minus1"      ); pcVPS->setNumAddOutputLayerSetsMinus1( uiCode );
-      numOutputLayerSets += pcVPS->getNumAddOutputLayerSetsMinus1( ); 
+      numOutputLayerSets += ( pcVPS->getNumAddOutputLayerSetsMinus1( ) + 1); 
     }
 

branches/HTM-DEV-0.3-dev0/source/Lib/TLibDecoder/TDecSlice.cpp

@@ -123 +123 @@
   DTRACE_CABAC_T( "\tPOC: " );
   DTRACE_CABAC_V( rpcPic->getPOC() );
+#if H_MV
+  DTRACE_CABAC_T( "\tLayer: " );
+  DTRACE_CABAC_V( rpcPic->getLayerId()  );
+#endif
+
   DTRACE_CABAC_T( "\n" );