Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VVCSoftware_VTM
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
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
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
jvet
VVCSoftware_VTM
Commits
6d0a1238
Commit
6d0a1238
authored
5 years ago
by
Philip Cowan
Browse files
Options
Downloads
Patches
Plain Diff
White space cleanup
parent
67649ca4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!933
JVET-O0179 : Nal unit syntax
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/Lib/CommonLib/NAL.h
+2
-2
2 additions, 2 deletions
source/Lib/CommonLib/NAL.h
source/Lib/DecoderLib/NALread.cpp
+4
-4
4 additions, 4 deletions
source/Lib/DecoderLib/NALread.cpp
with
6 additions
and
6 deletions
source/Lib/CommonLib/NAL.h
+
2
−
2
View file @
6d0a1238
...
...
@@ -60,8 +60,8 @@ struct NALUnit
,
m_temporalId
(
src
.
m_temporalId
)
,
m_nuhLayerId
(
src
.
m_nuhLayerId
)
#if JVET_O0179
,
m_forbiddenZeroBit
(
src
.
m_forbiddenZeroBit
)
,
m_nuhReservedZeroBit
(
src
.
m_nuhReservedZeroBit
)
,
m_forbiddenZeroBit
(
src
.
m_forbiddenZeroBit
)
,
m_nuhReservedZeroBit
(
src
.
m_nuhReservedZeroBit
)
#endif
{
}
/** construct an NALunit structure with given header values. */
...
...
This diff is collapsed.
Click to expand it.
source/Lib/DecoderLib/NALread.cpp
+
4
−
4
View file @
6d0a1238
...
...
@@ -142,16 +142,16 @@ void readNalUnitHeader(InputNALUnit& nalu)
// When zero_tid_required_flag is equal to 1, the value of nuh_temporal_id_plus1 shall be equal to 1.
CHECK
((
zeroTidRequiredFlag
==
1
)
&&
(
nalu
.
m_temporalId
!=
0
),
"Temporal ID is not '0' when zero tid is required."
);
uint32_t
nalUnitTypeLsb
=
bs
.
read
(
4
);
// nal_unit_type_lsb
nalu
.
m_nalUnitType
=
(
NalUnitType
)((
zeroTidRequiredFlag
<<
4
)
+
nalUnitTypeLsb
);
nalu
.
m_nuhLayerId
=
bs
.
read
(
7
);
// nuh_layer_id
#if EMULATION_PREVENTION_FIX
nalu
.
m_nalUnitType
=
(
NalUnitType
)
((
zeroTidRequiredFlag
<<
4
)
+
nalUnitTypeLsb
);
nalu
.
m_nuhLayerId
=
bs
.
read
(
7
);
// nuh_layer_id
#if EMULATION_PREVENTION_FIX
CHECK
(
nalu
.
m_nuhLayerId
==
0
,
"nuh_layer_id_plus1 must be greater than zero"
);
nalu
.
m_nuhLayerId
--
;
CHECK
(
nalu
.
m_nuhLayerId
>
125
,
"Layer ID out of range"
);
#else
CHECK
(
nalu
.
m_nuhLayerId
>
126
,
"Layer ID out of range"
);
#endif
uint32_t
nuh_reserved_zero_bit
=
bs
.
read
(
1
);
// nuh_reserved_zero_bit
uint32_t
nuh_reserved_zero_bit
=
bs
.
read
(
1
);
// nuh_reserved_zero_bit
CHECK
(
nuh_reserved_zero_bit
!=
0
,
"Reserved zero bit is not '0'"
);
#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