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

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/TLibEncoder

Files:

• TEncCavlc.cpp (modified) (5 diffs)
• TEncCfg.h (modified) (1 diff)
• TEncSlice.cpp (modified) (1 diff)

branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -663 +663 @@
     // Operation point set
     for( UInt i = 0; i <= pcVPS->getVpsMaxLayerId(); i ++ )
+    {
 #else
   assert( pcVPS->getMaxNuhReservedZeroLayerId() < MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 );
@@ -673 +674 @@
     // Operation point set
     for( UInt i = 0; i <= pcVPS->getMaxNuhReservedZeroLayerId(); i ++ )
-#endif
     {
       // Only applicable for version 1
       pcVPS->setLayerIdIncludedFlag( true, opsIdx, i );
+#endif
       WRITE_FLAG( pcVPS->getLayerIdIncludedFlag( opsIdx, i ) ? 1 : 0, "layer_id_included_flag[opsIdx][i]" );
     }
@@ -731 +732 @@
     WRITE_CODE( pcVPS->getDimensionIdLen( sIdx ) - 1 , 3,    "dimension_id_len_minus1[j]");    
   }
+
+  if ( pcVPS->getSplittingFlag() )
+  { // Ignore old dimension id length
+    pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1 ,pcVPS->inferLastDimsionIdLen() );       
+  }    
+
 
   WRITE_FLAG( pcVPS->getVpsNuhLayerIdPresentFlag() ? 1 : 0,  "vps_nuh_layer_id_present_flag");
@@ -746 +753 @@
 
     assert(  pcVPS->getLayerIdInVps( 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() )
+      {    
         WRITE_CODE( pcVPS->getDimensionId( i, j ), pcVPS->getDimensionIdLen( j ), "dimension_id[i][j]");      
+      }
+      else
+      {
+        assert( pcVPS->getDimensionId( i, j ) ==  pcVPS->inferDimensionId( i, j )  );
       }
     }
@@ -789 +800 @@
   {
     WRITE_CODE( pcVPS->getNumAddOutputLayerSetsMinus1( )    , 10,    "num_add_output_layer_sets_minus1"      );
-    numOutputLayerSets += pcVPS->getNumAddOutputLayerSetsMinus1( ); 
+    numOutputLayerSets += ( pcVPS->getNumAddOutputLayerSetsMinus1( ) + 1 ); 
   }
 

branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder/TEncCfg.h

@@ -409 +409 @@
   , m_viewIndex(-1)
   , m_isDepth(false)
+  , m_bUseVSO(false)
 #endif
 #endif

branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder/TEncSlice.cpp

@@ -1301 +1301 @@
   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" );
 #if ENC_DEC_TRACE