Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VVCSoftware_VTM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xianglin Wang
VVCSoftware_VTM
Commits
06e6ad8b
Commit
06e6ad8b
authored
6 years ago
by
Karsten Suehring
Browse files
Options
Downloads
Patches
Plain Diff
remove macro L0074_SUBBLOCK_DEBLOCKING
parent
1dd480e3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/Lib/CommonLib/LoopFilter.cpp
+0
-31
0 additions, 31 deletions
source/Lib/CommonLib/LoopFilter.cpp
source/Lib/CommonLib/TypeDef.h
+0
-36
0 additions, 36 deletions
source/Lib/CommonLib/TypeDef.h
with
0 additions
and
67 deletions
source/Lib/CommonLib/LoopFilter.cpp
+
0
−
31
View file @
06e6ad8b
...
...
@@ -250,10 +250,8 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
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
)
)
{
const
Area
&
areaPu
=
cu
.
Y
().
valid
()
?
currPU
.
block
(
COMPONENT_Y
)
:
area
;
...
...
@@ -263,7 +261,6 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
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
);
#if L0074_SUBBLOCK_DEBLOCKING
if
((
currPU
.
mergeFlag
&&
(
currPU
.
mergeType
==
MRG_TYPE_SUBPU_ATMVP
))
||
cu
.
affine
)
{
mvSubBlocks
=
true
;
...
...
@@ -284,26 +281,8 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
}
}
}
#endif
}
#if !L0074_SUBBLOCK_DEBLOCKING
if
(
cu
.
affine
)
{
const
int
widthInBaseUnits
=
cu
.
Y
().
width
>>
pcv
.
minCUWidthLog2
;
for
(
uint32_t
edgeIdx
=
1
;
edgeIdx
<
widthInBaseUnits
;
edgeIdx
++
)
{
const
Area
affiBlockV
(
cu
.
Y
().
x
+
edgeIdx
*
pcv
.
minCUWidth
,
cu
.
Y
().
y
,
pcv
.
minCUWidth
,
cu
.
Y
().
height
);
xSetEdgefilterMultiple
(
cu
,
EDGE_VER
,
affiBlockV
,
m_stLFCUParam
.
internalEdge
,
1
);
}
const
int
heightInBaseUnits
=
cu
.
Y
().
height
>>
pcv
.
minCUHeightLog2
;
for
(
uint32_t
edgeIdx
=
1
;
edgeIdx
<
heightInBaseUnits
;
edgeIdx
++
)
{
const
Area
affiBlockH
(
cu
.
Y
().
x
,
cu
.
Y
().
y
+
edgeIdx
*
pcv
.
minCUHeight
,
cu
.
Y
().
width
,
pcv
.
minCUHeight
);
xSetEdgefilterMultiple
(
cu
,
EDGE_HOR
,
affiBlockH
,
m_stLFCUParam
.
internalEdge
,
1
);
}
}
#endif
const
unsigned
uiPelsInPart
=
pcv
.
minCUWidth
;
for
(
int
y
=
0
;
y
<
area
.
height
;
y
+=
uiPelsInPart
)
...
...
@@ -337,27 +316,17 @@ void LoopFilter::xDeblockCU( CodingUnit& cu, const DeblockEdgeDir edgeDir )
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
))
#endif
{
orthogonalIncrement
=
64
/
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
))
#endif
{
orthogonalIncrement
=
64
/
4
;
orthogonalLength
=
cu
.
blocks
[
COMPONENT_Y
].
width
/
4
;
...
...
This diff is collapsed.
Click to expand it.
source/Lib/CommonLib/TypeDef.h
+
0
−
36
View file @
06e6ad8b
...
...
@@ -52,45 +52,9 @@
#define TRAINED_CABAC_INIT_TABLES 1 // Trained values for VTM3
#define JVET_L0090_PAIR_AVG 1 // Add pairwise average candidates, replace HEVC combined candidates
#define L0074_SUBBLOCK_DEBLOCKING 1
#define REUSE_CU_RESULTS 1
#ifndef JVET_B0051_NON_MPM_MODE
#define JVET_B0051_NON_MPM_MODE ( 1 && JEM_TOOLS )
#endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment