Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
linux
Manage
Activity
Members
Labels
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Daniel Almeida
linux
Commits
88023dba
Commit
88023dba
authored
4 years ago
by
Ezequiel Garcia
Browse files
Options
Downloads
Patches
Plain Diff
media: uapi: h264: Redo DPB interface
Signed-off-by:
Ezequiel Garcia
<
ezequiel@collabora.com
>
parent
b0c9b721
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
drivers/media/v4l2-core/v4l2-h264.c
+2
-2
2 additions, 2 deletions
drivers/media/v4l2-core/v4l2-h264.c
drivers/staging/media/rkvdec/rkvdec-h264.c
+4
-4
4 additions, 4 deletions
drivers/staging/media/rkvdec/rkvdec-h264.c
include/media/h264-ctrls.h
+7
-1
7 additions, 1 deletion
include/media/h264-ctrls.h
with
13 additions
and
7 deletions
drivers/media/v4l2-core/v4l2-h264.c
+
2
−
2
View file @
88023dba
...
...
@@ -64,10 +64,10 @@ v4l2_h264_init_reflist_builder(struct v4l2_h264_reflist_builder *b,
else
b
->
refs
[
i
].
frame_num
=
dpb
[
i
].
frame_num
;
if
(
!
(
dpb
[
i
].
flags
&
V4L2_H264_DPB_
ENTRY_FLAG_FIELD
)
)
if
(
dpb
[
i
].
reference
&
V4L2_H264_DPB_
FRAME_REF
)
pic_order_count
=
min
(
dpb
[
i
].
top_field_order_cnt
,
dpb
[
i
].
bottom_field_order_cnt
);
else
if
(
dpb
[
i
].
flags
&
V4L2_H264_DPB_
ENTRY_FLAG_
BOTTOM_
FIELD
)
else
if
(
dpb
[
i
].
reference
&
V4L2_H264_DPB_BOTTOM_
REF
)
pic_order_count
=
dpb
[
i
].
bottom_field_order_cnt
;
else
pic_order_count
=
dpb
[
i
].
top_field_order_cnt
;
...
...
This diff is collapsed.
Click to expand it.
drivers/staging/media/rkvdec/rkvdec-h264.c
+
4
−
4
View file @
88023dba
...
...
@@ -951,11 +951,11 @@ static void config_registers(struct rkvdec_ctx *ctx,
RKVDEC_COLMV_USED_FLAG_REF
;
if
(
!
(
dpb
[
i
].
flags
&
V4L2_H264_DPB_ENTRY_FLAG_FIELD
))
refer_addr
|=
RKVDEC_
TOP
FIELD_
USED_
REF
|
RKVDEC_BOTFIELD_USED_REF
;
else
if
(
dpb
[
i
].
flags
&
V4L2_H264_DPB_
ENTRY_FLAG_BOTTOM_FIELD
)
refer_addr
|=
RKVDEC_FIELD_REF
;
if
(
dpb
[
i
].
reference
&
V4L2_H264_DPB_
TOP_REF
)
refer_addr
|=
RKVDEC_BOTFIELD_USED_REF
;
else
else
if
(
dpb
[
i
].
reference
&
V4L2_H264_DPB_BOTTOM_REF
)
refer_addr
|=
RKVDEC_TOPFIELD_USED_REF
;
writel_relaxed
(
dpb
[
i
].
top_field_order_cnt
,
...
...
This diff is collapsed.
Click to expand it.
include/media/h264-ctrls.h
+
7
−
1
View file @
88023dba
...
...
@@ -188,7 +188,12 @@ struct v4l2_ctrl_h264_slice_params {
#define V4L2_H264_DPB_ENTRY_FLAG_ACTIVE 0x02
#define V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM 0x04
#define V4L2_H264_DPB_ENTRY_FLAG_FIELD 0x08
#define V4L2_H264_DPB_ENTRY_FLAG_BOTTOM_FIELD 0x10
enum
v4l2_h264_dpb_reference
{
V4L2_H264_DPB_TOP_REF
=
0x1
,
V4L2_H264_DPB_BOTTOM_REF
=
0x2
,
V4L2_H264_DPB_FRAME_REF
=
0x3
,
};
struct
v4l2_h264_dpb_entry
{
__u64
reference_ts
;
...
...
@@ -198,6 +203,7 @@ struct v4l2_h264_dpb_entry {
/* Note that field is indicated by v4l2_buffer.field */
__s32
top_field_order_cnt
;
__s32
bottom_field_order_cnt
;
enum
v4l2_h264_dpb_reference
reference
;
__u32
flags
;
/* V4L2_H264_DPB_ENTRY_FLAG_* */
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment