Changeset 1207 in SHVCSoftware


Ignore:
Timestamp:
8 Jul 2015, 21:16:48 (9 years ago)
Author:
seregin
Message:

macro cleanup: POC_RESET_IDC_SIGNALLING

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

Legend:

Unmodified
Added
Removed

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

    r1203 r1207  
    126126, m_bDiscardableFlag              ( false )
    127127, m_bCrossLayerBLAFlag            ( false )
    128 #if POC_RESET_IDC_SIGNALLING
    129128, m_pocResetIdc                   ( 0 )
    130129, m_pocResetPeriodId              ( 0 )
    … …  
    135134, m_pocMsbValPresentFlag          ( false )
    136135, m_pocMsbValNeeded               ( false )
    137 #endif
    138136#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    139137, m_picOrderCntLsb (0)
    … …  
    221219  m_cabacInitFlag        = false;
    222220  m_enableTMVPFlag = true;
    223 #if POC_RESET_IDC_SIGNALLING
    224221  m_pocResetIdc                   = 0;
    225222  m_pocResetPeriodId              = 0;
    … …  
    229226  m_pocMsbValRequiredFlag         = false;
    230227  m_pocMsbValPresentFlag          = false;
    231 #endif
    232228#if POC_RESET_IDC_DECODER || POC_RESET_IDC_ENCODER
    233229  m_picOrderCntLsb = 0;

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

    r1204 r1207  
    20032003  Bool        m_bDiscardableFlag;
    20042004  Bool        m_bCrossLayerBLAFlag;
    2005 #if POC_RESET_IDC_SIGNALLING
    20062005  Int         m_pocResetIdc;
    20072006  Int         m_pocResetPeriodId;
    … …  
    20132012  Bool        m_pocMsbValNeeded;
    20142013  Int         m_pocResetDeltaPoc;
    2015 #endif
    20162014#if POC_RESET_IDC_ENCODER
    20172015  Int         m_pocValueBeforeReset;
    … …  
    23502348
    23512349  Void setILRPic(TComPic **pcIlpPic);
    2352 #if POC_RESET_IDC_SIGNALLING
     2350
    23532351  Int       getPocResetIdc       ()                              { return m_pocResetIdc;       }
    23542352  Void      setPocResetIdc       (Int b)                         { m_pocResetIdc = b;          }
    … …  
    23692367  Bool      getPocMsbValRequiredFlag ()                           { return m_pocMsbValRequiredFlag; }
    23702368  Void      setPocMsbValRequiredFlag (Bool x)                     { m_pocMsbValRequiredFlag = x; }
    2371 #endif
    23722369
    23732370  Bool      getBlaPicFlag       ();

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

    r1206 r1207  
    6969#define POC_RESET_IDC                    1      ///< JCTVC-P0041: Include poc_reset_idc and related derivation
    7070#if POC_RESET_IDC
    71 #define POC_RESET_IDC_SIGNALLING         1      ///< JCTVC-P0041: Include signalling for poc_reset related syntax elements
    7271#define POC_RESET_IDC_ENCODER            1      ///< JCTVC-P0041: Include support of enabling POC reset at the encoder
    7372#define POC_RESET_IDC_DECODER            1      ///< JCTVC-P0041: Include support of enabling POC reset at the decoder
    7473#endif
    75 #define POC_RESET_INFO_INFERENCE         1      ///< JCTVC-Q0146: Infer the value of poc_reset_info_present_flag when not present
    7674#define SCALINGLIST_INFERRING            1      ///< JCTVC-N0371: inter-layer scaling list
    7775

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

    r1204 r1207  
    18981898  }
    18991899
    1900 #if POC_RESET_IDC_SIGNALLING
     1900#if SVC_EXTENSION
    19011901  Int sliceHeaderExtensionLength = 0;
    19021902  if(pps->getSliceHeaderExtensionPresentFlag())

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

    r1203 r1207  
    13061306    }
    13071307  }
    1308 
    1309 #if !POC_RESET_IDC_SIGNALLING   // Wrong place to put slice header extension
    1310   if(pcSlice->getPPS()->getSliceHeaderExtensionPresentFlag())
    1311   {
    1312     WRITE_UVLC(0,"slice_header_extension_length");
    1313   }
    1314 #endif
    13151308}
    13161309
    … …  
    18351828
    18361829#if SVC_EXTENSION
    1837 
    1838 #if POC_RESET_IDC_SIGNALLING
    1839 Void  TEncCavlc::codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow )
     1830Void TEncCavlc::codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow )
    18401831{
    18411832  Int tmpBitsBeforeWriting = getNumberOfWrittenBits();
    … …  
    18511842    // Determine value of SH extension length.
    18521843    Int shExtnLengthInBit = 0;
    1853     if (slice->getPPS()->getPocResetInfoPresentFlag())
     1844    if( slice->getPPS()->getPocResetInfoPresentFlag() )
    18541845    {
    18551846      shExtnLengthInBit += 2;
    18561847    }
    1857     if (slice->getPocResetIdc() > 0)
     1848
     1849    if( slice->getPocResetIdc() > 0 )
    18581850    {
    18591851      shExtnLengthInBit += 6;
    18601852    }
    1861     if (slice->getPocResetIdc() == 3)
     1853
     1854    if( slice->getPocResetIdc() == 3 )
    18621855    {
    18631856      shExtnLengthInBit += (slice->getSPS()->getBitsForPOC() + 1);
    18641857    }
    18651858
    1866     if (!slice->getPocMsbValRequiredFlag() && slice->getVPS()->getVpsPocLsbAlignedFlag())
     1859    if( !slice->getPocMsbValRequiredFlag() && slice->getVPS()->getVpsPocLsbAlignedFlag() )
    18671860    {
    18681861      shExtnLengthInBit++;
    … …  
    18801873    }
    18811874
    1882     if (slice->getPocMsbNeeded())
     1875    if( slice->getPocMsbNeeded() )
    18831876    {
    18841877      slice->setPocMsbValPresentFlag(true);
    18851878    }
    18861879
    1887     if (slice->getPocMsbValPresentFlag())
     1880    if( slice->getPocMsbValPresentFlag() )
    18881881    {
    18891882      UInt lengthVal = 1;
    … …  
    18971890      shExtnLengthInBit += lengthVal;
    18981891    }
     1892
    18991893    Int shExtnAdditionalBits = 0;
    1900     if(shExtnLengthInBit % 8 != 0)
     1894
     1895    if( shExtnLengthInBit % 8 != 0 )
    19011896    {
    19021897      shExtnAdditionalBits = 8 - (shExtnLengthInBit % 8);
    19031898    }
     1899
    19041900    Int shExtnLength = (shExtnLengthInBit + shExtnAdditionalBits) / 8;
    19051901    WRITE_UVLC( shExtnLength, "slice_header_extension_length" );
    19061902
    1907     if(slice->getPPS()->getPocResetInfoPresentFlag())
     1903    if( slice->getPPS()->getPocResetInfoPresentFlag() )
    19081904    {
    19091905      WRITE_CODE( slice->getPocResetIdc(), 2,                                 "poc_reset_idc");
    19101906    }
    1911     if(slice->getPocResetIdc() > 0)
     1907    if( slice->getPocResetIdc() > 0 )
    19121908    {
    19131909      WRITE_CODE( slice->getPocResetPeriodId(), 6,                            "poc_reset_period_id");
    19141910    }
    1915     if(slice->getPocResetIdc() == 3)
     1911    if( slice->getPocResetIdc() == 3 )
    19161912    {
    19171913      WRITE_FLAG( slice->getFullPocResetFlag() ? 1 : 0,                       "full_poc_reset_flag");
    … …  
    19301926    }
    19311927
    1932     for (Int i = 0; i < shExtnAdditionalBits; i++)
     1928    for(Int i = 0; i < shExtnAdditionalBits; i++)
    19331929    {
    19341930      WRITE_FLAG( 1, "slice_segment_header_extension_data_bit");
    … …  
    19401936  // Slice header byte_alignment() included in xAttachSliceDataToNalUnit
    19411937}
    1942 #endif
    19431938
    19441939Void TEncCavlc::codeVPSExtension (TComVPS *vps)

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

    r1203 r1207  
    154154
    155155#if SVC_EXTENSION
    156 #if POC_RESET_IDC_SIGNALLING
    157156  Void  codeSliceHeaderExtn( TComSlice* slice, Int shBitsWrittenTillNow );
    158 #endif
    159157  Void codeSPSExtension        ( TComSPS* pcSPS );
    160158  Void codeVPSExtension        ( TComVPS* pcVPS );

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncEntropy.cpp

    r1029 r1207  
    747747}
    748748
    749 #if POC_RESET_IDC_SIGNALLING
    750 Void  TEncEntropy::encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )
     749#if SVC_EXTENSION
     750Void TEncEntropy::encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )
    751751{
    752752  m_pcEntropyCoderIf->codeSliceHeaderExtn( pSlice, shBitsWrittenTillNow );

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

    r1029 r1207  
    8585  virtual Void codeScalingList   ( TComScalingList* scalingList )      = 0;
    8686
    87 #if POC_RESET_IDC_SIGNALLING
    88   virtual Void codeSliceHeaderExtn     ( TComSlice* pSlice, Int shBitsWrittenTillNow )     = 0;
    89 #endif
    90 
    9187public:
    9288  virtual Void codeCUTransquantBypassFlag( TComDataCU* pcCU, UInt uiAbsPartIdx ) = 0;
    … …  
    120116  virtual Void codeTransformSkipFlags ( TComTU &rTu, ComponentID component ) = 0;
    121117#if SVC_EXTENSION
     118  virtual Void codeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )     = 0;
    122119  virtual Void codeSAOBlkParam   (SAOBlkParam& saoBlkParam, UInt* saoMaxOffsetQVal, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail, Bool onlyEstMergeInfo = false)    =0;
    123120#else
    … …  
    151148  TEncEntropyIf*      m_pcEntropyCoderIf;
    152149
    153 #if POC_RESET_IDC_SIGNALLING
    154   Void    encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow );
    155 #endif
    156150public:
    157151  Void encodeVPS               ( TComVPS* pcVPS);
    … …  
    204198  Void estimateBit             ( estBitsSbacStruct* pcEstBitsSbac, Int width, Int height, ChannelType chType );
    205199#if SVC_EXTENSION
     200  Void encodeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow );
    206201  Void encodeSAOBlkParam(SAOBlkParam& saoBlkParam, UInt* saoMaxOffsetQVal, Bool* sliceEnabled, Bool leftMergeAvail, Bool aboveMergeAvail){m_pcEntropyCoderIf->codeSAOBlkParam(saoBlkParam, saoMaxOffsetQVal, sliceEnabled, leftMergeAvail, aboveMergeAvail, false);}
    207202#else

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncGOP.cpp

    r1206 r1207  
    29492949        m_pcEntropyCoder->setEntropyCoder   ( m_pcCavlcCoder, pcSlice );
    29502950        m_pcEntropyCoder->setBitstream(&nalu.m_Bitstream);
    2951 #if POC_RESET_IDC_SIGNALLING
     2951#if SVC_EXTENSION
    29522952        tmpBitsBeforeWriting = m_pcEntropyCoder->getNumberOfWrittenBits();
    29532953        m_pcEntropyCoder->encodeTilesWPPEntryPoint( pcSlice );

  • branches/SHM-dev/source/Lib/TLibEncoder/TEncSbac.cpp

    r1203 r1207  
    20282028}
    20292029
    2030 #if POC_RESET_IDC_SIGNALLING
    2031 Void  TEncSbac::codeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )
     2030#if SVC_EXTENSION
     2031Void TEncSbac::codeSliceHeaderExtn( TComSlice* pSlice, Int shBitsWrittenTillNow )
    20322032{
    20332033  assert (0);

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

    r1029 r1207  
    106106
    107107#if SVC_EXTENSION
    108 #if POC_RESET_IDC_SIGNALLING
    109108  Void  codeSliceHeaderExtn     ( TComSlice* pSlice, Int shBitsWrittenTillNow );
    110 #endif 
    111   Void codeSAOOffsetParam(ComponentID compIdx, SAOOffset& ctbParam, Bool sliceEnabled, UInt* saoMaxOffsetQVal);
    112   Void codeSAOBlkParam(SAOBlkParam& saoBlkParam
     109  Void  codeSAOOffsetParam(ComponentID compIdx, SAOOffset& ctbParam, Bool sliceEnabled, UInt* saoMaxOffsetQVal);
     110  Void  codeSAOBlkParam(SAOBlkParam& saoBlkParam
    113111                    , UInt* saoMaxOffsetQVal
    114112                    , Bool* sliceEnabled
Note: See TracChangeset for help on using the changeset viewer.