Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
455
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
023a3241
Commit
023a3241
authored
5 years ago
by
Steve Lhomme
Browse files
Options
Downloads
Patches
Plain Diff
mmal: make pic_ctx_mmal_t private
parent
5bd945c9
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#13111
passed with stage
in 19 minutes and 28 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/hw/mmal/mmal_picture.c
+19
-0
19 additions, 0 deletions
modules/hw/mmal/mmal_picture.c
modules/hw/mmal/mmal_picture.h
+1
-17
1 addition, 17 deletions
modules/hw/mmal/mmal_picture.h
with
20 additions
and
17 deletions
modules/hw/mmal/mmal_picture.c
+
19
−
0
View file @
023a3241
...
...
@@ -313,6 +313,25 @@ MMAL_STATUS_T hw_mmal_opaque_output(vlc_object_t * const obj,
return
MMAL_SUCCESS
;
}
//----------------------------------------------------------------------------
#define CTX_BUFS_MAX 4
typedef
struct
pic_ctx_mmal_s
{
picture_context_t
cmn
;
// PARENT: Common els at start
cma_buf_t
*
cb
;
unsigned
int
buf_count
;
MMAL_BUFFER_HEADER_T
*
bufs
[
CTX_BUFS_MAX
];
}
pic_ctx_mmal_t
;
MMAL_BUFFER_HEADER_T
*
hw_mmal_pic_sub_buf_get
(
picture_t
*
const
pic
,
const
unsigned
int
sub_no
)
{
pic_ctx_mmal_t
*
const
ctx
=
(
pic_ctx_mmal_t
*
)
pic
->
context
;
return
sub_no
+
1
>
ctx
->
buf_count
?
NULL
:
ctx
->
bufs
[
sub_no
+
1
];
}
static
void
hw_mmal_pic_ctx_destroy
(
picture_context_t
*
pic_ctx_cmn
)
{
...
...
This diff is collapsed.
Click to expand it.
modules/hw/mmal/mmal_picture.h
+
1
−
17
View file @
023a3241
...
...
@@ -34,17 +34,6 @@
#define NUM_ACTUAL_OPAQUE_BUFFERS 30
#define CTX_BUFS_MAX 4
typedef
struct
pic_ctx_mmal_s
{
picture_context_t
cmn
;
// PARENT: Common els at start
cma_buf_t
*
cb
;
unsigned
int
buf_count
;
MMAL_BUFFER_HEADER_T
*
bufs
[
CTX_BUFS_MAX
];
}
pic_ctx_mmal_t
;
MMAL_FOURCC_T
vlc_to_mmal_video_fourcc
(
const
video_frame_format_t
*
const
vf_vlc
);
MMAL_FOURCC_T
vlc_to_mmal_color_space
(
const
video_color_space_t
vlc_cs
);
void
hw_mmal_vlc_fmt_to_mmal_fmt
(
MMAL_ES_FORMAT_T
*
const
es_fmt
,
const
video_frame_format_t
*
const
vf_vlc
);
...
...
@@ -70,12 +59,7 @@ MMAL_STATUS_T hw_mmal_opaque_output(vlc_object_t * const obj,
MMAL_PORT_T
*
const
port
,
const
unsigned
int
extra_buffers
,
MMAL_PORT_BH_CB_T
callback
);
static
inline
MMAL_BUFFER_HEADER_T
*
hw_mmal_pic_sub_buf_get
(
picture_t
*
const
pic
,
const
unsigned
int
n
)
{
pic_ctx_mmal_t
*
const
ctx
=
(
pic_ctx_mmal_t
*
)
pic
->
context
;
return
n
+
1
>
ctx
->
buf_count
?
NULL
:
ctx
->
bufs
[
n
+
1
];
}
MMAL_BUFFER_HEADER_T
*
hw_mmal_pic_sub_buf_get
(
picture_t
*
const
pic
,
const
unsigned
int
n
);
static
inline
bool
hw_mmal_chroma_is_mmal
(
const
vlc_fourcc_t
chroma
)
{
...
...
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