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
1663259c
Commit
1663259c
authored
2 years ago
by
Christian Bartnik
Browse files
Options
Downloads
Patches
Plain Diff
applied MR comment changed variable type
parent
d63caf0c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2413
Fixes in SubpicMergeApp for NumSubPics and SubPicId setters
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
source/App/SubpicMergeApp/SubpicMergeApp.cpp
+4
-4
4 additions, 4 deletions
source/App/SubpicMergeApp/SubpicMergeApp.cpp
source/App/SubpicMergeApp/SubpicMergeApp.h
+1
-1
1 addition, 1 deletion
source/App/SubpicMergeApp/SubpicMergeApp.h
with
5 additions
and
5 deletions
source/App/SubpicMergeApp/SubpicMergeApp.cpp
+
4
−
4
View file @
1663259c
...
@@ -498,9 +498,9 @@ void SubpicMergeApp::generateMergedStreamVPSes(std::vector<VPS*> &vpsList)
...
@@ -498,9 +498,9 @@ void SubpicMergeApp::generateMergedStreamVPSes(std::vector<VPS*> &vpsList)
/**
/**
- Return subpicture ID length in bits
- Return subpicture ID length in bits
*/
*/
int
SubpicMergeApp
::
computeSubPicIdLen
(
int
numSubpics
)
u
int
32_t
SubpicMergeApp
::
computeSubPicIdLen
(
u
int
32_t
numSubpics
)
{
{
int
subPicIdLen
=
1
;
u
int
32_t
subPicIdLen
=
1
;
while
((
1
<<
subPicIdLen
)
<
numSubpics
)
while
((
1
<<
subPicIdLen
)
<
numSubpics
)
{
{
...
@@ -515,7 +515,7 @@ int SubpicMergeApp::computeSubPicIdLen(int numSubpics)
...
@@ -515,7 +515,7 @@ int SubpicMergeApp::computeSubPicIdLen(int numSubpics)
*/
*/
void
SubpicMergeApp
::
generateMergedStreamSPSes
(
std
::
vector
<
SPS
*>
&
spsList
)
void
SubpicMergeApp
::
generateMergedStreamSPSes
(
std
::
vector
<
SPS
*>
&
spsList
)
{
{
int
numSubPics
=
(
int
)
m_subpics
->
size
();
u
int
32_t
numSubPics
=
(
u
int
32_t
)
m_subpics
->
size
();
for
(
auto
&
subpic
:
*
m_subpics
)
for
(
auto
&
subpic
:
*
m_subpics
)
{
{
...
@@ -535,7 +535,7 @@ void SubpicMergeApp::generateMergedStreamSPSes(std::vector<SPS*> &spsList)
...
@@ -535,7 +535,7 @@ void SubpicMergeApp::generateMergedStreamSPSes(std::vector<SPS*> &spsList)
sps
.
setMaxPicHeightInLumaSamples
(
m_picHeight
);
sps
.
setMaxPicHeightInLumaSamples
(
m_picHeight
);
sps
.
setSubPicInfoPresentFlag
(
true
);
sps
.
setSubPicInfoPresentFlag
(
true
);
sps
.
setNumSubPics
(
(
uint32_t
)
numSubPics
);
sps
.
setNumSubPics
(
numSubPics
);
sps
.
setSubPicIdLen
(
computeSubPicIdLen
(
numSubPics
+
1
));
sps
.
setSubPicIdLen
(
computeSubPicIdLen
(
numSubPics
+
1
));
sps
.
setSubPicIdMappingExplicitlySignalledFlag
(
true
);
sps
.
setSubPicIdMappingExplicitlySignalledFlag
(
true
);
sps
.
setSubPicIdMappingPresentFlag
(
true
);
sps
.
setSubPicIdMappingPresentFlag
(
true
);
...
...
This diff is collapsed.
Click to expand it.
source/App/SubpicMergeApp/SubpicMergeApp.h
+
1
−
1
View file @
1663259c
...
@@ -100,7 +100,7 @@ private:
...
@@ -100,7 +100,7 @@ private:
void
decodeNalu
(
Subpicture
&
subpic
,
InputNALUnit
&
nalu
,
SEI
*&
decodePictureHashSei
);
void
decodeNalu
(
Subpicture
&
subpic
,
InputNALUnit
&
nalu
,
SEI
*&
decodePictureHashSei
);
void
parseSubpic
(
Subpicture
&
subpic
,
bool
&
morePictures
);
void
parseSubpic
(
Subpicture
&
subpic
,
bool
&
morePictures
);
void
generateMergedStreamVPSes
(
std
::
vector
<
VPS
*>
&
vpsList
);
void
generateMergedStreamVPSes
(
std
::
vector
<
VPS
*>
&
vpsList
);
int
computeSubPicIdLen
(
int
numSubpics
);
u
int
32_t
computeSubPicIdLen
(
u
int
32_t
numSubpics
);
void
generateMergedStreamSPSes
(
std
::
vector
<
SPS
*>
&
spsList
);
void
generateMergedStreamSPSes
(
std
::
vector
<
SPS
*>
&
spsList
);
void
getTileDimensions
(
std
::
vector
<
int
>
&
tileWidths
,
std
::
vector
<
int
>
&
tileHeights
);
void
getTileDimensions
(
std
::
vector
<
int
>
&
tileWidths
,
std
::
vector
<
int
>
&
tileHeights
);
void
generateMergedStreamPPSes
(
ParameterSetManager
&
psManager
,
std
::
vector
<
PPS
*>
&
ppsList
);
void
generateMergedStreamPPSes
(
ParameterSetManager
&
psManager
,
std
::
vector
<
PPS
*>
&
ppsList
);
...
...
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