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
12
Merge Requests
12
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
08841363
Commit
08841363
authored
Feb 07, 2019
by
Frederic Barbier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Keep align syntax-element variable with trace
parent
2d67528b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
18 deletions
+18
-18
source/Lib/CommonLib/TypeDef.h
source/Lib/CommonLib/TypeDef.h
+3
-3
source/Lib/DecoderLib/VLCReader.cpp
source/Lib/DecoderLib/VLCReader.cpp
+4
-4
source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
+6
-6
source/Lib/EncoderLib/VLCWriter.cpp
source/Lib/EncoderLib/VLCWriter.cpp
+5
-5
No files found.
source/Lib/CommonLib/TypeDef.h
View file @
08841363
...
...
@@ -1587,7 +1587,7 @@ struct AlfSliceParam
short
filterCoeffDeltaIdx
[
MAX_NUM_ALF_CLASSES
];
// filter_coeff_delta[i]
bool
alfLumaCoeffFlag
[
MAX_NUM_ALF_CLASSES
];
// alf_luma_coeff_flag[i]
int
numLumaFilters
;
// number_of_filters_minus1 + 1
bool
coeffDeltaFlag
;
// alf_coefficients
_delta_flag
bool
alfLumaCoeffDeltaFlag
;
// alf_luma_coeff
_delta_flag
bool
alfLumaCoeffDeltaPredictionFlag
;
// alf_luma_coeff_delta_prediction_flag
std
::
vector
<
AlfFilterShape
>*
filterShapes
;
...
...
@@ -1599,7 +1599,7 @@ struct AlfSliceParam
std
::
memset
(
filterCoeffDeltaIdx
,
0
,
sizeof
(
filterCoeffDeltaIdx
)
);
std
::
memset
(
alfLumaCoeffFlag
,
true
,
sizeof
(
alfLumaCoeffFlag
)
);
numLumaFilters
=
1
;
c
oeffDeltaFlag
=
false
;
alfLumaC
oeffDeltaFlag
=
false
;
alfLumaCoeffDeltaPredictionFlag
=
false
;
}
...
...
@@ -1611,7 +1611,7 @@ struct AlfSliceParam
std
::
memcpy
(
filterCoeffDeltaIdx
,
src
.
filterCoeffDeltaIdx
,
sizeof
(
filterCoeffDeltaIdx
)
);
std
::
memcpy
(
alfLumaCoeffFlag
,
src
.
alfLumaCoeffFlag
,
sizeof
(
alfLumaCoeffFlag
)
);
numLumaFilters
=
src
.
numLumaFilters
;
coeffDeltaFlag
=
src
.
c
oeffDeltaFlag
;
alfLumaCoeffDeltaFlag
=
src
.
alfLumaC
oeffDeltaFlag
;
alfLumaCoeffDeltaPredictionFlag
=
src
.
alfLumaCoeffDeltaPredictionFlag
;
filterShapes
=
src
.
filterShapes
;
return
*
this
;
...
...
source/Lib/DecoderLib/VLCReader.cpp
View file @
08841363
...
...
@@ -2516,9 +2516,9 @@ void HLSyntaxReader::alfFilter( AlfSliceParam& alfSliceParam, const bool isChrom
if
(
!
isChroma
)
{
READ_FLAG
(
code
,
"alf_luma_coeff_delta_flag"
);
alfSliceParam
.
c
oeffDeltaFlag
=
code
;
alfSliceParam
.
alfLumaC
oeffDeltaFlag
=
code
;
if
(
!
alfSliceParam
.
c
oeffDeltaFlag
)
if
(
!
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
std
::
memset
(
alfSliceParam
.
alfLumaCoeffFlag
,
true
,
sizeof
(
alfSliceParam
.
alfLumaCoeffFlag
)
);
...
...
@@ -2558,7 +2558,7 @@ void HLSyntaxReader::alfFilter( AlfSliceParam& alfSliceParam, const bool isChrom
if
(
!
isChroma
)
{
if
(
alfSliceParam
.
c
oeffDeltaFlag
)
if
(
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
for
(
int
ind
=
0
;
ind
<
alfSliceParam
.
numLumaFilters
;
++
ind
)
{
...
...
@@ -2571,7 +2571,7 @@ void HLSyntaxReader::alfFilter( AlfSliceParam& alfSliceParam, const bool isChrom
// Filter coefficients
for
(
int
ind
=
0
;
ind
<
numFilters
;
++
ind
)
{
if
(
!
isChroma
&&
!
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
&&
alfSliceParam
.
c
oeffDeltaFlag
)
if
(
!
isChroma
&&
!
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
&&
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
memset
(
coeff
+
ind
*
MAX_NUM_ALF_LUMA_COEFF
,
0
,
sizeof
(
*
coeff
)
*
alfShape
.
numCoeff
);
continue
;
...
...
source/Lib/EncoderLib/EncAdaptiveLoopFilter.cpp
View file @
08841363
...
...
@@ -535,7 +535,7 @@ int EncAdaptiveLoopFilter::getCoeffRate( AlfSliceParam& alfSliceParam, bool isCh
if
(
!
isChroma
)
{
iBits
++
;
// alf_coefficients_delta_flag
if
(
!
alfSliceParam
.
c
oeffDeltaFlag
)
if
(
!
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
if
(
alfSliceParam
.
numLumaFilters
>
1
)
{
...
...
@@ -553,7 +553,7 @@ int EncAdaptiveLoopFilter::getCoeffRate( AlfSliceParam& alfSliceParam, bool isCh
// vlc for all
for
(
int
ind
=
0
;
ind
<
numFilters
;
++
ind
)
{
if
(
isChroma
||
!
alfSliceParam
.
c
oeffDeltaFlag
||
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
)
if
(
isChroma
||
!
alfSliceParam
.
alfLumaC
oeffDeltaFlag
||
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
)
{
for
(
int
i
=
0
;
i
<
alfShape
.
numCoeff
-
1
;
i
++
)
{
...
...
@@ -583,7 +583,7 @@ int EncAdaptiveLoopFilter::getCoeffRate( AlfSliceParam& alfSliceParam, bool isCh
if
(
!
isChroma
)
{
if
(
alfSliceParam
.
c
oeffDeltaFlag
)
if
(
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
iBits
+=
numFilters
;
//filter_coefficient_flag[i]
}
...
...
@@ -592,7 +592,7 @@ int EncAdaptiveLoopFilter::getCoeffRate( AlfSliceParam& alfSliceParam, bool isCh
// Filter coefficients
for
(
int
ind
=
0
;
ind
<
numFilters
;
++
ind
)
{
if
(
!
isChroma
&&
!
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
&&
alfSliceParam
.
c
oeffDeltaFlag
)
if
(
!
isChroma
&&
!
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
&&
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
continue
;
}
...
...
@@ -692,14 +692,14 @@ double EncAdaptiveLoopFilter::mergeFiltersAndCost( AlfSliceParam& alfSliceParam,
if
(
cost
<=
cost0
)
{
distReturn
=
dist
;
alfSliceParam
.
c
oeffDeltaFlag
=
0
;
alfSliceParam
.
alfLumaC
oeffDeltaFlag
=
0
;
uiCoeffBits
=
coeffBits
;
alfSliceParam
.
alfLumaCoeffDeltaPredictionFlag
=
bestPredMode
;
}
else
{
distReturn
=
distForce0
;
alfSliceParam
.
c
oeffDeltaFlag
=
1
;
alfSliceParam
.
alfLumaC
oeffDeltaFlag
=
1
;
uiCoeffBits
=
coeffBitsForce0
;
memcpy
(
alfSliceParam
.
alfLumaCoeffFlag
,
codedVarBins
,
sizeof
(
codedVarBins
)
);
alfSliceParam
.
alfLumaCoeffDeltaPredictionFlag
=
0
;
...
...
source/Lib/EncoderLib/VLCWriter.cpp
View file @
08841363
...
...
@@ -1788,8 +1788,8 @@ void HLSWriter::alfFilter( const AlfSliceParam& alfSliceParam, const bool isChro
{
if
(
!
isChroma
)
{
WRITE_FLAG
(
alfSliceParam
.
c
oeffDeltaFlag
,
"alf_luma_coeff_delta_flag"
);
if
(
!
alfSliceParam
.
c
oeffDeltaFlag
)
WRITE_FLAG
(
alfSliceParam
.
alfLumaC
oeffDeltaFlag
,
"alf_luma_coeff_delta_flag"
);
if
(
!
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
if
(
alfSliceParam
.
numLumaFilters
>
1
)
{
...
...
@@ -1808,7 +1808,7 @@ void HLSWriter::alfFilter( const AlfSliceParam& alfSliceParam, const bool isChro
// vlc for all
for
(
int
ind
=
0
;
ind
<
numFilters
;
++
ind
)
{
if
(
isChroma
||
!
alfSliceParam
.
c
oeffDeltaFlag
||
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
)
if
(
isChroma
||
!
alfSliceParam
.
alfLumaC
oeffDeltaFlag
||
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
)
{
for
(
int
i
=
0
;
i
<
alfShape
.
numCoeff
-
1
;
i
++
)
{
...
...
@@ -1838,7 +1838,7 @@ void HLSWriter::alfFilter( const AlfSliceParam& alfSliceParam, const bool isChro
if
(
!
isChroma
)
{
if
(
alfSliceParam
.
c
oeffDeltaFlag
)
if
(
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
for
(
int
ind
=
0
;
ind
<
numFilters
;
++
ind
)
{
...
...
@@ -1850,7 +1850,7 @@ void HLSWriter::alfFilter( const AlfSliceParam& alfSliceParam, const bool isChro
// Filter coefficients
for
(
int
ind
=
0
;
ind
<
numFilters
;
++
ind
)
{
if
(
!
isChroma
&&
!
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
&&
alfSliceParam
.
c
oeffDeltaFlag
)
if
(
!
isChroma
&&
!
alfSliceParam
.
alfLumaCoeffFlag
[
ind
]
&&
alfSliceParam
.
alfLumaC
oeffDeltaFlag
)
{
continue
;
}
...
...
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