Ticket #888: pic_struct_present.patch

File pic_struct_present.patch, 6.9 KB (added by bheng, 10 years ago)
  • source/App/TAppEncoder/TAppEncCfg.cpp

     
    451451  ("ChromaSampleLocTypeTopField",    m_chromaSampleLocTypeTopField,            0, "Specifies the location of chroma samples for top field")
    452452  ("ChromaSampleLocTypeBottomField", m_chromaSampleLocTypeBottomField,         0, "Specifies the location of chroma samples for bottom field")
    453453  ("NeutralChromaIndication",        m_neutralChromaIndicationFlag,        false, "Indicates that the value of all decoded chroma samples is equal to 1<<(BitDepthCr-1)")
     454#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
     455  ("PicStructPresentFlag",           m_picStructPresentFlag,               false, "Indicates that pic_struct values are present in picture timing SEI messages")
     456#endif
    454457  ("BitstreamRestriction",           m_bitstreamRestrictionFlag,           false, "Signals whether bitstream restriction parameters are present")
    455458  ("TilesFixedStructure",            m_tilesFixedStructureFlag,            false, "Indicates that each active picture parameter set has the same values of the syntax elements related to tiles")
    456459  ("MotionVectorsOverPicBoundaries", m_motionVectorsOverPicBoundariesFlag, false, "Indicates that no samples outside the picture boundaries are used for inter prediction")
  • source/App/TAppEncoder/TAppEncCfg.h

     
    253253  Int       m_chromaSampleLocTypeTopField;                    ///< Specifies the location of chroma samples for top field
    254254  Int       m_chromaSampleLocTypeBottomField;                 ///< Specifies the location of chroma samples for bottom field
    255255  Bool      m_neutralChromaIndicationFlag;                    ///< Indicates that the value of all decoded chroma samples is equal to 1<<(BitDepthCr-1)
     256#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
     257  Bool      m_picStructPresentFlag;                           ///< Indicates that pic_struct values are present in picture timing SEI messages
     258#endif
    256259  Bool      m_bitstreamRestrictionFlag;                       ///< Signals whether bitstream restriction parameters are present
    257260  Bool      m_tilesFixedStructureFlag;                        ///< Indicates that each active picture parameter set has the same values of the syntax elements related to tiles
    258261  Bool      m_motionVectorsOverPicBoundariesFlag;             ///< Indicates that no samples outside the picture boundaries are used for inter prediction
  • source/App/TAppEncoder/TAppEncTop.cpp

     
    292292  m_cTEncTop.setChromaSampleLocTypeTopField( m_chromaSampleLocTypeTopField );
    293293  m_cTEncTop.setChromaSampleLocTypeBottomField( m_chromaSampleLocTypeBottomField );
    294294  m_cTEncTop.setNeutralChromaIndicationFlag( m_neutralChromaIndicationFlag );
     295#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
     296  m_cTEncTop.setPicStructPresentFlag( m_picStructPresentFlag );
     297#endif
    295298  m_cTEncTop.setBitstreamRestrictionFlag( m_bitstreamRestrictionFlag );
    296299  m_cTEncTop.setTilesFixedStructureFlag( m_tilesFixedStructureFlag );
    297300  m_cTEncTop.setMotionVectorsOverPicBoundariesFlag( m_motionVectorsOverPicBoundariesFlag );
  • source/Lib/TLibCommon/TComSlice.h

     
    416416    ,m_chromaSampleLocTypeBottomField(0)
    417417    ,m_neutralChromaIndicationFlag(false)
    418418    ,m_fieldSeqFlag(false)
     419#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
     420    ,m_picStructPresentFlag(false)
     421#endif
    419422    ,m_hrdParametersPresentFlag(false)
    420423    ,m_bitstreamRestrictionFlag(false)
    421424    ,m_tilesFixedStructureFlag(false)
  • source/Lib/TLibEncoder/TEncCfg.h

     
    280280  Int       m_chromaSampleLocTypeTopField;                    ///< Specifies the location of chroma samples for top field
    281281  Int       m_chromaSampleLocTypeBottomField;                 ///< Specifies the location of chroma samples for bottom field
    282282  Bool      m_neutralChromaIndicationFlag;                    ///< Indicates that the value of all decoded chroma samples is equal to 1<<(BitDepthCr-1)
     283#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
     284  Bool      m_picStructPresentFlag;                           ///< Indicates that pic_struct values are present in picture timing SEI messages
     285#endif
    283286  Bool      m_bitstreamRestrictionFlag;                       ///< Signals whether bitstream restriction parameters are present
    284287  Bool      m_tilesFixedStructureFlag;                        ///< Indicates that each active picture parameter set has the same values of the syntax elements related to tiles
    285288  Bool      m_motionVectorsOverPicBoundariesFlag;             ///< Indicates that no samples outside the picture boundaries are used for inter prediction
     
    710713  Void      setChromaSampleLocTypeBottomField(Int i)      { m_chromaSampleLocTypeBottomField = i; }
    711714  Bool      getNeutralChromaIndicationFlag()              { return m_neutralChromaIndicationFlag; }
    712715  Void      setNeutralChromaIndicationFlag(Bool i)        { m_neutralChromaIndicationFlag = i; }
     716#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
     717  Bool      getPicStructPresentFlag()                     { return m_picStructPresentFlag; }
     718  Void      setPicStructPresentFlag(Bool i)               { m_picStructPresentFlag = i; } 
     719#endif
    713720  Bool      getBitstreamRestrictionFlag()                 { return m_bitstreamRestrictionFlag; }
    714721  Void      setBitstreamRestrictionFlag(Bool i)           { m_bitstreamRestrictionFlag = i; }
    715722  Bool      getTilesFixedStructureFlag()                  { return m_tilesFixedStructureFlag; }
  • source/Lib/TLibEncoder/TEncTop.cpp

     
    558558      pcVUI->setChromaSampleLocTypeTopField(getChromaSampleLocTypeTopField());
    559559      pcVUI->setChromaSampleLocTypeBottomField(getChromaSampleLocTypeBottomField());
    560560      pcVUI->setNeutralChromaIndicationFlag(getNeutralChromaIndicationFlag());
     561#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
     562      pcVUI->setPicStructPresentFlag(getPicStructPresentFlag()); 
     563#endif
    561564      pcVUI->setFieldSeqFlag(false);
    562565      pcVUI->setHrdParametersPresentFlag(false);
    563566      pcVUI->setBitstreamRestrictionFlag(getBitstreamRestrictionFlag());