Commit 774eb0aa authored by Jonatan Samuelsson's avatar Jonatan Samuelsson
Browse files

adjusting variable names to align with coding guidelines

parent 33a46d6d
Pipeline #3819 passed with stage
in 16 minutes and 21 seconds
......@@ -278,7 +278,7 @@ void EncApp::xInitLibCfg()
m_cEncLib.setAccessUnitDelimiter ( m_AccessUnitDelimiter );
#if JVET_Q0775_PH_IN_SH
m_cEncLib.setEnablePictureHeaderInSliceHeader ( m_EnablePictureHeaderInSliceHeader );
m_cEncLib.setEnablePictureHeaderInSliceHeader ( m_enablePictureHeaderInSliceHeader );
#endif
m_cEncLib.setMaxTempLayer ( m_maxTempLayer );
......
......@@ -805,7 +805,7 @@ bool EncAppCfg::parseCfg( int argc, char* argv[] )
("ConfWinBottom", m_confWinBottom, 0, "Bottom offset for window conformance mode 3")
("AccessUnitDelimiter", m_AccessUnitDelimiter, false, "Enable Access Unit Delimiter NALUs")
#if JVET_Q0775_PH_IN_SH
("EnablePictureHeaderInSliceHeader", m_EnablePictureHeaderInSliceHeader, true, "Enable Picture Header in Slice Header")
("EnablePictureHeaderInSliceHeader", m_enablePictureHeaderInSliceHeader, true, "Enable Picture Header in Slice Header")
#endif
("FrameRate,-fr", m_iFrameRate, 0, "Frame rate")
("FrameSkip,-fs", m_FrameSkip, 0u, "Number of frames to skip at start of input YUV")
......
......@@ -116,7 +116,7 @@ protected:
int m_aiPad[2]; ///< number of padded pixels for width and height
bool m_AccessUnitDelimiter; ///< add Access Unit Delimiter NAL units
#if JVET_Q0775_PH_IN_SH
bool m_EnablePictureHeaderInSliceHeader; ///< Enable Picture Header in Slice Header
bool m_enablePictureHeaderInSliceHeader; ///< Enable Picture Header in Slice Header
#endif
InputColourSpaceConversion m_inputColourSpaceConvert; ///< colour space conversion to apply to input video
bool m_snrInternalColourSpace; ///< if true, then no colour space conversion is applied for snr calculation, otherwise inverse of input is applied.
......
......@@ -55,7 +55,7 @@ Slice::Slice()
, m_rpl1Idx ( -1 )
, m_eNalUnitType ( NAL_UNIT_CODED_SLICE_IDR_W_RADL )
#if JVET_Q0775_PH_IN_SH
, m_bPictureHeaderInSliceHeader ( false )
, m_pictureHeaderInSliceHeader ( false )
#endif
, m_eSliceType ( I_SLICE )
, m_iSliceQp ( 0 )
......
......@@ -2142,7 +2142,7 @@ private:
int m_rpl1Idx; //< index of used RPL in the SPS or -1 for local RPL in the slice header
NalUnitType m_eNalUnitType; ///< Nal unit type for the slice
#if JVET_Q0775_PH_IN_SH
bool m_bPictureHeaderInSliceHeader;
bool m_pictureHeaderInSliceHeader;
#endif
SliceType m_eSliceType;
int m_iSliceQp;
......@@ -2295,8 +2295,8 @@ public:
int getList1IdxToList0Idx( int list1Idx ) const { return m_list1IdxToList0Idx[list1Idx]; }
void setPOC( int i ) { m_iPOC = i; }
#if JVET_Q0775_PH_IN_SH
bool getPictureHeaderInSliceHeader() const { return m_bPictureHeaderInSliceHeader; }
void setPictureHeaderInSliceHeader( bool e ) { m_bPictureHeaderInSliceHeader = e; }
bool getPictureHeaderInSliceHeader() const { return m_pictureHeaderInSliceHeader; }
void setPictureHeaderInSliceHeader( bool e ) { m_pictureHeaderInSliceHeader = e; }
#endif
void setNalUnitType( NalUnitType e ) { m_eNalUnitType = e; }
NalUnitType getNalUnitType() const { return m_eNalUnitType; }
......
......@@ -239,7 +239,7 @@ protected:
bool m_AccessUnitDelimiter; ///< add Access Unit Delimiter NAL units
#if JVET_Q0775_PH_IN_SH
bool m_EnablePictureHeaderInSliceHeader; ///< Enable Picture Header in Slice Header
bool m_enablePictureHeaderInSliceHeader; ///< Enable Picture Header in Slice Header
#endif
int m_iMaxRefPicNum; ///< this is used to mimic the sliding mechanism used by the decoder
......@@ -1187,8 +1187,8 @@ public:
bool getAccessUnitDelimiter() const { return m_AccessUnitDelimiter; }
void setAccessUnitDelimiter(bool val){ m_AccessUnitDelimiter = val; }
#if JVET_Q0775_PH_IN_SH
bool getEnablePictureHeaderInSliceHeader() const { return m_EnablePictureHeaderInSliceHeader; }
void setEnablePictureHeaderInSliceHeader(bool val) { m_EnablePictureHeaderInSliceHeader = val; }
bool getEnablePictureHeaderInSliceHeader() const { return m_enablePictureHeaderInSliceHeader; }
void setEnablePictureHeaderInSliceHeader(bool val) { m_enablePictureHeaderInSliceHeader = val; }
#endif
//==== Loop/Deblock Filter ========
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment