Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
089ce510
Commit
089ce510
authored
Apr 05, 2010
by
Rémi Duraffort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l2: 0 => NULL
parent
d77b62ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
15 deletions
+19
-15
modules/access/v4l2.c
modules/access/v4l2.c
+19
-15
No files found.
modules/access/v4l2.c
View file @
089ce510
...
...
@@ -1352,7 +1352,8 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys )
mtime_t
i_dur
=
(
mtime_t
)((
double
)
1000000
/
(
double
)
p_sys
->
f_fps
);
/* Did we wait long enough ? (frame rate reduction) */
if
(
p_sys
->
i_video_pts
+
i_dur
>
mdate
()
)
return
0
;
if
(
p_sys
->
i_video_pts
+
i_dur
>
mdate
()
)
return
NULL
;
}
/* Grab Video Frame */
...
...
@@ -1365,7 +1366,7 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys )
switch
(
errno
)
{
case
EAGAIN
:
return
0
;
return
NULL
;
case
EIO
:
/* Could ignore EIO, see spec. */
/* fall through */
...
...
@@ -1376,7 +1377,8 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys )
}
p_block
=
ProcessVideoFrame
(
p_demux
,
(
uint8_t
*
)
p_sys
->
p_buffers
[
0
].
start
,
i_ret
);
if
(
!
p_block
)
return
0
;
if
(
!
p_block
)
return
NULL
;
break
;
...
...
@@ -1391,30 +1393,31 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys )
switch
(
errno
)
{
case
EAGAIN
:
return
0
;
return
NULL
;
case
EIO
:
/* Could ignore EIO, see spec. */
/* fall through */
default:
msg_Err
(
p_demux
,
"Failed to wait (VIDIOC_DQBUF)"
);
return
0
;
return
NULL
;
}
}
if
(
buf
.
index
>=
p_sys
->
i_nbuffers
)
{
msg_Err
(
p_demux
,
"Failed capturing new frame as i>=nbuffers"
);
return
0
;
return
NULL
;
}
p_block
=
ProcessVideoFrame
(
p_demux
,
p_sys
->
p_buffers
[
buf
.
index
].
start
,
buf
.
bytesused
);
if
(
!
p_block
)
return
0
;
if
(
!
p_block
)
return
NULL
;
/* Unlock */
if
(
v4l2_ioctl
(
p_sys
->
i_fd
,
VIDIOC_QBUF
,
&
buf
)
<
0
)
{
msg_Err
(
p_demux
,
"Failed to unlock (VIDIOC_QBUF)"
);
block_Release
(
p_block
);
return
0
;
return
NULL
;
}
break
;
...
...
@@ -1430,13 +1433,13 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys )
switch
(
errno
)
{
case
EAGAIN
:
return
0
;
return
NULL
;
case
EIO
:
/* Could ignore EIO, see spec. */
/* fall through */
default:
msg_Err
(
p_demux
,
"Failed to wait (VIDIOC_DQBUF)"
);
return
0
;
return
NULL
;
}
}
...
...
@@ -1451,18 +1454,19 @@ static block_t* GrabVideo( vlc_object_t *p_demux, demux_sys_t *p_sys )
if
(
i
>=
p_sys
->
i_nbuffers
)
{
msg_Err
(
p_demux
,
"Failed capturing new frame as i>=nbuffers"
);
return
0
;
return
NULL
;
}
p_block
=
ProcessVideoFrame
(
p_demux
,
(
uint8_t
*
)
buf
.
m
.
userptr
,
buf
.
bytesused
);
if
(
!
p_block
)
return
0
;
if
(
!
p_block
)
return
NULL
;
/* Unlock */
if
(
v4l2_ioctl
(
p_sys
->
i_fd
,
VIDIOC_QBUF
,
&
buf
)
<
0
)
{
msg_Err
(
p_demux
,
"Failed to unlock (VIDIOC_QBUF)"
);
block_Release
(
p_block
);
return
0
;
return
NULL
;
}
break
;
...
...
@@ -1486,13 +1490,13 @@ static block_t* ProcessVideoFrame( vlc_object_t *p_demux, uint8_t *p_frame, size
{
block_t
*
p_block
;
if
(
!
p_frame
)
return
0
;
if
(
!
p_frame
)
return
NULL
;
/* New block */
if
(
!
(
p_block
=
block_New
(
p_demux
,
i_size
)
)
)
{
msg_Warn
(
p_demux
,
"Cannot get new block"
);
return
0
;
return
NULL
;
}
/* Copy frame */
...
...
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