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
16
Merge Requests
16
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
c7612e5c
Commit
c7612e5c
authored
Dec 21, 2018
by
Christian Helmrich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bit-stream switching issue (mismatches, see VVC ticket
#81
)
parent
10a973eb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
7 deletions
+16
-7
source/Lib/DecoderLib/DecLib.cpp
source/Lib/DecoderLib/DecLib.cpp
+7
-7
source/Lib/EncoderLib/EncSlice.cpp
source/Lib/EncoderLib/EncSlice.cpp
+9
-0
No files found.
source/Lib/DecoderLib/DecLib.cpp
View file @
c7612e5c
...
...
@@ -173,12 +173,6 @@ bool tryDecodePicture( Picture* pcEncPic, const int expectedPoc, const std::stri
pcEncPic
->
copySAO
(
*
pic
,
0
);
}
pcDecLib
->
executeLoopFilters
();
if
(
pic
->
cs
->
sps
->
getUseSAO
()
)
{
pcEncPic
->
copySAO
(
*
pic
,
1
);
}
if
(
pic
->
cs
->
sps
->
getUseALF
()
)
{
for
(
int
compIdx
=
0
;
compIdx
<
MAX_NUM_COMPONENT
;
compIdx
++
)
...
...
@@ -192,6 +186,12 @@ bool tryDecodePicture( Picture* pcEncPic, const int expectedPoc, const std::stri
}
}
pcDecLib
->
executeLoopFilters
();
if
(
pic
->
cs
->
sps
->
getUseSAO
()
)
{
pcEncPic
->
copySAO
(
*
pic
,
1
);
}
pcEncPic
->
cs
->
copyStructure
(
*
pic
->
cs
,
CH_L
,
true
,
true
);
if
(
CS
::
isDualITree
(
*
pcEncPic
->
cs
)
)
...
...
@@ -1088,7 +1088,7 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
pcSlice
->
checkCRA
(
pcSlice
->
getRPS
(),
m_pocCRA
,
m_associatedIRAPType
,
m_cListPic
);
// Set reference list
pcSlice
->
setRefPicList
(
m_cListPic
,
true
,
true
);
if
(
!
pcSlice
->
isIntra
())
{
bool
bLowDelay
=
true
;
...
...
source/Lib/EncoderLib/EncSlice.cpp
View file @
c7612e5c
...
...
@@ -1919,6 +1919,15 @@ void EncSlice::encodeSlice ( Picture* pcPic, OutputBitstream* pcSubstreams, ui
}
}
#endif
#if JVET_L0646_GBI
bool
updateGbiCodingOrder
=
cs
.
slice
->
getSliceType
()
==
B_SLICE
&&
ctuTsAddr
==
startCtuTsAddr
;
if
(
updateGbiCodingOrder
)
{
resetGbiCodingOrder
(
false
,
cs
);
}
#endif
m_CABACWriter
->
coding_tree_unit
(
cs
,
ctuArea
,
pcPic
->
m_prevQP
,
ctuRsAddr
);
#if HEVC_TILES_WPP
...
...
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