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
11
Merge Requests
11
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
8fa61a05
Commit
8fa61a05
authored
Oct 24, 2018
by
Xiang Li
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Kenneth/VVCSoftware_VTM-JVET-L0074_subblock_deblocking'
parents
c4131230
271a4f12
Pipeline
#176
canceled with stage
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
44 additions
and
10 deletions
+44
-10
source/Lib/CommonLib/LoopFilter.cpp
source/Lib/CommonLib/LoopFilter.cpp
+43
-0
source/Lib/CommonLib/TypeDef.h
source/Lib/CommonLib/TypeDef.h
+1
-10
No files found.
source/Lib/CommonLib/LoopFilter.cpp
View file @
8fa61a05
...
@@ -250,6 +250,10 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
...
@@ -250,6 +250,10 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
xSetEdgefilterMultiple
(
cu
,
EDGE_HOR
,
areaTu
,
m_stLFCUParam
.
internalEdge
);
xSetEdgefilterMultiple
(
cu
,
EDGE_HOR
,
areaTu
,
m_stLFCUParam
.
internalEdge
);
}
}
#if L0074_SUBBLOCK_DEBLOCKING
bool
mvSubBlocks
=
false
;
int
subBlockSize
=
8
;
#endif
for
(
auto
&
currPU
:
CU
::
traversePUs
(
cu
)
)
for
(
auto
&
currPU
:
CU
::
traversePUs
(
cu
)
)
{
{
const
Area
&
areaPu
=
cu
.
Y
().
valid
()
?
currPU
.
block
(
COMPONENT_Y
)
:
area
;
const
Area
&
areaPu
=
cu
.
Y
().
valid
()
?
currPU
.
block
(
COMPONENT_Y
)
:
area
;
...
@@ -259,8 +263,31 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
...
@@ -259,8 +263,31 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
xSetEdgefilterMultiple
(
cu
,
EDGE_VER
,
areaPu
,
(
xOff
?
m_stLFCUParam
.
internalEdge
:
m_stLFCUParam
.
leftEdge
),
xOff
);
xSetEdgefilterMultiple
(
cu
,
EDGE_VER
,
areaPu
,
(
xOff
?
m_stLFCUParam
.
internalEdge
:
m_stLFCUParam
.
leftEdge
),
xOff
);
xSetEdgefilterMultiple
(
cu
,
EDGE_HOR
,
areaPu
,
(
yOff
?
m_stLFCUParam
.
internalEdge
:
m_stLFCUParam
.
topEdge
),
yOff
);
xSetEdgefilterMultiple
(
cu
,
EDGE_HOR
,
areaPu
,
(
yOff
?
m_stLFCUParam
.
internalEdge
:
m_stLFCUParam
.
topEdge
),
yOff
);
#if L0074_SUBBLOCK_DEBLOCKING
if
((
currPU
.
mergeFlag
&&
(
currPU
.
mergeType
==
MRG_TYPE_SUBPU_ATMVP
))
||
cu
.
affine
)
{
mvSubBlocks
=
true
;
if
(
edgeDir
==
EDGE_HOR
)
{
for
(
uint32_t
off
=
subBlockSize
;
off
<
areaPu
.
height
;
off
+=
subBlockSize
)
{
const
Area
mvBlockH
(
cu
.
Y
().
x
,
cu
.
Y
().
y
+
off
,
cu
.
Y
().
width
,
pcv
.
minCUHeight
);
xSetEdgefilterMultiple
(
cu
,
EDGE_HOR
,
mvBlockH
,
m_stLFCUParam
.
internalEdge
,
1
);
}
}
else
{
for
(
uint32_t
off
=
subBlockSize
;
off
<
areaPu
.
width
;
off
+=
subBlockSize
)
{
const
Area
mvBlockV
(
cu
.
Y
().
x
+
off
,
cu
.
Y
().
y
,
pcv
.
minCUWidth
,
cu
.
Y
().
height
);
xSetEdgefilterMultiple
(
cu
,
EDGE_VER
,
mvBlockV
,
m_stLFCUParam
.
internalEdge
,
1
);
}
}
}
#endif
}
}
#if !L0074_SUBBLOCK_DEBLOCKING
if
(
cu
.
affine
)
if
(
cu
.
affine
)
{
{
const
int
widthInBaseUnits
=
cu
.
Y
().
width
>>
pcv
.
minCUWidthLog2
;
const
int
widthInBaseUnits
=
cu
.
Y
().
width
>>
pcv
.
minCUWidthLog2
;
...
@@ -276,6 +303,7 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
...
@@ -276,6 +303,7 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
xSetEdgefilterMultiple
(
cu
,
EDGE_HOR
,
affiBlockH
,
m_stLFCUParam
.
internalEdge
,
1
);
xSetEdgefilterMultiple
(
cu
,
EDGE_HOR
,
affiBlockH
,
m_stLFCUParam
.
internalEdge
,
1
);
}
}
}
}
#endif
const
unsigned
uiPelsInPart
=
pcv
.
minCUWidth
;
const
unsigned
uiPelsInPart
=
pcv
.
minCUWidth
;
for
(
int
y
=
0
;
y
<
area
.
height
;
y
+=
uiPelsInPart
)
for
(
int
y
=
0
;
y
<
area
.
height
;
y
+=
uiPelsInPart
)
...
@@ -316,12 +344,27 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
...
@@ -316,12 +344,27 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
if
(
cu
.
blocks
[
COMPONENT_Y
].
valid
())
if
(
cu
.
blocks
[
COMPONENT_Y
].
valid
())
{
{
#if L0074_SUBBLOCK_DEBLOCKING
if
(
mvSubBlocks
)
{
orthogonalIncrement
=
subBlockSize
/
4
;
orthogonalLength
=
(
edgeDir
==
EDGE_HOR
)
?
cu
.
blocks
[
COMPONENT_Y
].
height
/
4
:
cu
.
blocks
[
COMPONENT_Y
].
width
/
4
;
}
#endif
#if L0074_SUBBLOCK_DEBLOCKING
if
((
cu
.
blocks
[
COMPONENT_Y
].
height
>
64
)
&&
(
edgeDir
==
EDGE_HOR
)
&&
!
mvSubBlocks
)
#else
if
((
cu
.
blocks
[
COMPONENT_Y
].
height
>
64
)
&&
(
edgeDir
==
EDGE_HOR
))
if
((
cu
.
blocks
[
COMPONENT_Y
].
height
>
64
)
&&
(
edgeDir
==
EDGE_HOR
))
#endif
{
{
orthogonalIncrement
=
64
/
4
;
orthogonalIncrement
=
64
/
4
;
orthogonalLength
=
cu
.
blocks
[
COMPONENT_Y
].
height
/
4
;
orthogonalLength
=
cu
.
blocks
[
COMPONENT_Y
].
height
/
4
;
}
}
#if L0074_SUBBLOCK_DEBLOCKING
if
((
cu
.
blocks
[
COMPONENT_Y
].
width
>
64
)
&&
(
edgeDir
==
EDGE_VER
)
&&
!
mvSubBlocks
)
#else
if
((
cu
.
blocks
[
COMPONENT_Y
].
width
>
64
)
&&
(
edgeDir
==
EDGE_VER
))
if
((
cu
.
blocks
[
COMPONENT_Y
].
width
>
64
)
&&
(
edgeDir
==
EDGE_VER
))
#endif
{
{
orthogonalIncrement
=
64
/
4
;
orthogonalIncrement
=
64
/
4
;
orthogonalLength
=
cu
.
blocks
[
COMPONENT_Y
].
width
/
4
;
orthogonalLength
=
cu
.
blocks
[
COMPONENT_Y
].
width
/
4
;
...
...
source/Lib/CommonLib/TypeDef.h
View file @
8fa61a05
...
@@ -73,16 +73,7 @@
...
@@ -73,16 +73,7 @@
#define JVET_L0274 1
#define JVET_L0274 1
#define JVET_L0274_ENCODER_SPEED_UP ( 1 && JVET_L0274 ) // encoder speed-up by pre-calculating position dependent parameters
#define JVET_L0274_ENCODER_SPEED_UP ( 1 && JVET_L0274 ) // encoder speed-up by pre-calculating position dependent parameters
#define L0074_SUBBLOCK_DEBLOCKING 1
#define JVET_L0646_GBI 1 // Generalized bi-prediction (GBi)
#define JVET_L0646_GBI 1 // Generalized bi-prediction (GBi)
...
...
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