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

libcamera: remove \n in log lines

Browse source
This commit is contained in:
Wim Taymans 2021-10-01 12:28:53 +02:00
parent 7cf0afe299
commit 487792941d
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/plugins/libcamera/libcamera-device.c
View file

@ -95,7 +95,7 @@ static int emit_info(struct impl *this, bool full)
} while (err == -1 && errno == EINTR); } while (err == -1 && errno == EINTR);
if(err < 0) { if(err < 0) {
spa_log_error(this->log, "%s:: Failed to query MEDIA_IOC_DEVICE_INFO on fd %d\n", __FUNCTION__, this->dev.fd); spa_log_error(this->log, "%s:: Failed to query MEDIA_IOC_DEVICE_INFO on fd %d", __FUNCTION__, this->dev.fd);
} }
#define ADD_ITEM(key, value) items[n_items++] = SPA_DICT_ITEM_INIT(key, value) #define ADD_ITEM(key, value) items[n_items++] = SPA_DICT_ITEM_INIT(key, value)

30
spa/plugins/libcamera/libcamera-utils.c
View file

@ -386,7 +386,7 @@ next_fmtdesc:
spa_pod_builder_id(&b, info->format); spa_pod_builder_id(&b, info->format);
} }
spa_log_info(this->log, "%s:: In have_size: Got width = %u height = %u\n", __FUNCTION__, width, height); spa_log_info(this->log, "%s:: In have_size: Got width = %u height = %u", __FUNCTION__, width, height);
spa_pod_builder_prop(&b, SPA_FORMAT_VIDEO_size, 0); spa_pod_builder_prop(&b, SPA_FORMAT_VIDEO_size, 0);
spa_pod_builder_rectangle(&b, port->fmt.width, port->fmt.height); spa_pod_builder_rectangle(&b, port->fmt.width, port->fmt.height);
@ -470,7 +470,7 @@ static int spa_libcamera_set_format(struct impl *this, struct spa_video_info *fo
if ((res = spa_libcamera_open(dev)) < 0) if ((res = spa_libcamera_open(dev)) < 0)
return res; return res;
spa_log_info(dev->log, "libcamera: set %s %dx%d %d/%d\n", (char *)&info->fourcc, spa_log_info(dev->log, "libcamera: set %s %dx%d %d/%d", (char *)&info->fourcc,
fmt.width, fmt.height, fmt.width, fmt.height,
fmt.denominator, fmt.numerator); fmt.denominator, fmt.numerator);
@ -496,7 +496,7 @@ static int spa_libcamera_set_format(struct impl *this, struct spa_video_info *fo
SPA_PORT_FLAG_TERMINAL; SPA_PORT_FLAG_TERMINAL;
port->info.rate = SPA_FRACTION(port->rate.num, port->rate.denom); port->info.rate = SPA_FRACTION(port->rate.num, port->rate.denom);
spa_log_info(dev->log, " got format. width = %d height = %d and fmt = %s. bytesperline = %u sizeimage = %u\n", spa_log_info(dev->log, " got format. width = %d height = %d and fmt = %s. bytesperline = %u sizeimage = %u",
fmt.width, fmt.height, fmt.width, fmt.height,
(char *)&info->fourcc, fmt.bytesperline, fmt.sizeimage); (char *)&info->fourcc, fmt.bytesperline, fmt.sizeimage);
@ -530,7 +530,7 @@ static int mmap_read(struct impl *this)
if(dev->camera) { if(dev->camera) {
pOut = (struct OutBuf *)libcamera_get_ring_buffer_data(dev->camera); pOut = (struct OutBuf *)libcamera_get_ring_buffer_data(dev->camera);
if(!pOut) { if(!pOut) {
spa_log_debug(this->log, "Exiting %s as pOut is NULL\n", __FUNCTION__); spa_log_debug(this->log, "Exiting %s as pOut is NULL", __FUNCTION__);
return -1; return -1;
} }
/* update the read index of the ring buffer */ /* update the read index of the ring buffer */
@ -538,7 +538,7 @@ static int mmap_read(struct impl *this)
pDatas = pOut->datas; pDatas = pOut->datas;
if(NULL == pDatas) { if(NULL == pDatas) {
spa_log_debug(this->log, "Exiting %s on NULL pointer\n", __FUNCTION__); spa_log_debug(this->log, "Exiting %s on NULL pointer", __FUNCTION__);
goto end; goto end;
} }
@ -546,14 +546,14 @@ static int mmap_read(struct impl *this)
b->outbuf->n_datas = pOut->n_datas; b->outbuf->n_datas = pOut->n_datas;
if(NULL == b->outbuf->datas) { if(NULL == b->outbuf->datas) {
spa_log_debug(this->log, "Exiting %s as b->outbuf->datas is NULL\n", __FUNCTION__); spa_log_debug(this->log, "Exiting %s as b->outbuf->datas is NULL", __FUNCTION__);
goto end; goto end;
} }
for(unsigned int i = 0; i < pOut->n_datas; ++i) { for(unsigned int i = 0; i < pOut->n_datas; ++i) {
struct CamData *pData = &pDatas[i]; struct CamData *pData = &pDatas[i];
if(NULL == pData) { if(NULL == pData) {
spa_log_debug(this->log, "Exiting %s on NULL pointer\n", __FUNCTION__); spa_log_debug(this->log, "Exiting %s on NULL pointer", __FUNCTION__);
goto end; goto end;
} }
b->outbuf->datas[i].flags = SPA_DATA_FLAG_READABLE; b->outbuf->datas[i].flags = SPA_DATA_FLAG_READABLE;
@ -570,9 +570,9 @@ static int mmap_read(struct impl *this)
//b->outbuf->datas[i].chunk->stride = pData->sstride; /* FIXME:: This needs to be appropriately filled */ //b->outbuf->datas[i].chunk->stride = pData->sstride; /* FIXME:: This needs to be appropriately filled */
b->outbuf->datas[i].maxsize = pData->maxsize; b->outbuf->datas[i].maxsize = pData->maxsize;
spa_log_trace(this->log,"Spa libcamera Source::%s:: got bufIdx = %d and ndatas = %d\t", spa_log_trace(this->log,"Spa libcamera Source::%s:: got bufIdx = %d and ndatas = %d",
__FUNCTION__, pOut->bufIdx, pOut->n_datas); __FUNCTION__, pOut->bufIdx, pOut->n_datas);
spa_log_trace(this->log," data[%d] --> fd = %ld bytesused = %d sequence = %d\n", spa_log_trace(this->log," data[%d] --> fd = %ld bytesused = %d sequence = %d",
i, b->outbuf->datas[i].fd, bytesused, sequence); i, b->outbuf->datas[i].fd, bytesused, sequence);
} }
} }
@ -602,7 +602,7 @@ static int mmap_read(struct impl *this)
d[0].chunk->size = bytesused; d[0].chunk->size = bytesused;
d[0].chunk->flags = 0; d[0].chunk->flags = 0;
d[0].data = b->ptr; d[0].data = b->ptr;
spa_log_trace(this->log,"%s:: b->ptr = %p d[0].data = %p\n", spa_log_trace(this->log,"%s:: b->ptr = %p d[0].data = %p",
__FUNCTION__, b->ptr, d[0].data); __FUNCTION__, b->ptr, d[0].data);
spa_list_append(&port->queue, &b->link); spa_list_append(&port->queue, &b->link);
end: end:
@ -638,12 +638,12 @@ static void libcamera_on_fd_events(struct spa_source *source)
} }
if (mmap_read(this) < 0) { if (mmap_read(this) < 0) {
spa_log_debug(this->log, "%s:: mmap_read failure\n", __FUNCTION__); spa_log_debug(this->log, "%s:: mmap_read failure", __FUNCTION__);
return; return;
} }
if (spa_list_is_empty(&port->queue)) { if (spa_list_is_empty(&port->queue)) {
spa_log_debug(this->log, "Exiting %s as spa list is empty\n", __FUNCTION__); spa_log_debug(this->log, "Exiting %s as spa list is empty", __FUNCTION__);
return; return;
} }
@ -799,7 +799,7 @@ mmap_init(struct impl *this,
if(port->memtype == SPA_DATA_DmaBuf) { if(port->memtype == SPA_DATA_DmaBuf) {
d[j].fd = libcamera_get_fd(port->dev.camera, i, j); d[j].fd = libcamera_get_fd(port->dev.camera, i, j);
spa_log_info(this->log, "libcamera: Got fd = %ld for buffer: #%d\n", d[j].fd, i); spa_log_info(this->log, "libcamera: Got fd = %ld for buffer: #%d", d[j].fd, i);
d[j].data = NULL; d[j].data = NULL;
SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED); SPA_FLAG_SET(b->flags, BUFFER_FLAG_ALLOCATED);
} }
@ -853,7 +853,7 @@ static int spa_libcamera_stream_on(struct impl *this)
struct spa_libcamera_device *dev = &port->dev; struct spa_libcamera_device *dev = &port->dev;
if (!dev->have_format) { if (!dev->have_format) {
spa_log_error(this->log, "Exting %s with -EIO\n", __FUNCTION__); spa_log_error(this->log, "Exting %s with -EIO", __FUNCTION__);
return -EIO; return -EIO;
} }
@ -873,7 +873,7 @@ static int spa_libcamera_stream_on(struct impl *this)
port->source.mask = SPA_IO_IN | SPA_IO_ERR; port->source.mask = SPA_IO_IN | SPA_IO_ERR;
port->source.rmask = 0; port->source.rmask = 0;
if (port->source.fd < 0) { if (port->source.fd < 0) {
spa_log_error(this->log, "Failed to create eventfd. Exting %s with -EIO\n", __FUNCTION__); spa_log_error(this->log, "Failed to create eventfd. Exting %s with -EIO", __FUNCTION__);
} else { } else {
spa_loop_add_source(this->data_loop, &port->source); spa_loop_add_source(this->data_loop, &port->source);
this->have_source = true; this->have_source = true;