Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
VVCSoftware_VTM
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Keming Cao
VVCSoftware_VTM
Commits
cf210b0e
Commit
cf210b0e
authored
4 years ago
by
Karsten Suehring
Browse files
Options
Downloads
Patches
Plain Diff
fix indentation after !1598
parent
b0125f88
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/DecoderLib/SEIread.cpp
+20
-20
20 additions, 20 deletions
source/Lib/DecoderLib/SEIread.cpp
source/Lib/EncoderLib/SEIwrite.cpp
+15
-15
15 additions, 15 deletions
source/Lib/EncoderLib/SEIwrite.cpp
with
35 additions
and
35 deletions
source/Lib/DecoderLib/SEIread.cpp
+
20
−
20
View file @
cf210b0e
...
@@ -899,40 +899,40 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
...
@@ -899,40 +899,40 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
if
(
sei
.
m_numDecodingUnitsMinus1
>
0
)
if
(
sei
.
m_numDecodingUnitsMinus1
>
0
)
{
{
#endif
#endif
sei_read_flag
(
pDecodedMessageOutputStream
,
symbol
,
"du_common_cpb_removal_delay_flag"
);
sei_read_flag
(
pDecodedMessageOutputStream
,
symbol
,
"du_common_cpb_removal_delay_flag"
);
sei
.
m_duCommonCpbRemovalDelayFlag
=
symbol
;
sei
.
m_duCommonCpbRemovalDelayFlag
=
symbol
;
if
(
sei
.
m_duCommonCpbRemovalDelayFlag
)
if
(
sei
.
m_duCommonCpbRemovalDelayFlag
)
{
for
(
int
i
=
temporalId
;
i
<
bp
.
m_bpMaxSubLayers
-
1
;
i
++
)
{
{
if
(
sei
.
m_ptSubLayerDelaysPresentFlag
[
i
]
)
for
(
int
i
=
temporalId
;
i
<
bp
.
m_bpMaxSubLayers
-
1
;
i
++
)
{
{
sei_read_code
(
pDecodedMessageOutputStream
,
bp
.
getDuCpbRemovalDelayIncrementLength
(),
symbol
,
"du_common_cpb_removal_delay_increment_minus1[i]"
);
if
(
sei
.
m_ptSubLayerDelaysPresentFlag
[
i
]
)
sei
.
m_duCommonCpbRemovalDelayMinus1
[
i
]
=
symbol
;
{
sei_read_code
(
pDecodedMessageOutputStream
,
bp
.
getDuCpbRemovalDelayIncrementLength
(),
symbol
,
"du_common_cpb_removal_delay_increment_minus1[i]"
);
sei
.
m_duCommonCpbRemovalDelayMinus1
[
i
]
=
symbol
;
}
}
}
}
}
}
for
(
int
i
=
0
;
i
<=
sei
.
m_numDecodingUnitsMinus1
;
i
++
)
for
(
int
i
=
0
;
i
<=
sei
.
m_numDecodingUnitsMinus1
;
i
++
)
{
sei_read_uvlc
(
pDecodedMessageOutputStream
,
symbol
,
"num_nalus_in_du_minus1[i]"
);
sei
.
m_numNalusInDuMinus1
[
i
]
=
symbol
;
if
(
!
sei
.
m_duCommonCpbRemovalDelayFlag
&&
i
<
sei
.
m_numDecodingUnitsMinus1
)
{
{
for
(
int
j
=
temporalId
;
j
<
bp
.
m_bpMaxSubLayers
-
1
;
j
++
)
sei_read_uvlc
(
pDecodedMessageOutputStream
,
symbol
,
"num_nalus_in_du_minus1[i]"
);
sei
.
m_numNalusInDuMinus1
[
i
]
=
symbol
;
if
(
!
sei
.
m_duCommonCpbRemovalDelayFlag
&&
i
<
sei
.
m_numDecodingUnitsMinus1
)
{
{
if
(
sei
.
m_ptSubLayerDelaysPresentFlag
[
j
]
)
for
(
int
j
=
temporalId
;
j
<
bp
.
m_bpMaxSubLayers
-
1
;
j
++
)
{
{
sei_read_code
(
pDecodedMessageOutputStream
,
bp
.
getDuCpbRemovalDelayIncrementLength
(),
symbol
,
"du_cpb_removal_delay_increment_minus1[i][j]"
);
if
(
sei
.
m_ptSubLayerDelaysPresentFlag
[
j
]
)
sei
.
m_duCpbRemovalDelayMinus1
[
i
*
bp
.
m_bpMaxSubLayers
+
j
]
=
symbol
;
{
sei_read_code
(
pDecodedMessageOutputStream
,
bp
.
getDuCpbRemovalDelayIncrementLength
(),
symbol
,
"du_cpb_removal_delay_increment_minus1[i][j]"
);
sei
.
m_duCpbRemovalDelayMinus1
[
i
*
bp
.
m_bpMaxSubLayers
+
j
]
=
symbol
;
}
}
}
}
}
}
}
}
#if JVET_R0103_DU_SIGNALLING
#if JVET_R0103_DU_SIGNALLING
}
}
else
else
{
{
sei
.
m_duCommonCpbRemovalDelayFlag
=
0
;
sei
.
m_duCommonCpbRemovalDelayFlag
=
0
;
}
}
#endif
#endif
}
}
...
...
This diff is collapsed.
Click to expand it.
source/Lib/EncoderLib/SEIwrite.cpp
+
15
−
15
View file @
cf210b0e
...
@@ -439,27 +439,27 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf
...
@@ -439,27 +439,27 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf
if
(
sei
.
m_numDecodingUnitsMinus1
>
0
)
if
(
sei
.
m_numDecodingUnitsMinus1
>
0
)
{
{
#endif
#endif
WRITE_FLAG
(
sei
.
m_duCommonCpbRemovalDelayFlag
,
"du_commmon_cpb_removal_delay_flag"
);
WRITE_FLAG
(
sei
.
m_duCommonCpbRemovalDelayFlag
,
"du_commmon_cpb_removal_delay_flag"
);
if
(
sei
.
m_duCommonCpbRemovalDelayFlag
)
if
(
sei
.
m_duCommonCpbRemovalDelayFlag
)
{
for
(
int
i
=
temporalId
;
i
<
bp
.
m_bpMaxSubLayers
-
1
;
i
++
)
{
{
if
(
sei
.
m_ptSubLayerDelaysPresentFlag
[
i
]
)
for
(
int
i
=
temporalId
;
i
<
bp
.
m_bpMaxSubLayers
-
1
;
i
++
)
WRITE_CODE
(
sei
.
m_duCommonCpbRemovalDelayMinus1
[
i
],
bp
.
m_duCpbRemovalDelayIncrementLength
,
"du_common_cpb_removal_delay_increment_minus1[i]"
);
{
if
(
sei
.
m_ptSubLayerDelaysPresentFlag
[
i
]
)
WRITE_CODE
(
sei
.
m_duCommonCpbRemovalDelayMinus1
[
i
],
bp
.
m_duCpbRemovalDelayIncrementLength
,
"du_common_cpb_removal_delay_increment_minus1[i]"
);
}
}
}
}
for
(
int
i
=
0
;
i
<=
sei
.
m_numDecodingUnitsMinus1
;
i
++
)
for
(
int
i
=
0
;
i
<=
sei
.
m_numDecodingUnitsMinus1
;
i
++
)
{
WRITE_UVLC
(
sei
.
m_numNalusInDuMinus1
[
i
],
"num_nalus_in_du_minus1[i]"
);
if
(
!
sei
.
m_duCommonCpbRemovalDelayFlag
&&
i
<
sei
.
m_numDecodingUnitsMinus1
)
{
{
for
(
int
j
=
temporalId
;
j
<
bp
.
m_bpMaxSubLayers
-
1
;
j
++
)
WRITE_UVLC
(
sei
.
m_numNalusInDuMinus1
[
i
],
"num_nalus_in_du_minus1[i]"
);
if
(
!
sei
.
m_duCommonCpbRemovalDelayFlag
&&
i
<
sei
.
m_numDecodingUnitsMinus1
)
{
{
if
(
sei
.
m_ptSubLayerDelaysPresentFlag
[
j
]
)
for
(
int
j
=
temporalId
;
j
<
bp
.
m_bpMaxSubLayers
-
1
;
j
++
)
WRITE_CODE
(
sei
.
m_duCpbRemovalDelayMinus1
[
i
*
bp
.
m_bpMaxSubLayers
+
j
],
bp
.
m_duCpbRemovalDelayIncrementLength
,
"du_cpb_removal_delay_increment_minus1[i][j]"
);
{
if
(
sei
.
m_ptSubLayerDelaysPresentFlag
[
j
]
)
WRITE_CODE
(
sei
.
m_duCpbRemovalDelayMinus1
[
i
*
bp
.
m_bpMaxSubLayers
+
j
],
bp
.
m_duCpbRemovalDelayIncrementLength
,
"du_cpb_removal_delay_increment_minus1[i][j]"
);
}
}
}
}
}
}
#if JVET_R0103_DU_SIGNALLING
#if JVET_R0103_DU_SIGNALLING
}
}
#endif
#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