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
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
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
Xiaoyu Xiu
VVCSoftware_VTM
Commits
2e638a39
Commit
2e638a39
authored
Jul 10, 2020
by
Zhipin Deng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove legacy chromaArrayType
parent
0f8d17ac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
7 deletions
+15
-7
source/Lib/DecoderLib/VLCReader.cpp
source/Lib/DecoderLib/VLCReader.cpp
+8
-2
source/Lib/EncoderLib/EncLib.cpp
source/Lib/EncoderLib/EncLib.cpp
+2
-2
source/Lib/EncoderLib/VLCWriter.cpp
source/Lib/EncoderLib/VLCWriter.cpp
+5
-3
No files found.
source/Lib/DecoderLib/VLCReader.cpp
View file @
2e638a39
...
...
@@ -1358,8 +1358,6 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
#if !JVET_S0052_RM_SEPARATE_COLOUR_PLANE
const
uint32_t
chromaArrayType
=
(
int
)
pcSPS
->
getSeparateColourPlaneFlag
()
?
0
:
pcSPS
->
getChromaFormatIdc
();
#else
const
uint32_t
chromaArrayType
=
(
int
)
pcSPS
->
getChromaFormatIdc
();
#endif
READ_CODE
(
2
,
uiCode
,
"sps_log2_ctu_size_minus5"
);
pcSPS
->
setCTUSize
(
1
<<
(
uiCode
+
5
));
...
...
@@ -1638,7 +1636,11 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
READ_FLAG
(
uiCode
,
"sps_lfnst_enabled_flag"
);
pcSPS
->
setUseLFNST
(
uiCode
!=
0
);
#endif
#if JVET_S0052_RM_SEPARATE_COLOUR_PLANE
if
(
pcSPS
->
getChromaFormatIdc
()
!=
CHROMA_400
)
#else
if
(
chromaArrayType
!=
CHROMA_400
)
#endif
{
READ_FLAG
(
uiCode
,
"sps_joint_cbcr_enabled_flag"
);
pcSPS
->
setJointCbCrEnabledFlag
(
uiCode
?
true
:
false
);
ChromaQpMappingTableParams
chromaQpMappingTableParams
;
...
...
@@ -1874,7 +1876,11 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
}
#endif
READ_FLAG
(
uiCode
,
"sps_palette_enabled_flag"
);
pcSPS
->
setPLTMode
(
uiCode
!=
0
);
#if JVET_S0052_RM_SEPARATE_COLOUR_PLANE
if
(
pcSPS
->
getChromaFormatIdc
()
==
CHROMA_444
&&
pcSPS
->
getLog2MaxTbSize
()
!=
6
)
#else
if
(
chromaArrayType
==
CHROMA_444
&&
pcSPS
->
getLog2MaxTbSize
()
!=
6
)
#endif
{
READ_FLAG
(
uiCode
,
"sps_act_enabled_flag"
);
pcSPS
->
setUseColorTrans
(
uiCode
!=
0
);
}
...
...
source/Lib/EncoderLib/EncLib.cpp
View file @
2e638a39
...
...
@@ -1724,10 +1724,10 @@ void EncLib::xInitPPS(PPS &pps, const SPS &sps)
}
#if !JVET_S0052_RM_SEPARATE_COLOUR_PLANE
const
uint32_t
chromaArrayType
=
(
int
)
sps
.
getSeparateColourPlaneFlag
()
?
0
:
sps
.
getChromaFormatIdc
();
if
(
(
chromaArrayType
!=
CHROMA_400
)
&&
(
chromaQPOffsetNotZero
||
chromaDbfOffsetNotSameAsLuma
)
)
#else
const
uint32_t
chromaArrayType
=
(
int
)
sps
.
getChromaFormatIdc
();
if
((
sps
.
getChromaFormatIdc
()
!=
CHROMA_400
)
&&
(
chromaQPOffsetNotZero
||
chromaDbfOffsetNotSameAsLuma
))
#endif
if
(
(
chromaArrayType
!=
CHROMA_400
)
&&
(
chromaQPOffsetNotZero
||
chromaDbfOffsetNotSameAsLuma
)
)
{
pps
.
setPPSChromaToolFlag
(
true
);
}
...
...
source/Lib/EncoderLib/VLCWriter.cpp
View file @
2e638a39
...
...
@@ -788,8 +788,8 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_FLAG
(
pcSPS
->
getGDREnabledFlag
(),
"gdr_enabled_flag"
);
WRITE_CODE
(
int
(
pcSPS
->
getChromaFormatIdc
()),
2
,
"chroma_format_idc"
);
const
ChromaFormat
format
=
pcSPS
->
getChromaFormatIdc
();
#if !JVET_S0052_RM_SEPARATE_COLOUR_PLANE
const
ChromaFormat
format
=
pcSPS
->
getChromaFormatIdc
();
const
uint32_t
separate_colour_plane_flag
=
pcSPS
->
getSeparateColourPlaneFlag
();
if
(
format
==
CHROMA_444
)
{
...
...
@@ -798,8 +798,6 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
}
const
uint32_t
chromaArrayType
=
separate_colour_plane_flag
?
0
:
format
;
#else
const
uint32_t
chromaArrayType
=
format
;
#endif
WRITE_FLAG
(
pcSPS
->
getRprEnabledFlag
(),
"ref_pic_resampling_enabled_flag"
);
...
...
@@ -971,7 +969,11 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_FLAG
(
pcSPS
->
getUseLFNST
()
?
1
:
0
,
"sps_lfnst_enabled_flag"
);
#endif
#if JVET_S0052_RM_SEPARATE_COLOUR_PLANE
if
(
pcSPS
->
getChromaFormatIdc
()
!=
CHROMA_400
)
#else
if
(
chromaArrayType
!=
CHROMA_400
)
#endif
{
WRITE_FLAG
(
pcSPS
->
getJointCbCrEnabledFlag
(),
"sps_joint_cbcr_enabled_flag"
);
const
ChromaQpMappingTable
&
chromaQpMappingTable
=
pcSPS
->
getChromaQpMappingTable
();
...
...
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