Changeset 1439 in SHVCSoftware for branches/SHM-dev/source/Lib


Ignore:
Timestamp:
12 Aug 2015, 20:03:56 (10 years ago)
Author:
seregin
Message:

.update Xcode workspace
.fix vps_num_video_signal_info_minus1 inference

Patch-by: Karsten Suehring

Location:
branches/SHM-dev/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1431 r1439  
    30243024Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType ) const
    30253025{
    3026   assert( scalType >= 0 && scalType <= MAX_VPS_NUM_SCALABILITY_TYPES );
    3027   assert( scalType == MAX_VPS_NUM_SCALABILITY_TYPES || getScalabilityMask( scalType ) );
     3026  assert( (Int)scalType >= 0 && (Int)scalType <= MAX_VPS_NUM_SCALABILITY_TYPES );
     3027  assert( (Int)scalType == MAX_VPS_NUM_SCALABILITY_TYPES || getScalabilityMask( scalType ) );
    30283028  Int scalIdx = 0;
    30293029  for( Int curScalType = 0; curScalType < scalType; curScalType++ )

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

    r1400 r1439  
    717717  UInt                  m_treePartitionLayerIdList[MAX_LAYERS][MAX_LAYERS];
    718718
    719   Int                   m_TolsIdx;
    720719  Bool                  m_subLayerFlagInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1];
    721720  Bool                  m_subLayerDpbInfoPresentFlag  [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r1433 r1439  
    34113411  else
    34123412  {
    3413     vps->setNumVideoSignalInfo(vps->getMaxLayers() - vps->getBaseLayerInternalFlag() ? 0 : 1);
     3413    vps->setNumVideoSignalInfo(vps->getMaxLayers() - (vps->getBaseLayerInternalFlag() ? 0 : 1));
    34143414  }
    34153415

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecSlice.h

    r1287 r1439  
    6969  TDecSbac        m_entropyCodingSyncContextState;      ///< context storate for state of contexts at the wavefront/WPP/entropy-coding-sync second CTU of tile-row
    7070
    71 #if SVC_EXTENSION
    72   UInt*           m_saoMaxOffsetQVal;
    73 #endif
    74 
    7571public:
    7672  TDecSlice();

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncTop.h

    r1348 r1439  
    143143  Bool                    m_pocDecrementedInDPBFlag;
    144144  Int                     m_currPocMsb;
    145   Bool                    m_prevPicHasEos;
    146145#endif //SVC_EXTENSION
    147146protected:
Note: See TracChangeset for help on using the changeset viewer.