Ticket #888: pic_struct_present.patch

source/App/TAppEncoder/TAppEncCfg.cpp

@@ -451 +451 @@
   ("ChromaSampleLocTypeTopField",    m_chromaSampleLocTypeTopField,            0, "Specifies the location of chroma samples for top field")
   ("ChromaSampleLocTypeBottomField", m_chromaSampleLocTypeBottomField,         0, "Specifies the location of chroma samples for bottom field")
   ("NeutralChromaIndication",        m_neutralChromaIndicationFlag,        false, "Indicates that the value of all decoded chroma samples is equal to 1<<(BitDepthCr-1)")
+#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
+  ("PicStructPresentFlag",           m_picStructPresentFlag,               false, "Indicates that pic_struct values are present in picture timing SEI messages")
+#endif
   ("BitstreamRestriction",           m_bitstreamRestrictionFlag,           false, "Signals whether bitstream restriction parameters are present")
   ("TilesFixedStructure",            m_tilesFixedStructureFlag,            false, "Indicates that each active picture parameter set has the same values of the syntax elements related to tiles")
   ("MotionVectorsOverPicBoundaries", m_motionVectorsOverPicBoundariesFlag, false, "Indicates that no samples outside the picture boundaries are used for inter prediction")

source/App/TAppEncoder/TAppEncCfg.h

@@ -253 +253 @@
   Int       m_chromaSampleLocTypeTopField;                    ///< Specifies the location of chroma samples for top field
   Int       m_chromaSampleLocTypeBottomField;                 ///< Specifies the location of chroma samples for bottom field
   Bool      m_neutralChromaIndicationFlag;                    ///< Indicates that the value of all decoded chroma samples is equal to 1<<(BitDepthCr-1)
+#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
+  Bool      m_picStructPresentFlag;                           ///< Indicates that pic_struct values are present in picture timing SEI messages
+#endif
   Bool      m_bitstreamRestrictionFlag;                       ///< Signals whether bitstream restriction parameters are present
   Bool      m_tilesFixedStructureFlag;                        ///< Indicates that each active picture parameter set has the same values of the syntax elements related to tiles
   Bool      m_motionVectorsOverPicBoundariesFlag;             ///< Indicates that no samples outside the picture boundaries are used for inter prediction

source/App/TAppEncoder/TAppEncTop.cpp

@@ -292 +292 @@
   m_cTEncTop.setChromaSampleLocTypeTopField( m_chromaSampleLocTypeTopField );
   m_cTEncTop.setChromaSampleLocTypeBottomField( m_chromaSampleLocTypeBottomField );
   m_cTEncTop.setNeutralChromaIndicationFlag( m_neutralChromaIndicationFlag );
+#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
+  m_cTEncTop.setPicStructPresentFlag( m_picStructPresentFlag );
+#endif
   m_cTEncTop.setBitstreamRestrictionFlag( m_bitstreamRestrictionFlag );
   m_cTEncTop.setTilesFixedStructureFlag( m_tilesFixedStructureFlag );
   m_cTEncTop.setMotionVectorsOverPicBoundariesFlag( m_motionVectorsOverPicBoundariesFlag );

source/Lib/TLibCommon/TComSlice.h

@@ -416 +416 @@
     ,m_chromaSampleLocTypeBottomField(0)
     ,m_neutralChromaIndicationFlag(false)
     ,m_fieldSeqFlag(false)
+#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
+    ,m_picStructPresentFlag(false)
+#endif
     ,m_hrdParametersPresentFlag(false)
     ,m_bitstreamRestrictionFlag(false)
     ,m_tilesFixedStructureFlag(false)

source/Lib/TLibEncoder/TEncCfg.h

@@ -280 +280 @@
   Int       m_chromaSampleLocTypeTopField;                    ///< Specifies the location of chroma samples for top field
   Int       m_chromaSampleLocTypeBottomField;                 ///< Specifies the location of chroma samples for bottom field
   Bool      m_neutralChromaIndicationFlag;                    ///< Indicates that the value of all decoded chroma samples is equal to 1<<(BitDepthCr-1)
+#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
+  Bool      m_picStructPresentFlag;                           ///< Indicates that pic_struct values are present in picture timing SEI messages
+#endif
   Bool      m_bitstreamRestrictionFlag;                       ///< Signals whether bitstream restriction parameters are present
   Bool      m_tilesFixedStructureFlag;                        ///< Indicates that each active picture parameter set has the same values of the syntax elements related to tiles
   Bool      m_motionVectorsOverPicBoundariesFlag;             ///< Indicates that no samples outside the picture boundaries are used for inter prediction
@@ -710 +713 @@
   Void      setChromaSampleLocTypeBottomField(Int i)      { m_chromaSampleLocTypeBottomField = i; }
   Bool      getNeutralChromaIndicationFlag()              { return m_neutralChromaIndicationFlag; }
   Void      setNeutralChromaIndicationFlag(Bool i)        { m_neutralChromaIndicationFlag = i; }
+#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
+  Bool      getPicStructPresentFlag()                     { return m_picStructPresentFlag; }
+  Void      setPicStructPresentFlag(Bool i)               { m_picStructPresentFlag = i; }  
+#endif
   Bool      getBitstreamRestrictionFlag()                 { return m_bitstreamRestrictionFlag; }
   Void      setBitstreamRestrictionFlag(Bool i)           { m_bitstreamRestrictionFlag = i; }
   Bool      getTilesFixedStructureFlag()                  { return m_tilesFixedStructureFlag; }

source/Lib/TLibEncoder/TEncTop.cpp

@@ -558 +558 @@
       pcVUI->setChromaSampleLocTypeTopField(getChromaSampleLocTypeTopField());
       pcVUI->setChromaSampleLocTypeBottomField(getChromaSampleLocTypeBottomField());
       pcVUI->setNeutralChromaIndicationFlag(getNeutralChromaIndicationFlag());
+#if HLS_ADD_VUI_PICSTRUCT_PRESENT_FLAG
+      pcVUI->setPicStructPresentFlag(getPicStructPresentFlag());  
+#endif
       pcVUI->setFieldSeqFlag(false);
       pcVUI->setHrdParametersPresentFlag(false);
       pcVUI->setBitstreamRestrictionFlag(getBitstreamRestrictionFlag());