From 44f49a3ea0914f299badd6ad8f754b3951a7b1fa Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 5 May 2021 11:13:01 +0200 Subject: [PATCH] v4l2: add some more debug --- spa/plugins/v4l2/v4l2-source.c | 12 ++++++++---- spa/plugins/v4l2/v4l2-utils.c | 10 ++++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/spa/plugins/v4l2/v4l2-source.c b/spa/plugins/v4l2/v4l2-source.c index 96e2d5f8b..bb7f01a5a 100644 --- a/spa/plugins/v4l2/v4l2-source.c +++ b/spa/plugins/v4l2/v4l2-source.c @@ -298,10 +298,14 @@ static int impl_node_send_command(void *object, const struct spa_command *comman { struct port *port = GET_OUT_PORT(this, 0); - if (!port->have_format) + if (!port->have_format) { + spa_log_error(this->log, "no format"); return -EIO; - if (port->n_buffers == 0) + } + if (port->n_buffers == 0) { + spa_log_error(this->log, "no buffers"); return -EIO; + } if ((res = spa_v4l2_stream_on(this)) < 0) return res; @@ -621,8 +625,8 @@ static int port_set_format(void *object, port->have_format = false; } - if (spa_v4l2_set_format(this, &info, flags) < 0) - return -EINVAL; + if ((res = spa_v4l2_set_format(this, &info, flags)) < 0) + return res; if (!SPA_FLAG_IS_SET(flags, SPA_NODE_PARAM_FLAG_TEST_ONLY)) { port->current_format = info; diff --git a/spa/plugins/v4l2/v4l2-utils.c b/spa/plugins/v4l2/v4l2-utils.c index e11a0e998..feefde004 100644 --- a/spa/plugins/v4l2/v4l2-utils.c +++ b/spa/plugins/v4l2/v4l2-utils.c @@ -1374,8 +1374,11 @@ static int spa_v4l2_use_buffers(struct impl *this, struct spa_buffer **buffers, else if (port->memtype == V4L2_MEMORY_DMABUF) { b->v4l2_buffer.m.fd = d[0].fd; } - else + else { + spa_log_error(this->log, "v4l2: invalid port memory %d", + port->memtype); return -EIO; + } spa_v4l2_buffer_recycle(this, i); } @@ -1542,8 +1545,11 @@ spa_v4l2_alloc_buffers(struct impl *this, } else if (dev->cap.capabilities & V4L2_CAP_READWRITE) { if ((res = read_init(this)) < 0) return res; - } else + } else { + spa_log_error(this->log, "v4l2: invalid capabilities %08x", + dev->cap.capabilities); return -EIO; + } return 0; }