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


Ignore:
Timestamp:
27 Jun 2013, 12:58:02 (11 years ago)
Author:
tech
Message:

Further fixes.

Location:
branches/HTM-DEV-0.3-dev0/source
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncCfg.cpp

    r495 r500  
    13131313#endif
    13141314
    1315   xConfirmPara(  m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. "   );
    1316 
    1317   for( Int dim = 0; dim < m_dimIds.size(); dim++ )
    1318   {
    1319     xConfirmPara( m_dimIds[dim].size() < m_numberOfLayers,  "DimensionId must be given for all layers and all dimensions. ");   
    1320     xConfirmPara( ( dim != viewDimPosition ) &&  (m_dimIds[dim][0] != 0), "DimensionId of layer 0 must be 0. " );
    1321     xConfirmPara( m_dimensionIdLen[dim] < 1 || m_dimensionIdLen[dim] > 8, "DimensionIdLen must be greater than 0 and less than 9 in all dimensions. " );
     1315  xConfirmPara(  m_dimensionIdLen.size() < m_dimIds.size(), "DimensionIdLen must be given for all dimensions. "   );   Int dimBitOffset[MAX_NUM_SCALABILITY_TYPES+1];
     1316
     1317  dimBitOffset[ 0 ] = 0;
     1318  for (Int j = 1; j <= ((Int) m_dimIds.size() - m_splittingFlag ? 1 : 0); j++ )
     1319  {
     1320    dimBitOffset[ j ] = dimBitOffset[ j - 1 ] + m_dimensionIdLen[ j - 1];
     1321  }
     1322
     1323  if ( m_splittingFlag )
     1324  {
     1325    dimBitOffset[ (Int) m_dimIds.size() ] = 6;
     1326  }
     1327 
     1328  for( Int j = 0; j < m_dimIds.size(); j++ )
     1329  {   
     1330    xConfirmPara( m_dimIds[j].size() < m_numberOfLayers,  "DimensionId must be given for all layers and all dimensions. ");   
     1331    xConfirmPara( ( j != viewDimPosition ) &&  (m_dimIds[j][0] != 0), "DimensionId of layer 0 must be 0. " );
     1332    xConfirmPara( m_dimensionIdLen[j] < 1 || m_dimensionIdLen[j] > 8, "DimensionIdLen must be greater than 0 and less than 9 in all dimensions. " );
     1333     
     1334
    13221335    for( Int i = 1; i < m_numberOfLayers; i++ )
    13231336    {     
    1324       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. " );
     1337      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. " );
     1338      if ( m_splittingFlag )
     1339      {
     1340        Int layerIdInNuh = (m_layerIdInNuh.size()!=1) ? m_layerIdInNuh[i] :  i;
     1341        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. ");
     1342      }
    13251343    }
    13261344  }
  • branches/HTM-DEV-0.3-dev0/source/App/TAppEncoder/TAppEncTop.cpp

    r498 r500  
    10721072}
    10731073
    1074 
    10751074Void TAppEncTop::xSetProfileTierLevel( TComVPS& vps )
    10761075{
  • branches/HTM-DEV-0.3-dev0/source/Lib/TAppCommon/program_options_lite.cpp

    r491 r500  
    167167        if  ( (*it)->opt->opt_duplicate ) continue;
    168168#endif
    169 
    170169        ostringstream line(ios_base::out);
    171170        line << "  ";
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TComRom.h

    r498 r500  
    162162
    163163#ifndef ENC_DEC_TRACE
    164 # define ENC_DEC_TRACE 1
     164# define ENC_DEC_TRACE 0
    165165#endif
    166166
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TComSlice.cpp

    r498 r500  
    516516  TComPic*  rpsCurrList0[MAX_NUM_REF+1];
    517517  TComPic*  rpsCurrList1[MAX_NUM_REF+1];
    518 
    519518#if H_MV 
    520519  Int numPocTotalCurr = ( getInterRefEnabledInRPLFlag() ? ( NumPocStCurr0 + NumPocStCurr1 + NumPocLtCurr ) : 0 ) + getNumActiveRefLayerPics( );
     
    17731772}
    17741773
    1775 Int TComVPS::inferLastDimsionIdLen()
     1774Int TComVPS::inferLastDimsionIdLenMinus1()
    17761775{
    17771776  return ( 5 - xGetDimBitOffset( getNumScalabilityTypes() - 1 ) );
     
    24282427  }
    24292428}
    2430 
    24312429Int TComSlice::xCeilLog2( Int val )
    24322430{
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TComSlice.h

    r498 r500  
    494494  UInt*       m_hrdOpSetIdx;
    495495  Bool*       m_cprmsPresentFlag;
    496  
    497 #if H_MV
     496  #if H_MV
    498497  UInt        m_vpsNumLayerSetsMinus1;
    499498  Bool        m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_LAYER_ID_PLUS1];
     
    514513  TimingInfo  m_timingInfo;
    515514#endif
    516 
    517 
    518 
    519 
    520515
    521516#if H_MV
     
    620615  Void    setMaxOpSets(UInt v)                                  { m_numOpSets = v;    }
    621616#endif
    622 
    623617  Bool    getLayerIdIncludedFlag(UInt opsIdx, UInt id)          { return m_layerIdIncludedFlag[opsIdx][id]; }
    624618  Void    setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id)  { m_layerIdIncludedFlag[opsIdx][id] = v;    }
     
    736730  // inference
    737731  Int     inferDimensionId     ( Int i, Int j );
    738   Int     inferLastDimsionIdLen();
     732  Int     inferLastDimsionIdLenMinus1();
    739733
    740734#if H_3D 
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibCommon/TypeDef.h

    r496 r500  
    5757
    5858#ifndef HEVC_EXT
    59 #define HEVC_EXT                    2
     59#define HEVC_EXT                    0
    6060#endif
    6161
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r498 r500  
    917917    if ( pcVPS->getSplittingFlag() )
    918918    {
    919       pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1, pcVPS->inferLastDimsionIdLen() );       
     919      pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1, pcVPS->inferLastDimsionIdLenMinus1() );       
    920920    }   
    921921
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibDecoder/TDecSlice.cpp

    r498 r500  
    127127  DTRACE_CABAC_V( rpcPic->getLayerId()  );
    128128#endif
    129 
    130129  DTRACE_CABAC_T( "\n" );
    131130
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibDecoder/TDecTop.cpp

    r491 r500  
    7676  delete [] m_aaiCodedScale;
    7777  delete [] m_aiViewId; 
     78  delete [] m_aiLayerIdx;
    7879  delete [] m_bViewReceived;
    7980
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder/TEncCavlc.cpp

    r498 r500  
    735735  if ( pcVPS->getSplittingFlag() )
    736736  { // Ignore old dimension id length
    737     pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1 ,pcVPS->inferLastDimsionIdLen() );       
     737    pcVPS->setDimensionIdLen( pcVPS->getNumScalabilityTypes( ) - 1 ,pcVPS->inferLastDimsionIdLenMinus1() + 1 );       
    738738  }   
    739739
     
    12041204      {
    12051205#endif
    1206 
    12071206      if ( pcSlice->getSliceType() == B_SLICE )
    12081207      {
  • branches/HTM-DEV-0.3-dev0/source/Lib/TLibEncoder/TEncGOP.cpp

    r497 r500  
    655655    refPicListModification->setRefPicListModificationFlagL1(0);
    656656#if H_MV
    657 
    658657    if ( pcSlice->getPPS()->getNumExtraSliceHeaderBits() > 0 )
    659658    {
Note: See TracChangeset for help on using the changeset viewer.