mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

v4l2: improve debug

Browse source 
Add device path to debug lines.
This commit is contained in:
Wim Taymans 2022-11-14 11:21:24 +01:00
parent e0c9f87d78
commit cfb226b0fb
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,7 @@ int spa_v4l2_open(struct spa_v4l2_device *dev, const char *path)
return -EIO;
}
spa_log_info(dev->log, "Playback device is '%s'", path);
spa_log_info(dev->log, "device is '%s'", path);
dev->fd = open(path, O_RDWR | O_NONBLOCK, 0);
if (dev->fd == -1) {
@ -84,6 +84,7 @@ int spa_v4l2_open(struct spa_v4l2_device *dev, const char *path)
spa_log_error(dev->log, "'%s' QUERYCAP: %m", path);
goto error_close;
}
snprintf(dev->path, sizeof(dev->path), "%s", path);
return 0;
error_close:
@ -109,7 +110,7 @@ int spa_v4l2_close(struct spa_v4l2_device *dev)
if (dev->active || dev->have_format)
return 0;
spa_log_info(dev->log, "close");
spa_log_info(dev->log, "close '%s'", dev->path);
if (close(dev->fd))
spa_log_warn(dev->log, "close: %m");
@ -972,7 +973,7 @@ static int spa_v4l2_set_format(struct impl *this, struct spa_video_info *format,
return match ? 0 : 1;
spa_log_info(this->log, "'%s' got %.4s %dx%d %d/%d",
this->props.device, (char *)&fmt.fmt.pix.pixelformat,
dev->path, (char *)&fmt.fmt.pix.pixelformat,
fmt.fmt.pix.width, fmt.fmt.pix.height,
streamparm.parm.capture.timeperframe.denominator,
streamparm.parm.capture.timeperframe.numerator);
@ -1610,7 +1611,7 @@ fallback:
}
spa_v4l2_buffer_recycle(this, i);
}
spa_log_info(this->log, "have %u buffers using %s", n_buffers,
spa_log_info(this->log, "%s: have %u buffers using %s", dev->path, n_buffers,
use_expbuf ? "EXPBUF" : "MMAP");
port->n_buffers = n_buffers;

1
spa/plugins/v4l2/v4l2.h
View file

@ -41,6 +41,7 @@ struct spa_v4l2_device {
struct v4l2_capability cap;
unsigned int active:1;
unsigned int have_format:1;
char path[64];
};
int spa_v4l2_open(struct spa_v4l2_device *dev, const char *path);