mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

More hacking

Browse source 
Add beginnings of Xv plugin
Add Poll event
Clean up props handling
V4l2 add beginnings of poll event
This commit is contained in:
Wim Taymans 2016-07-07 09:30:18 +02:00
parent a1a27328e2
commit a31eb56663
14 changed files with 842 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

24
spa/plugins/v4l2/v4l2-source.c
View file

@ -47,6 +47,11 @@ reset_v4l2_source_props (SpaV4l2SourceProps *props)
#define MAX_BUFFERS 256
typedef struct {
SpaEventPoll poll;
SpaV4l2Source *source;
} V4l2EventPoll;
typedef struct _V4l2Buffer V4l2Buffer;
struct _V4l2Buffer {
@ -77,8 +82,7 @@ typedef struct {
struct _SpaV4l2Source {
SpaHandle handle;
SpaV4l2SourceProps tmp_props;
SpaV4l2SourceProps props;
SpaV4l2SourceProps props[2];
SpaEventCallback event_cb;
void *user_data;
@ -150,8 +154,8 @@ spa_v4l2_source_node_get_props (SpaHandle *handle,
if (handle == NULL || props == NULL)
return SPA_RESULT_INVALID_ARGUMENTS;
memcpy (&this->tmp_props, &this->props, sizeof (this->props));
*props = &this->tmp_props.props;
memcpy (&this->props[0], &this->props[1], sizeof (this->props[1]));
*props = &this->props[0].props;
return SPA_RESULT_OK;
}
@ -161,7 +165,7 @@ spa_v4l2_source_node_set_props (SpaHandle *handle,
const SpaProps *props)
{
SpaV4l2Source *this = (SpaV4l2Source *) handle;
SpaV4l2SourceProps *p = &this->props;
SpaV4l2SourceProps *p = &this->props[1];
SpaResult res;
if (handle == NULL)
@ -552,11 +556,11 @@ spa_v4l2_source_new (void)
handle->get_interface = spa_v4l2_source_get_interface;
this = (SpaV4l2Source *) handle;
this->props.props.n_prop_info = PROP_ID_LAST;
this->props.props.prop_info = prop_info;
this->props.props.set_prop = spa_props_generic_set_prop;
this->props.props.get_prop = spa_props_generic_get_prop;
reset_v4l2_source_props (&this->props);
this->props[1].props.n_prop_info = PROP_ID_LAST;
this->props[1].props.prop_info = prop_info;
this->props[1].props.set_prop = spa_props_generic_set_prop;
this->props[1].props.get_prop = spa_props_generic_get_prop;
reset_v4l2_source_props (&this->props[1]);
this->info.flags = SPA_PORT_INFO_FLAG_NONE;
this->status.flags = SPA_PORT_STATUS_FLAG_NONE;

73
spa/plugins/v4l2/v4l2-utils.c
View file

@ -26,28 +26,29 @@ spa_v4l2_open (SpaV4l2Source *this)
{
SpaV4l2State *state = &this->state;
struct stat st;
SpaV4l2SourceProps *props = &this->props[1];
if (state->opened)
return 0;
fprintf (stderr, "Playback device is '%s'\n", this->props.device);
fprintf (stderr, "Playback device is '%s'\n", props->device);
if (stat (this->props.device, &st) < 0) {
if (stat (props->device, &st) < 0) {
fprintf(stderr, "Cannot identify '%s': %d, %s\n",
this->props.device, errno, strerror (errno));
props->device, errno, strerror (errno));
return -1;
}
if (!S_ISCHR (st.st_mode)) {
fprintf(stderr, "%s is no device\n", this->props.device);
fprintf(stderr, "%s is no device\n", props->device);
return -1;
}
state->fd = open (this->props.device, O_RDWR | O_NONBLOCK, 0);
state->fd = open (props->device, O_RDWR | O_NONBLOCK, 0);
if (state->fd == -1) {
fprintf (stderr, "Cannot open '%s': %d, %s\n",
this->props.device, errno, strerror (errno));
props->device, errno, strerror (errno));
return -1;
}
@ -57,7 +58,7 @@ spa_v4l2_open (SpaV4l2Source *this)
}
if ((state->cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) == 0) {
fprintf (stderr, "%s is no video capture device\n", this->props.device);
fprintf (stderr, "%s is no video capture device\n", props->device);
return -1;
}
state->opened = true;
@ -352,20 +353,44 @@ mmap_read (SpaV4l2Source *this)
return 0;
}
static void
v4l2_on_fd_events (void *user_data)
{
V4l2EventPoll *poll = user_data;
SpaV4l2Source *this = poll->source;
SpaEvent event;
mmap_read (this);
event.refcount = 1;
event.notify = NULL;
event.type = SPA_EVENT_TYPE_CAN_PULL_OUTPUT;
event.port_id = 0;
event.size = 0;
event.data = NULL;
this->event_cb (&this->handle, &event, this->user_data);
}
static void *
v4l2_loop (void *user_data)
{
SpaV4l2Source *this = user_data;
SpaV4l2State *state = &this->state;
struct pollfd fds[1];
SpaEvent event;
int r;
event.notify = NULL;
event.type = SPA_EVENT_TYPE_CAN_PULL_OUTPUT;
event.port_id = 0;
event.size = 0;
event.data = NULL;
fds[0].fd = state->fd;
fds[0].events = POLLIN | POLLPRI | POLLERR;
fds[0].revents = 0;
while (state->running) {
int r;
r = poll (fds, 1, 2000);
if (r < 0) {
if (errno == EINTR)
@ -380,18 +405,8 @@ v4l2_loop (void *user_data)
if (mmap_read (this) < 0)
break;
{
SpaEvent event;
event.refcount = 1;
event.notify = NULL;
event.type = SPA_EVENT_TYPE_CAN_PULL_OUTPUT;
event.port_id = 0;
event.size = 0;
event.data = NULL;
this->event_cb (&this->handle, &event, this->user_data);
}
event.refcount = 1;
this->event_cb (&this->handle, &event, this->user_data);
}
return NULL;
}
@ -525,6 +540,8 @@ spa_v4l2_start (SpaV4l2Source *this)
SpaV4l2State *state = &this->state;
int err;
enum v4l2_buf_type type;
SpaEvent event;
V4l2EventPoll poll;
if (spa_v4l2_open (this) < 0)
return -1;
@ -539,6 +556,20 @@ spa_v4l2_start (SpaV4l2Source *this)
} else
return -1;
event.refcount = 1;
event.notify = NULL;
event.type = SPA_EVENT_TYPE_ADD_POLL;
event.port_id = 0;
event.data = &poll.poll;
event.size = sizeof (poll.poll);
poll.poll.fd = state->fd;
poll.poll.events = POLLIN | POLLPRI | POLLERR;
poll.poll.revents = 0;
poll.poll.callback = v4l2_on_fd_events;
poll.source = this;
this->event_cb (&this->handle, &event, this->user_data);
type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if (xioctl (state->fd, VIDIOC_STREAMON, &type) < 0) {
perror ("VIDIOC_STREAMON");