Changeset 769 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibCommon


Ignore:
Timestamp:
13 Jan 2014, 08:05:57 (11 years ago)
Author:
tech
Message:

Further fixes.

Location:
branches/HTM-9.2-dev0/source/Lib/TLibCommon
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HTM-9.2-dev0/source/Lib/TLibCommon/TComSlice.cpp

    r768 r769  
    110110#endif
    111111, m_pocResetFlag                  (false)
     112#if H_MV
    112113, m_crossLayerBlaFlag             (false)
     114#endif
    113115, m_discardableFlag               (false)
    114116, m_interLayerPredEnabledFlag     (false)
    … …  
    16991701, m_hrdOpSetIdx               (NULL)
    17001702, m_cprmsPresentFlag          (NULL)
     1703#if H_MV
    17011704, m_dpbSize                   (NULL)
    1702 #if H_MV
    17031705, m_vpsVUI                 (  NULL )
    17041706#endif
    … …  
    17871789    m_ivMvScalingFlag = true;
    17881790#endif
    1789 #endif
    17901791
    17911792    for( Int j = 0; j < MAX_NUM_LAYERS; j++ )
    … …  
    18081809  m_vpsVUI = new TComVPSVUI;
    18091810  m_dpbSize = new TComDpbSize;
    1810 #
     1811
    18111812#if H_3D
    18121813  for( Int i = 0; i < MAX_NUM_LAYERS; i++ )
    … …  
    18311832#endif
    18321833  } 
     1834#endif
    18331835#endif
    18341836}
    … …  
    22112213  ::memset(m_ltRefPicPocLsbSps, 0, sizeof(m_ltRefPicPocLsbSps));
    22122214  ::memset(m_usedByCurrPicLtSPSFlag, 0, sizeof(m_usedByCurrPicLtSPSFlag));
     2215#if H_MV
    22132216  m_spsExtensionFlag = false;
    22142217  for( Int i = 0; i < PS_EX_T_MAX_NUM; i++ )
    … …  
    22302233    m_scaledRefLayerBottomOffset   [i] = 0;
    22312234  }
     2235#endif
    22322236}
    22332237
    … …  
    37743778}
    37753779#endif
    3776 

  • branches/HTM-9.2-dev0/source/Lib/TLibCommon/TComSlice.h

    r768 r769  
    5353#if H_MV
    5454class TComPicLists;
     55class TComVPS;
    5556#endif
    5657// ====================================================================================================================
    … …  
    6263// ====================================================================================================================
    6364
    64 class TComVPS;
    6565/// Reference Picture Set class
    6666class TComReferencePictureSet
    … …  
    829829  UInt    getMaxTLayers  ()                   { return m_uiMaxTLayers;   }
    830830  Void    setMaxTLayers  (UInt t)             { m_uiMaxTLayers = t; }
     831
     832#if H_MV   
    831833  UInt    getMaxSubLayersMinus1()             { return m_uiMaxTLayers - 1;  }  // For consistency with draft spec
    832 #if H_MV   
    833834  UInt    getMaxLayersMinus1()                { return m_uiMaxLayersMinus1;  };
    834835  Void    setMaxLayersMinus1(UInt l)          { m_uiMaxLayersMinus1 = l; }
    … …  
    989990
    990991  TComVPSVUI* getVPSVUI(  )                                                { return m_vpsVUI;  }
    991   // VPS EXTENSION SEMANTICS VARIABLES
     992 
     993 // VPS EXTENSION SEMANTICS VARIABLES
    992994  Void    setLayerIdInVps( Int layerIdInNuh, Int val )                     { m_layerIdInVps[layerIdInNuh] = val;  }
    993995  Int     getLayerIdInVps( Int layerIdInNuh )                              { assert( m_layerIdInVps[layerIdInNuh] >= 0 ); return m_layerIdInVps[layerIdInNuh]; }
    … …  
    23692371  Bool getPocResetFlag(  ) { return m_pocResetFlag; }
    23702372
    2371 Void setDiscardableFlag( Bool flag ) { m_discardableFlag = flag; }
    2372 Bool getDiscardableFlag(  ) { return m_discardableFlag; }
    2373 
    2374 Void setInterLayerPredEnabledFlag( Bool flag ) { m_interLayerPredEnabledFlag = flag; }
    2375 Bool getInterLayerPredEnabledFlag(  ) { return m_interLayerPredEnabledFlag; }
    2376 
    2377 Void setNumInterLayerRefPicsMinus1( Int  val ) { m_numInterLayerRefPicsMinus1 = val; }
    2378 Int  getNumInterLayerRefPicsMinus1(  ) { return m_numInterLayerRefPicsMinus1; }
    2379 
    2380 Void setInterLayerPredLayerIdc( Int i, Int  val ) { m_interLayerPredLayerIdc[i] = val; }
    2381 Int  getInterLayerPredLayerIdc( Int i ) { return m_interLayerPredLayerIdc[i]; }
     2373  Void setDiscardableFlag( Bool flag ) { m_discardableFlag = flag; }
     2374  Bool getDiscardableFlag(  ) { return m_discardableFlag; }
     2375
     2376  Void setInterLayerPredEnabledFlag( Bool flag ) { m_interLayerPredEnabledFlag = flag; }
     2377  Bool getInterLayerPredEnabledFlag(  ) { return m_interLayerPredEnabledFlag; }
     2378
     2379  Void setNumInterLayerRefPicsMinus1( Int  val ) { m_numInterLayerRefPicsMinus1 = val; }
     2380  Int  getNumInterLayerRefPicsMinus1(  ) { return m_numInterLayerRefPicsMinus1; }
     2381
     2382  Void setInterLayerPredLayerIdc( Int i, Int  val ) { m_interLayerPredLayerIdc[i] = val; }
     2383  Int  getInterLayerPredLayerIdc( Int i ) { return m_interLayerPredLayerIdc[i]; }
    23822384
    23832385  // Additional variables derived in slice header semantics

  • branches/HTM-9.2-dev0/source/Lib/TLibCommon/TypeDef.h

    r768 r769  
    5555
    5656#ifndef HEVC_EXT
    57 #define HEVC_EXT                    0
     57#define HEVC_EXT                    2
    5858#endif
    5959
    … …  
    233233
    234234#if H_3D_DIM_DLT
    235 #define Log2( n ) ( log((double)n) / log(2.0) ) // Ed.(GT): This is very very bad and should be fixed to used integer arithmetics ( see gCeilLog2 ) moreover it should not be defined in the tool macro section!
    236235#define H_3D_DELTA_DLT                    1
    237236#endif
    … …  
    279278// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    280279// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    281 
     280// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
     281// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
     282// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
     283// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
     284// !!! PLEASE PUT MACROS RELATED TO HTM-10.0 INTEGRATIONS HERE !!!
    282285
    283286/////////////////////////////////////////////////////////////////////////////////////////
    … …  
    329332#define MAX_NUM_BITSTREAM_PARTITIONS    100 ///< Maximum value is actually not specified
    330333#define MAX_NUM_BSP_SCHED_COMBINATION   100 ///< Maximum value is actually not specified
     334#else
     335#define MAX_NUM_LAYER_IDS                64
    331336#endif
    332337
    … …  
    845850  };
    846851
    847 
    848 #endif
    849 #endif
     852#define Log2( n ) ( log((double)n) / log(2.0) ) // Ed.(GT): This is very very bad and should be fixed to used integer arithmetics ( see gCeilLog2 ) moreover it should not be defined in the tool macro section!
     853#endif
     854#endif
Note: See TracChangeset for help on using the changeset viewer.