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
43b61c85
Commit
43b61c85
authored
6 years ago
by
Frank Bossen
Browse files
Options
Downloads
Plain Diff
Merge branch 'l0686' into 'master'
Fix issue with tile groups See merge request
jvet/VVCSoftware_VTM!148
parents
30c40ac3
1cad5706
No related branches found
No related tags found
1 merge request
!148
Fix issue with tile groups
Pipeline
#498
passed
6 years ago
Stage: external
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/Lib/DecoderLib/DecSlice.cpp
+3
-1
3 additions, 1 deletion
source/Lib/DecoderLib/DecSlice.cpp
with
3 additions
and
1 deletion
source/Lib/DecoderLib/DecSlice.cpp
+
3
−
1
View file @
43b61c85
...
@@ -114,6 +114,8 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream )
...
@@ -114,6 +114,8 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream )
#endif
#endif
#if HEVC_DEPENDENT_SLICES
#if HEVC_DEPENDENT_SLICES
const
int
startCtuRsAddr
=
startCtuTsAddr
;
const
int
startCtuRsAddr
=
startCtuTsAddr
;
#elif HEVC_TILES_WPP
const
int
startCtuRsAddr
=
tileMap
.
getCtuTsToRsAddrMap
(
startCtuTsAddr
);
#endif
#endif
const
unsigned
numCtusInFrame
=
cs
.
pcv
->
sizeInCtus
;
const
unsigned
numCtusInFrame
=
cs
.
pcv
->
sizeInCtus
;
const
unsigned
widthInCtus
=
cs
.
pcv
->
widthInCtus
;
const
unsigned
widthInCtus
=
cs
.
pcv
->
widthInCtus
;
...
@@ -145,7 +147,7 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream )
...
@@ -145,7 +147,7 @@ void DecSlice::decompressSlice( Slice* slice, InputBitstream* bitstream )
#if HEVC_DEPENDENT_SLICES
#if HEVC_DEPENDENT_SLICES
const
unsigned
subStreamOffset
=
tileMap
.
getSubstreamForCtuAddr
(
startCtuRsAddr
,
true
,
slice
);
const
unsigned
subStreamOffset
=
tileMap
.
getSubstreamForCtuAddr
(
startCtuRsAddr
,
true
,
slice
);
#elif HEVC_TILES_WPP
#elif HEVC_TILES_WPP
const
unsigned
subStreamOffset
=
0
;
const
unsigned
subStreamOffset
=
tileMap
.
getSubstreamForCtuAddr
(
startCtuRsAddr
,
true
,
slice
)
;
#endif
#endif
#if HEVC_DEPENDENT_SLICES
#if HEVC_DEPENDENT_SLICES
...
...
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