Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
jvet
VVCSoftware_VTM
Commits
33b8bde5
Commit
33b8bde5
authored
Mar 14, 2019
by
Remy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert part of commit
d466acdb
to fix
#209
parent
57d15cf2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
source/Lib/DecoderLib/CABACReader.cpp
source/Lib/DecoderLib/CABACReader.cpp
+2
-2
source/Lib/EncoderLib/CABACWriter.cpp
source/Lib/EncoderLib/CABACWriter.cpp
+2
-2
No files found.
source/Lib/DecoderLib/CABACReader.cpp
View file @
33b8bde5
...
...
@@ -1185,8 +1185,8 @@ void CABACReader::pred_mode( CodingUnit& cu )
void
CABACReader
::
pcm_flag
(
CodingUnit
&
cu
,
Partitioner
&
partitioner
)
{
const
SPS
&
sps
=
*
cu
.
cs
->
sps
;
if
(
!
sps
.
getPCMEnabledFlag
()
||
cu
.
lwidth
()
>
(
1
<<
sps
.
getPCMLog2MaxSize
())
||
cu
.
lwidth
()
<
(
1
<<
sps
.
getPCMLog2MinSize
())
||
cu
.
lheight
()
>
(
1
<<
sps
.
getPCMLog2MaxSize
())
||
cu
.
lheight
()
<
(
1
<<
sps
.
getPCMLog2MinSize
())
)
if
(
!
sps
.
getPCMEnabledFlag
()
||
partitioner
.
currArea
()
.
lwidth
()
>
(
1
<<
sps
.
getPCMLog2MaxSize
())
||
partitioner
.
currArea
()
.
lwidth
()
<
(
1
<<
sps
.
getPCMLog2MinSize
())
||
partitioner
.
currArea
()
.
lheight
()
>
(
1
<<
sps
.
getPCMLog2MaxSize
())
||
partitioner
.
currArea
()
.
lheight
()
<
(
1
<<
sps
.
getPCMLog2MinSize
())
)
{
cu
.
ipcm
=
false
;
return
;
...
...
source/Lib/EncoderLib/CABACWriter.cpp
View file @
33b8bde5
...
...
@@ -921,8 +921,8 @@ void CABACWriter::pcm_data( const CodingUnit& cu, Partitioner& partitioner )
void
CABACWriter
::
pcm_flag
(
const
CodingUnit
&
cu
,
Partitioner
&
partitioner
)
{
const
SPS
&
sps
=
*
cu
.
cs
->
sps
;
if
(
!
sps
.
getPCMEnabledFlag
()
||
cu
.
lwidth
()
>
(
1
<<
sps
.
getPCMLog2MaxSize
())
||
cu
.
lwidth
()
<
(
1
<<
sps
.
getPCMLog2MinSize
())
||
cu
.
lheight
()
>
(
1
<<
sps
.
getPCMLog2MaxSize
())
||
cu
.
lheight
()
<
(
1
<<
sps
.
getPCMLog2MinSize
())
)
if
(
!
sps
.
getPCMEnabledFlag
()
||
partitioner
.
currArea
()
.
lwidth
()
>
(
1
<<
sps
.
getPCMLog2MaxSize
())
||
partitioner
.
currArea
()
.
lwidth
()
<
(
1
<<
sps
.
getPCMLog2MinSize
())
||
partitioner
.
currArea
()
.
lheight
()
>
(
1
<<
sps
.
getPCMLog2MaxSize
())
||
partitioner
.
currArea
()
.
lheight
()
<
(
1
<<
sps
.
getPCMLog2MinSize
())
)
{
return
;
}
...
...
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