Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
644e9c55
Commit
644e9c55
authored
Apr 04, 2012
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
v4l2: remove dead userptr code
parent
630c2645
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
9 deletions
+1
-9
modules/access/v4l2/demux.c
modules/access/v4l2/demux.c
+1
-8
modules/access/v4l2/v4l2.h
modules/access/v4l2/v4l2.h
+0
-1
No files found.
modules/access/v4l2/demux.c
View file @
644e9c55
...
@@ -544,7 +544,6 @@ void DemuxClose( vlc_object_t *obj )
...
@@ -544,7 +544,6 @@ void DemuxClose( vlc_object_t *obj )
break
;
break
;
case
IO_METHOD_MMAP
:
case
IO_METHOD_MMAP
:
case
IO_METHOD_USERPTR
:
{
{
/* NOTE: Some buggy drivers hang if buffers are not unmapped before
/* NOTE: Some buggy drivers hang if buffers are not unmapped before
* streamoff */
* streamoff */
...
@@ -552,8 +551,7 @@ void DemuxClose( vlc_object_t *obj )
...
@@ -552,8 +551,7 @@ void DemuxClose( vlc_object_t *obj )
{
{
struct
v4l2_buffer
buf
=
{
struct
v4l2_buffer
buf
=
{
.
type
=
V4L2_BUF_TYPE_VIDEO_CAPTURE
,
.
type
=
V4L2_BUF_TYPE_VIDEO_CAPTURE
,
.
memory
=
(
sys
->
io
==
IO_METHOD_USERPTR
)
?
.
memory
=
V4L2_MEMORY_MMAP
,
V4L2_MEMORY_USERPTR
:
V4L2_MEMORY_MMAP
,
};
};
v4l2_ioctl
(
fd
,
VIDIOC_DQBUF
,
&
buf
);
v4l2_ioctl
(
fd
,
VIDIOC_DQBUF
,
&
buf
);
}
}
...
@@ -576,11 +574,6 @@ void DemuxClose( vlc_object_t *obj )
...
@@ -576,11 +574,6 @@ void DemuxClose( vlc_object_t *obj )
v4l2_munmap
(
sys
->
p_buffers
[
i
].
start
,
v4l2_munmap
(
sys
->
p_buffers
[
i
].
start
,
sys
->
p_buffers
[
i
].
length
);
sys
->
p_buffers
[
i
].
length
);
break
;
break
;
case
IO_METHOD_USERPTR
:
for
(
unsigned
i
=
0
;
i
<
sys
->
i_nbuffers
;
++
i
)
free
(
sys
->
p_buffers
[
i
].
start
);
break
;
}
}
free
(
sys
->
p_buffers
);
free
(
sys
->
p_buffers
);
}
}
...
...
modules/access/v4l2/v4l2.h
View file @
644e9c55
...
@@ -71,7 +71,6 @@ extern int (*v4l2_munmap) (void *, size_t);
...
@@ -71,7 +71,6 @@ extern int (*v4l2_munmap) (void *, size_t);
typedef
enum
{
typedef
enum
{
IO_METHOD_READ
=
1
,
IO_METHOD_READ
=
1
,
IO_METHOD_MMAP
,
IO_METHOD_MMAP
,
IO_METHOD_USERPTR
,
}
io_method
;
}
io_method
;
typedef
struct
vlc_v4l2_ctrl
vlc_v4l2_ctrl_t
;
typedef
struct
vlc_v4l2_ctrl
vlc_v4l2_ctrl_t
;
...
...
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