Changeset 528 in SHVCSoftware for branches/SHM-4.1-dev/source/Lib/TLibCommon


Ignore:
Timestamp:
24 Dec 2013, 18:24:19 (11 years ago)
Author:
seregin
Message:

N0371: Scaling list inferring with macro SCALINGLIST_INFERRING

Location:
branches/SHM-4.1-dev/source/Lib/TLibCommon
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r525 r528  
    23742374#endif
    23752375#endif
     2376#if SCALINGLIST_INFERRING
     2377, m_inferScalingListFlag ( false )
     2378, m_scalingListRefLayerId ( 0 )
     2379#endif
    23762380#endif //SVC_EXTENSION
    23772381{
    … …  
    23972401TComSPS::~TComSPS()
    23982402{
     2403#if SCALINGLIST_INFERRING
     2404  if( !m_inferScalingListFlag )
     2405#endif
    23992406  delete m_scalingList;
    24002407  m_RPSList.destroy();
    … …  
    25742581, m_listsModificationPresentFlag(  0)
    25752582, m_numExtraSliceHeaderBits(0)
     2583#if SCALINGLIST_INFERRING
     2584, m_inferScalingListFlag ( false )
     2585, m_scalingListRefLayerId ( 0 )
     2586#endif
    25762587{
    25772588  m_scalingList = new TComScalingList;
    … …  
    25902601    m_puiRowHeight = NULL;
    25912602  }
     2603
     2604#if SCALINGLIST_INFERRING
     2605  if( !m_inferScalingListFlag )
     2606#endif
    25922607  delete m_scalingList;
    25932608}

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

    r525 r528  
    13161316  UInt m_updateRepFormatIndex;
    13171317#endif
     1318#endif
     1319#if SCALINGLIST_INFERRING
     1320  Bool       m_inferScalingListFlag;
     1321  UInt       m_scalingListRefLayerId;
    13181322#endif
    13191323#endif //SVC_EXTENSION
    … …  
    14491453#endif
    14501454
     1455#if SCALINGLIST_INFERRING
     1456  Void setScalingList( TComScalingList *scalingList ) { m_scalingList = scalingList; }
     1457#else
    14511458  Void setScalingList      ( TComScalingList *scalingList);
     1459#endif
    14521460  TComScalingList* getScalingList ()       { return m_scalingList; }               //!< get ScalingList class pointer in SPS
    14531461
    … …  
    15081516  Void     setUpdateRepFormatIndex(UInt index)  { m_updateRepFormatIndex = index; }
    15091517#endif
     1518#endif
     1519#if SCALINGLIST_INFERRING
     1520  Bool     getInferScalingListFlag()  { return m_inferScalingListFlag;  }
     1521  UInt     getScalingListRefLayerId() { return m_scalingListRefLayerId; }
     1522  Void     setInferScalingListFlag( Bool flag )     { m_inferScalingListFlag = flag;     }
     1523  Void     setScalingListRefLayerId( UInt layerId ) { m_scalingListRefLayerId = layerId; }
    15101524#endif
    15111525#endif //SVC_EXTENSION
    … …  
    16091623  UInt m_log2ParallelMergeLevelMinus2;
    16101624  Int m_numExtraSliceHeaderBits;
     1625
     1626#if SCALINGLIST_INFERRING
     1627  Bool     m_inferScalingListFlag;
     1628  UInt     m_scalingListRefLayerId;
     1629#endif
    16111630
    16121631public:
    … …  
    17201739  Void     setScalingListPresentFlag( Bool b ) { m_scalingListPresentFlag  = b;       }
    17211740
     1741#if SCALINGLIST_INFERRING
     1742  UInt     getLayerId() { return m_layerId; }
     1743  Void     setLayerId( UInt layerId ) { m_layerId = layerId;            }
     1744  Bool     getInferScalingListFlag()  { return m_inferScalingListFlag;  }
     1745  UInt     getScalingListRefLayerId() { return m_scalingListRefLayerId; }
     1746  Void     setInferScalingListFlag( Bool flag )     { m_inferScalingListFlag = flag;     }
     1747  Void     setScalingListRefLayerId( UInt layerId ) { m_scalingListRefLayerId = layerId; }
     1748#endif
    17221749#if IL_SL_SIGNALLING_N0371
    17231750  Void     setLayerId(UInt layerId) { m_layerId = layerId; }
    … …  
    17331760#endif
    17341761
     1762#if SCALINGLIST_INFERRING
     1763  Void     setScalingList( TComScalingList *scalingList ) { m_scalingList = scalingList; }
     1764#else
    17351765  Void     setScalingList      ( TComScalingList *scalingList);
     1766#endif
    17361767  TComScalingList* getScalingList ()          { return m_scalingList; }         //!< get ScalingList class pointer in PPS
    17371768  Bool getListsModificationPresentFlag ()          { return m_listsModificationPresentFlag; }

  • branches/SHM-4.1-dev/source/Lib/TLibCommon/TypeDef.h

    r526 r528  
    6464
    6565#define IL_SL_SIGNALLING_N0371           0      ///< JCTVC-N0371: inter-layer scaling list
     66#define SCALINGLIST_INFERRING            1      ///< JCTVC-N0371: inter-layer scaling list
    6667#define M0463_VUI_EXT_ILP_REF            0      ///< JCTVC-M0463: VUI extension inter-layer dependency offset signalling
    6768#define SPS_EXTENSION                    1      ///< Define sps_extension() syntax structure
Note: See TracChangeset for help on using the changeset viewer.