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_BMS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Custom Issue Tracker
Custom Issue Tracker
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jvet
VVCSoftware_BMS
Commits
07ef0d6c
Commit
07ef0d6c
authored
Sep 01, 2018
by
Xiang Li
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix merge error
parent
5617907f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
8 deletions
+0
-8
source/Lib/EncoderLib/EncGOP.cpp
source/Lib/EncoderLib/EncGOP.cpp
+0
-8
No files found.
source/Lib/EncoderLib/EncGOP.cpp
View file @
07ef0d6c
...
...
@@ -1763,14 +1763,6 @@ void EncGOP::compressGOP( int iPOCLast, int iNumPicRcvd, PicList& rcListPic,
refPicListModification
->
setRefPicListModificationFlagL1
(
0
);
pcSlice
->
setNumRefIdx
(
REF_PIC_LIST_0
,
std
::
min
(
m_pcCfg
->
getGOPEntry
(
iGOPid
).
m_numRefPicsActive
,
pcSlice
->
getRPS
()
->
getNumberOfPictures
()));
pcSlice
->
setNumRefIdx
(
REF_PIC_LIST_1
,
std
::
min
(
m_pcCfg
->
getGOPEntry
(
iGOPid
).
m_numRefPicsActive
,
pcSlice
->
getRPS
()
->
getNumberOfPictures
()));
#if JVET_K0076_CPR
if
(
pcSlice
->
getSPS
()
->
getSpsNext
().
getIBCMode
())
{
if
(
m_pcCfg
->
getIntraPeriod
()
>
0
&&
pcSlice
->
getPOC
()
%
m_pcCfg
->
getIntraPeriod
()
==
0
)
{
pcSlice
->
setNumRefIdx
(
REF_PIC_LIST_0
,
0
);
pcSlice
->
setNumRefIdx
(
REF_PIC_LIST_1
,
0
);
}
#if JVET_K0076_CPR
if
(
pcSlice
->
getSPS
()
->
getSpsNext
().
getIBCMode
())
{
...
...
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