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
2c6a7f93
Commit
2c6a7f93
authored
Nov 15, 2014
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hevc: do not store rqt_root_cbf in the context
It does not need to be accessed outside of hls_coding_unit().
parent
920bca3e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
hevc.c
libavcodec/hevc.c
+4
-3
hevc.h
libavcodec/hevc.h
+0
-2
No files found.
libavcodec/hevc.c
View file @
2c6a7f93
...
...
@@ -2061,7 +2061,6 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
lc
->
cu
.
x
=
x0
;
lc
->
cu
.
y
=
y0
;
lc
->
cu
.
rqt_root_cbf
=
1
;
lc
->
cu
.
pred_mode
=
MODE_INTRA
;
lc
->
cu
.
part_mode
=
PART_2Nx2N
;
lc
->
cu
.
intra_split_flag
=
0
;
...
...
@@ -2163,11 +2162,13 @@ static int hls_coding_unit(HEVCContext *s, int x0, int y0, int log2_cb_size)
}
if
(
!
pcm_flag
)
{
int
rqt_root_cbf
=
1
;
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
);
rqt_root_cbf
=
ff_hevc_no_residual_syntax_flag_decode
(
s
);
}
if
(
lc
->
cu
.
rqt_root_cbf
)
{
if
(
rqt_root_cbf
)
{
lc
->
cu
.
max_trafo_depth
=
lc
->
cu
.
pred_mode
==
MODE_INTRA
?
s
->
sps
->
max_transform_hierarchy_depth_intra
+
lc
->
cu
.
intra_split_flag
:
s
->
sps
->
max_transform_hierarchy_depth_inter
;
...
...
libavcodec/hevc.h
View file @
2c6a7f93
...
...
@@ -605,8 +605,6 @@ typedef struct CodingUnit {
enum
PredMode
pred_mode
;
///< PredMode
enum
PartMode
part_mode
;
///< PartMode
uint8_t
rqt_root_cbf
;
// 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