Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VVCSoftware_VTM
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
JVET Trac bug tracker
JVET Trac bug tracker
Merge Requests
9
Merge Requests
9
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Jobs
Commits
Open sidebar
jvet
VVCSoftware_VTM
Commits
e9ffb8d9
Commit
e9ffb8d9
authored
Jan 25, 2019
by
Taoran Lu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
address discussion points and rebase
parent
65c52d71
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
31 deletions
+7
-31
cfg/encoder_lowdelay_P_vtm.cfg
cfg/encoder_lowdelay_P_vtm.cfg
+1
-0
source/Lib/CommonLib/CommonDef.h
source/Lib/CommonLib/CommonDef.h
+2
-9
source/Lib/CommonLib/RdCost.cpp
source/Lib/CommonLib/RdCost.cpp
+0
-15
source/Lib/CommonLib/RdCost.h
source/Lib/CommonLib/RdCost.h
+0
-4
source/Lib/EncoderLib/EncGOP.cpp
source/Lib/EncoderLib/EncGOP.cpp
+4
-3
No files found.
cfg/encoder_lowdelay_P_vtm.cfg
View file @
e9ffb8d9
...
...
@@ -131,6 +131,7 @@ MHIntra : 1
IBC : 0 # turned off in CTC
AllowDisFracMMVD : 1
AffineAmvr : 0
LumaReshapeEnable : 1 # luma reshaping. 0: disable 1:enable
# Fast tools
PBIntraFast : 1
...
...
source/Lib/CommonLib/CommonDef.h
View file @
e9ffb8d9
...
...
@@ -418,17 +418,10 @@ static constexpr int MV_MANTISSA_LIMIT = (1 << (MV_MANTISSA_BITCOUNT - 1))
static
constexpr
int
MV_EXPONENT_MASK
=
((
1
<<
MV_EXPONENT_BITCOUNT
)
-
1
);
#endif
#if JVET_M0427_INLOOP_RESHAPER
static
const
int
MAX_LUMA_RESHAPING_LUT_SIZE
=
1024
;
static
const
int
CSCALE_FP_PREC
=
11
;
static
const
int
PIC_ANALYZE_CW_BINS
=
32
;
static
const
int
FP_PREC
=
14
;
static
const
int
log2_MAX_LUMA_RESHAPING_LUT_SIZE
=
10
;
static
const
int
log2_PIC_ANALYZE_CW_BINS
=
5
;
static
const
int
PIC_ANALYZE_WIN_SIZE
=
5
;
static
const
int
CW_NUMS
=
3
;
static
const
int
MAX_FRAME_RATE
=
128
;
static
const
int
PIC_CODE_CW_BINS
=
16
;
static
const
int
log2_PIC_CODE_CW_BINS
=
4
;
static
const
int
FP_PREC
=
14
;
static
const
int
CSCALE_FP_PREC
=
11
;
#endif
// ====================================================================================================================
// Macro functions
...
...
source/Lib/CommonLib/RdCost.cpp
View file @
e9ffb8d9
...
...
@@ -2881,18 +2881,6 @@ void RdCost::saveUnadjustedLambda()
void
RdCost
::
initLumaLevelToWeightTable
()
{
#if JVET_M0427_INLOOP_RESHAPER
if
(
m_iSignalType
==
RESHAPE_SIGNAL_SDR
)
{
double
weight
=
1.0
;
for
(
int
i
=
0
;
i
<
LUMA_LEVEL_TO_DQP_LUT_MAXSIZE
;
i
++
)
{
m_lumaLevelToWeightPLUT
[
i
]
=
weight
;
}
return
;
}
#endif
for
(
int
i
=
0
;
i
<
LUMA_LEVEL_TO_DQP_LUT_MAXSIZE
;
i
++
)
{
double
x
=
i
;
double
y
;
...
...
@@ -2914,9 +2902,6 @@ void RdCost::initLumaLevelToWeightTable()
m_lumaLevelToWeightPLUT
[
i
]
=
pow
(
2.0
,
y
/
3.0
);
// or power(10, dQp/10) they are almost equal
}
#if JVET_M0427_INLOOP_RESHAPER
memcpy
(
m_reshapeLumaLevelToWeightPLUT
,
m_lumaLevelToWeightPLUT
,
LUMA_LEVEL_TO_DQP_LUT_MAXSIZE
*
sizeof
(
double
));
#endif
}
#if JVET_M0427_INLOOP_RESHAPER
...
...
source/Lib/CommonLib/RdCost.h
View file @
e9ffb8d9
...
...
@@ -115,10 +115,6 @@ private:
static
int
m_lumaBD
;
#else
static
double
m_lumaLevelToWeightPLUT
[
LUMA_LEVEL_TO_DQP_LUT_MAXSIZE
];
#if JVET_M0427_INLOOP_RESHAPER
static
double
m_reshapeLumaLevelToWeightPLUT
[
LUMA_LEVEL_TO_DQP_LUT_MAXSIZE
];
static
uint32_t
m_iSignalType
;
static
double
m_chroma_weight
;
#endif
#endif
double
m_DistScale
;
...
...
source/Lib/EncoderLib/EncGOP.cpp
View file @
e9ffb8d9
...
...
@@ -186,15 +186,16 @@ void EncGOP::init ( EncLib* pcEncLib )
}
else
if
(
m_pcCfg
->
getLumaLevelToDeltaQPMapping
().
mode
)
{
#endif
pcEncLib
->
getRdCost
()
->
initLumaLevelToWeightTable
();
#if JVET_M0427_INLOOP_RESHAPER
memcpy
(
pcEncLib
->
getALF
()
->
getLumaLevelWeightTable
(),
pcEncLib
->
getRdCost
()
->
getLumaLevelWeightTable
(),
LUMA_LEVEL_TO_DQP_LUT_MAXSIZE
*
sizeof
(
double
));
}
pcEncLib
->
getALF
()
->
getLumaLevelWeightTable
()
=
pcEncLib
->
getRdCost
()
->
getLumaLevelWeightTable
();
int
alfWSSD
=
0
;
if
(
m_pcCfg
->
getReshaper
()
&&
m_pcCfg
->
getReshapeSignalType
()
==
RESHAPE_SIGNAL_PQ
)
{
alfWSSD
=
1
;
}
pcEncLib
->
getALF
()
->
setAlfWSSD
(
alfWSSD
);
#endif
pcEncLib
->
getRdCost
()
->
initLumaLevelToWeightTable
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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