Changeset 500 in 3DVCSoftware for branches/HTM-DEV-0.3-dev0/source

Timestamp:

27 Jun 2013, 12:58:02 (12 years ago)

Author:

tech

Message:

Further fixes.

Location:

branches/HTM-DEV-0.3-dev0/source

Files:

• App/TAppEncoder/TAppEncCfg.cpp (modified) (1 diff)
• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TAppCommon/program_options_lite.cpp (modified) (1 diff)
• Lib/TLibCommon/TComRom.h (modified) (1 diff)
• Lib/TLibCommon/TComSlice.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (4 diffs)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecSlice.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)
• Lib/TLibEncoder/TEncGOP.cpp (modified) (1 diff)

branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -1313 +1313 @@
 #endif
 
-  xConfirmPara(  m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. "   ); 
-
-  for( Int dim = 0; dim < m_dimIds.size(); dim++ )
-  {
-    xConfirmPara( m_dimIds[dim].size() < m_numberOfLayers,  "DimensionId must be given for all layers and all dimensions. ");   
-    xConfirmPara( ( dim != viewDimPosition ) &&  (m_dimIds[dim][0] != 0), "DimensionId of layer 0 must be 0. " );
-    xConfirmPara( m_dimensionIdLen[dim] < 1 || m_dimensionIdLen[dim] > 8, "DimensionIdLen must be greater than 0 and less than 9 in all dimensions. " ); 
+  xConfirmPara(  m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. "   );   Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1]; 
+
+  dimBitOffset[ 0 ] = 0; 
+  for (Int j = 1; j <= ((Int) m_dimIds.size() - m_splittingFlag ? 1 : 0); j++ )
+  {
+    dimBitOffset[ j ] = dimBitOffset[ j - 1 ] + m_dimensionIdLen[ j - 1]; 
+  }
+
+  if ( m_splittingFlag )
+  {
+    dimBitOffset[ (Int) m_dimIds.size() ] = 6; 
+  }
+  
+  for( Int j = 0; j < m_dimIds.size(); j++ )
+  {    
+    xConfirmPara( m_dimIds[j].size() < m_numberOfLayers,  "DimensionId must be given for all layers and all dimensions. ");   
+    xConfirmPara( ( j != viewDimPosition ) &&  (m_dimIds[j][0] != 0), "DimensionId of layer 0 must be 0. " );
+    xConfirmPara( m_dimensionIdLen[j] < 1 || m_dimensionIdLen[j] > 8, "DimensionIdLen must be greater than 0 and less than 9 in all dimensions. " ); 
+     
+
     for( Int i = 1; i < m_numberOfLayers; i++ )
     {     
-      xConfirmPara(  ( m_dimIds[dim][i] < 0 ) || ( m_dimIds[dim][i] > ( ( 1 << m_dimensionIdLen[dim] ) - 1 ) )   , "DimensionId shall be in the range of 0 to 2^DimensionIdLen - 1. " );
+      xConfirmPara(  ( m_dimIds[j][i] < 0 ) || ( m_dimIds[j][i] > ( ( 1 << m_dimensionIdLen[j] ) - 1 ) )   , "DimensionId shall be in the range of 0 to 2^DimensionIdLen - 1. " );
+      if ( m_splittingFlag )
+      {
+        Int layerIdInNuh = (m_layerIdInNuh.size()!=1) ? m_layerIdInNuh[i] :  i; 
+        xConfirmPara( ( ( layerIdInNuh & ( (1 << dimBitOffset[ j + 1 ] ) - 1) ) >> dimBitOffset[ j ] )  != m_dimIds[j][ i ]  , "When Splitting Flag is equal to 1 dimension ids shall match values derived from layer ids. "); 
+      }
     }
   }

branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1072 +1072 @@
 }
 
-
 Void TAppEncTop::xSetProfileTierLevel( TComVPS& vps )
 { 

branches/HTM-DEV-0.3-dev0/source/Lib/TAppCommon/program_options_lite.cpp

@@ -167 +167 @@
         if  ( (*it)->opt->opt_duplicate ) continue; 
 #endif
-
         ostringstream line(ios_base::out);
         line << "  ";

branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TComRom.h

@@ -162 +162 @@
 
 #ifndef ENC_DEC_TRACE
-# define ENC_DEC_TRACE 1
+# define ENC_DEC_TRACE 0
 #endif
 

branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -516 +516 @@
   TComPic*  rpsCurrList0[MAX_NUM_REF+1];
   TComPic*  rpsCurrList1[MAX_NUM_REF+1];
-
 #if H_MV  
   Int numPocTotalCurr = ( getInterRefEnabledInRPLFlag() ? ( NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr ) : 0 ) + getNumActiveRefLayerPics( );
@@ -1773 +1772 @@
 }
 
-Int TComVPS::inferLastDimsionIdLen()
+Int TComVPS::inferLastDimsionIdLenMinus1()
 {
   return ( 5 - xGetDimBitOffset( getNumScalabilityTypes() - 1 ) ); 
@@ -2428 +2427 @@
   }
 }
-
 Int TComSlice::xCeilLog2( Int val )
 {

branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TComSlice.h

@@ -494 +494 @@
   UInt*       m_hrdOpSetIdx;
   Bool*       m_cprmsPresentFlag;
-  
-#if H_MV
+  #if H_MV
   UInt        m_vpsNumLayerSetsMinus1;
   Bool        m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_LAYER_ID_PLUS1];
@@ -514 +513 @@
   TimingInfo  m_timingInfo;
 #endif
-
-
-
-
 
 #if H_MV
@@ -620 +615 @@
   Void    setMaxOpSets(UInt v)                                  { m_numOpSets = v;    }
 #endif
-
   Bool    getLayerIdIncludedFlag(UInt opsIdx, UInt id)          { return m_layerIdIncludedFlag[opsIdx][id]; }
   Void    setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id)  { m_layerIdIncludedFlag[opsIdx][id] = v;    }
@@ -736 +730 @@
   // inference
   Int     inferDimensionId     ( Int i, Int j );
-  Int     inferLastDimsionIdLen();
+  Int     inferLastDimsionIdLenMinus1();
 
 #if H_3D  

branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TypeDef.h

@@ -57 +57 @@
 
 #ifndef HEVC_EXT
-#define HEVC_EXT                    2
+#define HEVC_EXT                    0
 #endif
 

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

@@ -917 +917 @@
     if ( pcVPS->getSplittingFlag() )
     {
-      pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1, pcVPS->inferLastDimsionIdLen() );       
+      pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1, pcVPS->inferLastDimsionIdLenMinus1() );       
     }    
 

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

@@ -127 +127 @@
   DTRACE_CABAC_V( rpcPic->getLayerId()  );
 #endif
-
   DTRACE_CABAC_T( "\n" );
 

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

@@ -76 +76 @@
   delete [] m_aaiCodedScale;
   delete [] m_aiViewId;  
+  delete [] m_aiLayerIdx; 
   delete [] m_bViewReceived;
 

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

@@ -735 +735 @@
   if ( pcVPS->getSplittingFlag() )
   { // Ignore old dimension id length
-    pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1 ,pcVPS->inferLastDimsionIdLen() );       
+    pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1 ,pcVPS->inferLastDimsionIdLenMinus1() + 1 );       
   }    
 
@@ -1204 +1204 @@
       {
 #endif
-
       if ( pcSlice->getSliceType() == B_SLICE )
       {

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

@@ -655 +655 @@
     refPicListModification->setRefPicListModificationFlagL1(0);
 #if H_MV
-
     if ( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > 0 )
     {