Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
920bca3e
Commit
920bca3e
authored
Nov 15, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hevc: do not store pcm_flag in the context
It does not need to be accessed outside of hls_coding_unit().
parent
c00365b4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
6 deletions
+5
-6
hevc.c
libavcodec/hevc.c
+5
-4
hevc.h
libavcodec/hevc.h
+0
-2
No files found.
libavcodec/hevc.c
View file @
920bca3e
...
...
@@ -2065,7 +2065,6 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
lc
->
cu
.
pred_mode
=
MODE_INTRA
;
lc
->
cu
.
part_mode
=
PART_2Nx2N
;
lc
->
cu
.
intra_split_flag
=
0
;
lc
->
cu
.
pcm_flag
=
0
;
SAMPLE_CTB
(
s
->
skip_flag
,
x_cb
,
y_cb
)
=
0
;
for
(
x
=
0
;
x
<
4
;
x
++
)
...
...
@@ -2096,6 +2095,8 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
if
(
!
s
->
sh
.
disable_deblocking_filter_flag
)
ff_hevc_deblocking_boundary_strengths
(
s
,
x0
,
y0
,
log2_cb_size
);
}
else
{
int
pcm_flag
=
0
;
if
(
s
->
sh
.
slice_type
!=
I_SLICE
)
lc
->
cu
.
pred_mode
=
ff_hevc_pred_mode_decode
(
s
);
if
(
lc
->
cu
.
pred_mode
!=
MODE_INTRA
||
...
...
@@ -2109,9 +2110,9 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
if
(
lc
->
cu
.
part_mode
==
PART_2Nx2N
&&
s
->
sps
->
pcm_enabled_flag
&&
log2_cb_size
>=
s
->
sps
->
pcm
.
log2_min_pcm_cb_size
&&
log2_cb_size
<=
s
->
sps
->
pcm
.
log2_max_pcm_cb_size
)
{
lc
->
cu
.
pcm_flag
=
ff_hevc_pcm_flag_decode
(
s
);
pcm_flag
=
ff_hevc_pcm_flag_decode
(
s
);
}
if
(
lc
->
cu
.
pcm_flag
)
{
if
(
pcm_flag
)
{
intra_prediction_unit_default_value
(
s
,
x0
,
y0
,
log2_cb_size
);
ret
=
hls_pcm_sample
(
s
,
x0
,
y0
,
log2_cb_size
);
if
(
s
->
sps
->
pcm
.
loop_filter_disable_flag
)
...
...
@@ -2161,7 +2162,7 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
}
}
if
(
!
lc
->
cu
.
pcm_flag
)
{
if
(
!
pcm_flag
)
{
if
(
lc
->
cu
.
pred_mode
!=
MODE_INTRA
&&
!
(
lc
->
cu
.
part_mode
==
PART_2Nx2N
&&
lc
->
pu
.
merge_flag
))
{
lc
->
cu
.
rqt_root_cbf
=
ff_hevc_no_residual_syntax_flag_decode
(
s
);
...
...
libavcodec/hevc.h
View file @
920bca3e
...
...
@@ -607,8 +607,6 @@ typedef struct CodingUnit {
uint8_t
rqt_root_cbf
;
uint8_t
pcm_flag
;
// Inferred parameters
uint8_t
intra_split_flag
;
///< IntraSplitFlag
uint8_t
max_trafo_depth
;
///< MaxTrafoDepth
...
...
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