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
fb5d5e2b
Commit
fb5d5e2b
authored
Mar 06, 2019
by
Hendry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug in parameter set activation
parent
1286af0f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
2 deletions
+25
-2
source/Lib/CommonLib/Slice.cpp
source/Lib/CommonLib/Slice.cpp
+7
-0
source/Lib/CommonLib/Slice.h
source/Lib/CommonLib/Slice.h
+3
-0
source/Lib/DecoderLib/DecLib.cpp
source/Lib/DecoderLib/DecLib.cpp
+6
-1
source/Lib/DecoderLib/VLCReader.cpp
source/Lib/DecoderLib/VLCReader.cpp
+5
-1
source/Lib/EncoderLib/VLCWriter.cpp
source/Lib/EncoderLib/VLCWriter.cpp
+4
-0
No files found.
source/Lib/CommonLib/Slice.cpp
View file @
fb5d5e2b
...
...
@@ -2854,6 +2854,13 @@ void xTracePPSHeader()
DTRACE
(
g_trace_ctx
,
D_HEADER
,
"=========== Picture Parameter Set ===========
\n
"
);
}
#if JVET_M0132
void
xTraceAPSHeader
()
{
DTRACE
(
g_trace_ctx
,
D_HEADER
,
"=========== Adaptation Parameter Set ===========
\n
"
);
}
#endif
void
xTraceSliceHeader
()
{
DTRACE
(
g_trace_ctx
,
D_HEADER
,
"=========== Slice ===========
\n
"
);
...
...
source/Lib/CommonLib/Slice.h
View file @
fb5d5e2b
...
...
@@ -2383,6 +2383,9 @@ void xTraceVPSHeader();
#endif
void
xTraceSPSHeader
();
void
xTracePPSHeader
();
#if JVET_M0132
void
xTraceAPSHeader
();
#endif
void
xTraceSliceHeader
();
void
xTraceAccessUnitDelimiter
();
#endif
...
...
source/Lib/DecoderLib/DecLib.cpp
View file @
fb5d5e2b
...
...
@@ -759,6 +759,11 @@ void DecLib::xActivateParameterSets()
m_parameterSetManager
.
clearSPSChangedFlag
(
sps
->
getSPSId
());
m_parameterSetManager
.
clearPPSChangedFlag
(
pps
->
getPPSId
());
#if JVET_M0132 //Hendry
if
(
aps
!=
0
)
m_parameterSetManager
.
clearAPSChangedFlag
(
aps
->
getAPSId
());
#endif
if
(
false
==
m_parameterSetManager
.
activatePPS
(
m_apcSlicePilot
->
getPPSId
(),
m_apcSlicePilot
->
isIRAP
()))
{
THROW
(
"Parameter set activation failed!"
);
...
...
@@ -905,7 +910,7 @@ void DecLib::xActivateParameterSets()
EXIT
(
"Error - a new PPS has been decoded while processing a picture"
);
}
#if JVET_M0132
if
(
m_parameterSetManager
.
getAPSChangedFlag
(
aps
->
getAPSId
()))
if
(
aps
&&
m_parameterSetManager
.
getAPSChangedFlag
(
aps
->
getAPSId
()))
{
EXIT
(
"Error - a new APS has been decoded while processing a picture"
);
}
...
...
source/Lib/DecoderLib/VLCReader.cpp
View file @
fb5d5e2b
...
...
@@ -610,12 +610,15 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS )
#if JVET_M0132
void
HLSyntaxReader
::
parseAPS
(
APS
*
aps
)
{
#if ENABLE_TRACING
xTraceAPSHeader
();
#endif
uint32_t
code
;
READ_CODE
(
5
,
code
,
"adaptation_parameter_set_id"
);
aps
->
setAPSId
(
code
);
//uint32_t code = 1;
AlfSliceParam
param
=
aps
->
getAlfAPSParam
();
param
.
enabledFlag
[
COMPONENT_Y
]
=
true
;
...
...
@@ -649,6 +652,7 @@ void HLSyntaxReader::parseAPS(APS* aps)
xReadRbspTrailingBits
();
}
#endif
void
HLSyntaxReader
::
parseVUI
(
VUI
*
pcVUI
,
SPS
*
pcSPS
)
{
#if ENABLE_TRACING
...
...
source/Lib/EncoderLib/VLCWriter.cpp
View file @
fb5d5e2b
...
...
@@ -368,6 +368,10 @@ void HLSWriter::codePPS( const PPS* pcPPS )
#if JVET_M0132
void
HLSWriter
::
codeAPS
(
APS
*
pcAPS
)
{
#if ENABLE_TRACING
xTraceAPSHeader
();
#endif
AlfSliceParam
param
=
pcAPS
->
getAlfAPSParam
();
WRITE_CODE
(
pcAPS
->
getAPSId
(),
5
,
"adaptation_parameter_set_id"
);
...
...
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