On Wednesday 17 March 2010 15:00:02 Pawel Osciak wrote:
> According to the V4L2 specification, poll() should set POLLOUT | POLLWRNORM
> flags for output devices after the frame has been displayed.
>
> Signed-off-by: Pawel Osciak <p.osciak@xxxxxxxxxxx>
> Reviewed-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
> ---
> drivers/media/video/videobuf-core.c | 10 ++++++++--
> 1 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/video/videobuf-core.c b/drivers/media/video/videobuf-core.c
> index 37afb4e..e93672a 100644
> --- a/drivers/media/video/videobuf-core.c
> +++ b/drivers/media/video/videobuf-core.c
> @@ -1075,8 +1075,14 @@ unsigned int videobuf_poll_stream(struct file *file,
> if (0 == rc) {
> poll_wait(file, &buf->done, wait);
> if (buf->state == VIDEOBUF_DONE ||
> - buf->state == VIDEOBUF_ERROR)
> - rc = POLLIN|POLLRDNORM;
> + buf->state == VIDEOBUF_ERROR) {
> + if (q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
> + rc = POLLIN | POLLRDNORM;
> + else if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
> + rc = POLLOUT | POLLWRNORM;
> + else
> + BUG();
> + }
This is not right. First of all you shouldn't call BUG here. It is better to
default to POLLIN|POLLRDNORM. Secondly, there are more types than just these
two.
This is better:
switch (q->type) {
case V4L2_BUF_TYPE_VIDEO_OUTPUT:
case V4L2_BUF_TYPE_VBI_OUTPUT:
case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
rc = POLLOUT | POLLWRNORM;
break;
default:
rc = POLLIN | POLLRDNORM;
break;
}
Regards,
Hans
> }
> mutex_unlock(&q->vb_lock);
> return rc;
>
--
Hans Verkuil - video4linux developer - sponsored by TANDBERG
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
