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
ac52e06e
Commit
ac52e06e
authored
Aug 22, 2019
by
Aman Gupta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec/v4l2_m2m: disable info logging during device probe
Signed-off-by:
Aman Gupta
<
aman@tmm1.net
>
parent
ab4835f4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
v4l2_m2m.c
libavcodec/v4l2_m2m.c
+7
-6
No files found.
libavcodec/v4l2_m2m.c
View file @
ac52e06e
...
...
@@ -60,7 +60,7 @@ static inline int v4l2_mplane_video(struct v4l2_capability *cap)
return
0
;
}
static
int
v4l2_prepare_contexts
(
V4L2m2mContext
*
s
)
static
int
v4l2_prepare_contexts
(
V4L2m2mContext
*
s
,
int
probe
)
{
struct
v4l2_capability
cap
;
int
ret
;
...
...
@@ -76,9 +76,10 @@ static int v4l2_prepare_contexts(V4L2m2mContext* s)
if
(
ret
<
0
)
return
ret
;
av_log
(
s
->
avctx
,
AV_LOG_INFO
,
"driver '%s' on card '%s' in %s mode
\n
"
,
cap
.
driver
,
cap
.
card
,
v4l2_mplane_video
(
&
cap
)
?
"mplane"
:
v4l2_splane_video
(
&
cap
)
?
"splane"
:
"unknown"
);
av_log
(
s
->
avctx
,
probe
?
AV_LOG_DEBUG
:
AV_LOG_INFO
,
"driver '%s' on card '%s' in %s mode
\n
"
,
cap
.
driver
,
cap
.
card
,
v4l2_mplane_video
(
&
cap
)
?
"mplane"
:
v4l2_splane_video
(
&
cap
)
?
"splane"
:
"unknown"
);
if
(
v4l2_mplane_video
(
&
cap
))
{
s
->
capture
.
type
=
V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE
;
...
...
@@ -103,7 +104,7 @@ static int v4l2_probe_driver(V4L2m2mContext* s)
if
(
s
->
fd
<
0
)
return
AVERROR
(
errno
);
ret
=
v4l2_prepare_contexts
(
s
);
ret
=
v4l2_prepare_contexts
(
s
,
1
);
if
(
ret
<
0
)
goto
done
;
...
...
@@ -140,7 +141,7 @@ static int v4l2_configure_contexts(V4L2m2mContext* s)
if
(
s
->
fd
<
0
)
return
AVERROR
(
errno
);
ret
=
v4l2_prepare_contexts
(
s
);
ret
=
v4l2_prepare_contexts
(
s
,
0
);
if
(
ret
<
0
)
goto
error
;
...
...
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