Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jonatan Samuelsson
VVCSoftware_VTM
Commits
774eb0aa
Commit
774eb0aa
authored
Jan 28, 2020
by
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
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
source/App/EncoderApp/EncApp.cpp
View file @
774eb0aa
...
...
@@ -278,7 +278,7 @@ void EncApp::xInitLibCfg()
m_cEncLib
.
setAccessUnitDelimiter
(
m_AccessUnitDelimiter
);
#if JVET_Q0775_PH_IN_SH
m_cEncLib
.
setEnablePictureHeaderInSliceHeader
(
m_
E
nablePictureHeaderInSliceHeader
);
m_cEncLib
.
setEnablePictureHeaderInSliceHeader
(
m_
e
nablePictureHeaderInSliceHeader
);
#endif
m_cEncLib
.
setMaxTempLayer
(
m_maxTempLayer
);
...
...
source/App/EncoderApp/EncAppCfg.cpp
View file @
774eb0aa
...
...
@@ -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_
E
nablePictureHeaderInSliceHeader
,
true
,
"Enable Picture Header in Slice Header"
)
(
"EnablePictureHeaderInSliceHeader"
,
m_
e
nablePictureHeaderInSliceHeader
,
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"
)
...
...
source/App/EncoderApp/EncAppCfg.h
View file @
774eb0aa
...
...
@@ -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_
E
nablePictureHeaderInSliceHeader
;
///< Enable Picture Header in Slice Header
bool
m_
e
nablePictureHeaderInSliceHeader
;
///< 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.
...
...
source/Lib/CommonLib/Slice.cpp
View file @
774eb0aa
...
...
@@ -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_
bP
ictureHeaderInSliceHeader
(
false
)
,
m_
p
ictureHeaderInSliceHeader
(
false
)
#endif
,
m_eSliceType
(
I_SLICE
)
,
m_iSliceQp
(
0
)
...
...
source/Lib/CommonLib/Slice.h
View file @
774eb0aa
...
...
@@ -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_
bP
ictureHeaderInSliceHeader
;
bool
m_
p
ictureHeaderInSliceHeader
;
#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_
bP
ictureHeaderInSliceHeader
;
}
void
setPictureHeaderInSliceHeader
(
bool
e
)
{
m_
bP
ictureHeaderInSliceHeader
=
e
;
}
bool
getPictureHeaderInSliceHeader
()
const
{
return
m_
p
ictureHeaderInSliceHeader
;
}
void
setPictureHeaderInSliceHeader
(
bool
e
)
{
m_
p
ictureHeaderInSliceHeader
=
e
;
}
#endif
void
setNalUnitType
(
NalUnitType
e
)
{
m_eNalUnitType
=
e
;
}
NalUnitType
getNalUnitType
()
const
{
return
m_eNalUnitType
;
}
...
...
source/Lib/EncoderLib/EncCfg.h
View file @
774eb0aa
...
...
@@ -239,7 +239,7 @@ protected:
bool
m_AccessUnitDelimiter
;
///< add Access Unit Delimiter NAL units
#if JVET_Q0775_PH_IN_SH
bool
m_
E
nablePictureHeaderInSliceHeader
;
///< Enable Picture Header in Slice Header
bool
m_
e
nablePictureHeaderInSliceHeader
;
///< 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_
E
nablePictureHeaderInSliceHeader
;
}
void
setEnablePictureHeaderInSliceHeader
(
bool
val
)
{
m_
E
nablePictureHeaderInSliceHeader
=
val
;
}
bool
getEnablePictureHeaderInSliceHeader
()
const
{
return
m_
e
nablePictureHeaderInSliceHeader
;
}
void
setEnablePictureHeaderInSliceHeader
(
bool
val
)
{
m_
e
nablePictureHeaderInSliceHeader
=
val
;
}
#endif
//==== Loop/Deblock Filter ========
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment