mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 14:56:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

fimc: Do STREAMON/STREAMOFF only once and not once per buffer

Browse source
This commit is contained in:
Sebastian Dröge 2013-01-02 16:53:19 +01:00
parent 718fe99018
commit 83ea8f1256
1 changed files with 39 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
sys/mfc/fimc/fimc.c
View file

@ -64,6 +64,7 @@ struct _Fimc
int set_src; int set_src;
int has_src_buffers; int has_src_buffers;
int streamon_src;
FimcColorFormat src_format; FimcColorFormat src_format;
struct v4l2_format src_fmt; struct v4l2_format src_fmt;
struct v4l2_crop src_crop; struct v4l2_crop src_crop;
@ -71,6 +72,7 @@ struct _Fimc
int set_dst; int set_dst;
int has_dst_buffers; int has_dst_buffers;
int streamon_dst;
FimcColorFormat dst_format; FimcColorFormat dst_format;
struct v4l2_format dst_fmt; struct v4l2_format dst_fmt;
struct v4l2_crop dst_crop; struct v4l2_crop dst_crop;
@ -140,12 +142,8 @@ fimc_new (void)
void void
fimc_free (Fimc * fimc) fimc_free (Fimc * fimc)
{ {
int i; fimc_release_src_buffers (fimc);
fimc_release_dst_buffers (fimc);
for (i = 0; i < 3; i++) {
if (fimc->dst_buffer_data[i])
munmap (fimc->dst_buffer_data[i], fimc->dst_buffer_size[i]);
}
if (fimc->fd != -1) if (fimc->fd != -1)
close (fimc->fd); close (fimc->fd);
@ -326,6 +324,17 @@ fimc_request_src_buffers (Fimc * fimc)
int int
fimc_release_src_buffers (Fimc * fimc) fimc_release_src_buffers (Fimc * fimc)
{ {
enum v4l2_buf_type type;
if (fimc->streamon_src) {
type = fimc->src_requestbuffers.type;
if (ioctl (fimc->fd, VIDIOC_STREAMOFF, &type) < 0) {
GST_ERROR ("Deactivating input stream failed: %d", errno);
return -1;
}
fimc->streamon_src = 0;
}
/* Nothing to do here now */ /* Nothing to do here now */
fimc->has_src_buffers = 0; fimc->has_src_buffers = 0;
@ -528,8 +537,18 @@ fimc_request_dst_buffers_mmap (Fimc * fimc, void *dst[3], int stride[3])
int int
fimc_release_dst_buffers (Fimc * fimc) fimc_release_dst_buffers (Fimc * fimc)
{ {
enum v4l2_buf_type type;
int i; int i;
if (fimc->streamon_dst) {
type = fimc->dst_requestbuffers.type;
if (ioctl (fimc->fd, VIDIOC_STREAMOFF, &type) < 0) {
GST_ERROR ("Deactivating output stream failed: %d", errno);
return -1;
}
fimc->streamon_dst = 0;
}
fimc->has_dst_buffers = 0; fimc->has_dst_buffers = 0;
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
@ -595,16 +614,22 @@ fimc_convert (Fimc * fimc, void *src[3], void *dst[3])
return -1; return -1;
} }
type = fimc->src_requestbuffers.type; if (!fimc->streamon_src) {
if (ioctl (fimc->fd, VIDIOC_STREAMON, &type) < 0) { type = fimc->src_requestbuffers.type;
GST_ERROR ("Activating input stream failed: %d", errno); if (ioctl (fimc->fd, VIDIOC_STREAMON, &type) < 0) {
return -1; GST_ERROR ("Activating input stream failed: %d", errno);
return -1;
}
fimc->streamon_src = 1;
} }
type = fimc->dst_requestbuffers.type; if (!fimc->streamon_dst) {
if (ioctl (fimc->fd, VIDIOC_STREAMON, &type) < 0) { type = fimc->dst_requestbuffers.type;
GST_ERROR ("Activating output stream failed: %d", errno); if (ioctl (fimc->fd, VIDIOC_STREAMON, &type) < 0) {
return -1; GST_ERROR ("Activating output stream failed: %d", errno);
return -1;
}
fimc->streamon_dst = 1;
} }
memset (planes, 0, sizeof (planes)); memset (planes, 0, sizeof (planes));
@ -633,17 +658,5 @@ fimc_convert (Fimc * fimc, void *src[3], void *dst[3])
return -1; return -1;
} }
type = fimc->src_requestbuffers.type;
if (ioctl (fimc->fd, VIDIOC_STREAMOFF, &type) < 0) {
GST_ERROR ("Deactivating input stream failed: %d", errno);
return -1;
}
type = fimc->dst_requestbuffers.type;
if (ioctl (fimc->fd, VIDIOC_STREAMOFF, &type) < 0) {
GST_ERROR ("Deactivating output stream failed: %d", errno);
return -1;
}
return 0; return 0;
} }