Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
V
VVCSoftware_VTM
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
jvet
VVCSoftware_VTM
Commits
5bdd8774
Commit
5bdd8774
authored
Jan 30, 2019
by
Hongbin Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move sps_fracmmvd_disabled_flag from SPSNext to SPS.
parent
8eb0aa20
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
26 additions
and
20 deletions
+26
-20
source/Lib/CommonLib/Slice.cpp
source/Lib/CommonLib/Slice.cpp
+3
-0
source/Lib/CommonLib/Slice.h
source/Lib/CommonLib/Slice.h
+8
-5
source/Lib/DecoderLib/VLCReader.cpp
source/Lib/DecoderLib/VLCReader.cpp
+5
-5
source/Lib/EncoderLib/EncCu.h
source/Lib/EncoderLib/EncCu.h
+1
-1
source/Lib/EncoderLib/EncLib.cpp
source/Lib/EncoderLib/EncLib.cpp
+1
-1
source/Lib/EncoderLib/EncSlice.cpp
source/Lib/EncoderLib/EncSlice.cpp
+4
-4
source/Lib/EncoderLib/VLCWriter.cpp
source/Lib/EncoderLib/VLCWriter.cpp
+4
-4
No files found.
source/Lib/CommonLib/Slice.cpp
View file @
5bdd8774
...
...
@@ -1873,6 +1873,9 @@ SPS::SPS()
,
m_bPCMFilterDisableFlag
(
false
)
,
m_sbtmvpEnabledFlag
(
false
)
,
m_bdofEnabledFlag
(
false
)
#if JVET_M0255_FRACMMVD_SWITCH
,
m_disFracMmvdEnabledFlag
(
false
)
#endif
,
m_uiBitsForPOC
(
8
)
,
m_numLongTermRefPicSPS
(
0
)
,
m_uiMaxTrSize
(
32
)
...
...
source/Lib/CommonLib/Slice.h
View file @
5bdd8774
...
...
@@ -919,10 +919,6 @@ public:
bool
getUseTriangle
()
const
{
return
m_Triangle
;
}
void
setIBCMode
(
unsigned
IBCMode
)
{
m_IBCMode
=
IBCMode
;
}
unsigned
getIBCMode
()
const
{
return
m_IBCMode
;
}
#if JVET_M0255_FRACMMVD_SWITCH
void
setAllowDisFracMMVD
(
bool
b
)
{
allowDisFracMMVD
=
b
;
}
bool
getAllowDisFracMMVD
()
const
{
return
allowDisFracMMVD
;
}
#endif
};
...
...
@@ -997,7 +993,9 @@ private:
bool
m_sbtmvpEnabledFlag
;
bool
m_bdofEnabledFlag
;
#if JVET_M0255_FRACMMVD_SWITCH
bool
m_disFracMmvdEnabledFlag
;
#endif
uint32_t
m_uiBitsForPOC
;
uint32_t
m_numLongTermRefPicSPS
;
uint32_t
m_ltRefPicPocLsbSps
[
MAX_NUM_LONG_TERM_REF_PICS
];
...
...
@@ -1200,6 +1198,11 @@ public:
void
setBDOFEnabledFlag
(
bool
b
)
{
m_bdofEnabledFlag
=
b
;
}
bool
getBDOFEnabledFlag
()
const
{
return
m_bdofEnabledFlag
;
}
#if JVET_M0255_FRACMMVD_SWITCH
bool
getDisFracMmvdEnabledFlag
()
const
{
return
m_disFracMmvdEnabledFlag
;
}
void
setDisFracMmvdEnabledFlag
(
bool
b
)
{
m_disFracMmvdEnabledFlag
=
b
;
}
#endif
uint32_t
getMaxTLayers
()
const
{
return
m_uiMaxTLayers
;
}
void
setMaxTLayers
(
uint32_t
uiMaxTLayers
)
{
CHECK
(
uiMaxTLayers
>
MAX_TLAYER
,
"Invalid number T-layers"
);
m_uiMaxTLayers
=
uiMaxTLayers
;
}
...
...
source/Lib/DecoderLib/VLCReader.cpp
View file @
5bdd8774
...
...
@@ -818,9 +818,6 @@ void HLSyntaxReader::parseSPSNext( SPSNext& spsNext, const bool usePCM )
}
READ_FLAG
(
symbol
,
"mtt_enabled_flag"
);
spsNext
.
setMTTMode
(
symbol
);
READ_FLAG
(
symbol
,
"mhintra_flag"
);
spsNext
.
setUseMHIntra
(
symbol
!=
0
);
#if JVET_M0255_FRACMMVD_SWITCH
READ_FLAG
(
symbol
,
"sps_fracmmvd_disabled_flag"
);
spsNext
.
setAllowDisFracMMVD
(
symbol
!=
0
);
#endif
READ_FLAG
(
symbol
,
"triangle_flag"
);
spsNext
.
setUseTriangle
(
symbol
!=
0
);
#if ENABLE_WPP_PARALLELISM
READ_FLAG
(
symbol
,
"next_dqp_enabled_flag"
);
spsNext
.
setUseNextDQP
(
symbol
!=
0
);
...
...
@@ -1050,7 +1047,10 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
READ_FLAG
(
uiCode
,
"sps_bdof_enable_flag"
);
pcSPS
->
setBDOFEnabledFlag
(
uiCode
!=
0
);
#if JVET_M0255_FRACMMVD_SWITCH
READ_FLAG
(
uiCode
,
"sps_fracmmvd_disabled_flag"
);
pcSPS
->
setDisFracMmvdEnabledFlag
(
uiCode
!=
0
);
#endif
#if HEVC_USE_SCALING_LISTS
READ_FLAG
(
uiCode
,
"scaling_list_enabled_flag"
);
pcSPS
->
setScalingListFlag
(
uiCode
);
if
(
pcSPS
->
getScalingListFlag
())
...
...
@@ -1771,7 +1771,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
pcSlice
->
setMaxNumAffineMergeCand
(
AFFINE_MRG_MAX_NUM_CANDS
-
uiCode
);
}
#if JVET_M0255_FRACMMVD_SWITCH
if
(
sps
->
get
SpsNext
().
getAllowDisFracMMVD
()
)
if
(
sps
->
get
DisFracMmvdEnabledFlag
()
)
{
READ_FLAG
(
uiCode
,
"tile_group_fracmmvd_disabled_flag"
);
pcSlice
->
setDisFracMMVD
(
uiCode
?
true
:
false
);
...
...
source/Lib/EncoderLib/EncCu.h
View file @
5bdd8774
...
...
@@ -160,7 +160,7 @@ public:
void
setMergeBestSATDCost
(
double
cost
)
{
m_mergeBestSATDCost
=
cost
;
}
double
getMergeBestSATDCost
()
{
return
m_mergeBestSATDCost
;
}
#if JVET_M0255_FRACMMVD_SWITCH
IbcHashMap
&
get
Cpr
HashMap
()
{
return
m_ibcHashMap
;
}
IbcHashMap
&
get
Ibc
HashMap
()
{
return
m_ibcHashMap
;
}
EncCfg
*
getEncCfg
()
const
{
return
m_pcEncCfg
;
}
#endif
...
...
source/Lib/EncoderLib/EncLib.cpp
View file @
5bdd8774
...
...
@@ -892,7 +892,7 @@ void EncLib::xInitSPS(SPS &sps)
sps
.
getSpsNext
().
setUseMHIntra
(
m_MHIntra
);
sps
.
getSpsNext
().
setUseTriangle
(
m_Triangle
);
#if JVET_M0255_FRACMMVD_SWITCH
sps
.
getSpsNext
().
setAllowDisFracMMVD
(
m_allowDisFracMMVD
);
sps
.
setDisFracMmvdEnabledFlag
(
m_allowDisFracMMVD
);
#endif
sps
.
getSpsNext
().
setIBCMode
(
m_IBCMode
);
...
...
source/Lib/EncoderLib/EncSlice.cpp
View file @
5bdd8774
...
...
@@ -1401,7 +1401,7 @@ void EncSlice::checkDisFracMmvd( Picture* pcPic, uint32_t startCtuTsAddr, uint32
uint32_t
totalCtu
=
0
;
uint32_t
hashRatio
=
0
;
if
(
!
pcSlice
->
getSPS
()
->
get
SpsNext
().
getAllowDisFracMMVD
()
)
if
(
!
pcSlice
->
getSPS
()
->
get
DisFracMmvdEnabledFlag
()
)
{
return
;
}
...
...
@@ -1419,7 +1419,7 @@ void EncSlice::checkDisFracMmvd( Picture* pcPic, uint32_t startCtuTsAddr, uint32
const
Position
pos
(
ctuXPosInCtus
*
pcv
.
maxCUWidth
,
ctuYPosInCtus
*
pcv
.
maxCUHeight
);
const
UnitArea
ctuArea
(
cs
.
area
.
chromaFormat
,
Area
(
pos
.
x
,
pos
.
y
,
pcv
.
maxCUWidth
,
pcv
.
maxCUHeight
)
);
hashRatio
+=
m_pcCuEncoder
->
get
Cpr
HashMap
().
getHashHitRatio
(
ctuArea
.
Y
()
);
hashRatio
+=
m_pcCuEncoder
->
get
Ibc
HashMap
().
getHashHitRatio
(
ctuArea
.
Y
()
);
totalCtu
++
;
}
...
...
@@ -1480,10 +1480,10 @@ void EncSlice::encodeCtus( Picture* pcPic, const bool bCompressEntireSlice, cons
}
#endif
#if JVET_M0255_FRACMMVD_SWITCH
if
(
pcSlice
->
getSPS
()
->
get
SpsNext
().
getAllowDisFracMMVD
()
||
if
(
pcSlice
->
getSPS
()
->
get
DisFracMmvdEnabledFlag
()
||
(
pcSlice
->
getSPS
()
->
getSpsNext
().
getIBCMode
()
&&
m_pcCuEncoder
->
getEncCfg
()
->
getIBCHashSearch
()
)
)
{
m_pcCuEncoder
->
get
Cpr
HashMap
().
rebuildPicHashMap
(
cs
.
picture
->
getOrigBuf
()
);
m_pcCuEncoder
->
get
Ibc
HashMap
().
rebuildPicHashMap
(
cs
.
picture
->
getOrigBuf
()
);
}
checkDisFracMmvd
(
pcPic
,
startCtuTsAddr
,
boundingCtuTsAddr
);
#endif
...
...
source/Lib/EncoderLib/VLCWriter.cpp
View file @
5bdd8774
...
...
@@ -559,9 +559,6 @@ void HLSWriter::codeSPSNext( const SPSNext& spsNext, const bool usePCM )
WRITE_FLAG
(
spsNext
.
getMTTEnabled
()
?
1
:
0
,
"mtt_enabled_flag"
);
WRITE_FLAG
(
spsNext
.
getUseMHIntra
()
?
1
:
0
,
"mhintra_flag"
);
#if JVET_M0255_FRACMMVD_SWITCH
WRITE_FLAG
(
spsNext
.
getAllowDisFracMMVD
()
?
1
:
0
,
"sps_fracmmvd_disabled_flag"
);
#endif
WRITE_FLAG
(
spsNext
.
getUseTriangle
()
?
1
:
0
,
"triangle_flag"
);
#if ENABLE_WPP_PARALLELISM
WRITE_FLAG
(
spsNext
.
getUseNextDQP
(),
"next_dqp_enabled_flag"
);
...
...
@@ -724,6 +721,9 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
}
WRITE_FLAG
(
pcSPS
->
getBDOFEnabledFlag
()
?
1
:
0
,
"sps_bdof_enabled_flag"
);
#if JVET_M0255_FRACMMVD_SWITCH
WRITE_FLAG
(
pcSPS
->
getDisFracMmvdEnabledFlag
()
?
1
:
0
,
"sps_fracmmvd_disabled_flag"
);
#endif
#if HEVC_USE_SCALING_LISTS
WRITE_FLAG
(
pcSPS
->
getScalingListFlag
()
?
1
:
0
,
"scaling_list_enabled_flag"
);
...
...
@@ -1289,7 +1289,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
WRITE_UVLC
(
AFFINE_MRG_MAX_NUM_CANDS
-
pcSlice
->
getMaxNumAffineMergeCand
(),
"five_minus_max_num_affine_merge_cand"
);
}
#if JVET_M0255_FRACMMVD_SWITCH
if
(
pcSlice
->
getSPS
()
->
get
SpsNext
().
getAllowDisFracMMVD
()
)
if
(
pcSlice
->
getSPS
()
->
get
DisFracMmvdEnabledFlag
()
)
{
WRITE_FLAG
(
pcSlice
->
getDisFracMMVD
(),
"tile_group_fracmmvd_disabled_flag"
);
}
...
...
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