diff --git a/src/device.c b/src/device.c index 5a07565..211d012 100644 --- a/src/device.c +++ b/src/device.c @@ -163,7 +163,7 @@ void device_close(struct device_t *dev) { for (unsigned index = 0; index < dev->run->n_buffers; ++index) { if (dev->run->hw_buffers[index].start != MAP_FAILED) { if (munmap(dev->run->hw_buffers[index].start, dev->run->hw_buffers[index].length) < 0) { - LOG_PERROR("Can't unmap device buffer %d", index); + LOG_PERROR("Can't unmap device buffer %u", index); } } } @@ -254,7 +254,7 @@ static int _device_apply_dv_timings(struct device_t *dev) { LOG_DEBUG("Calling ioctl(VIDIOC_QUERY_DV_TIMINGS) ..."); if (xioctl(dev->run->fd, VIDIOC_QUERY_DV_TIMINGS, &dv_timings) == 0) { LOG_INFO( - "Got new DV timings: resolution=%dx%d; pixclk=%llu", + "Got new DV timings: resolution=%ux%u; pixclk=%llu", dv_timings.bt.width, dv_timings.bt.height, dv_timings.bt.pixelclock @@ -299,7 +299,7 @@ static int _device_open_format(struct device_t *dev) { char format_str[8]; LOG_PERROR( - "Unable to set format=%s; resolution=%dx%d", + "Unable to set format=%s; resolution=%ux%u", _format_to_string_auto(format_str, 8, dev->format), dev->run->width, dev->run->height @@ -309,12 +309,12 @@ static int _device_open_format(struct device_t *dev) { // Check resolution if (fmt.fmt.pix.width != dev->run->width || fmt.fmt.pix.height != dev->run->height) { - LOG_ERROR("Requested resolution=%dx%d is unavailable", dev->run->width, dev->run->height); + LOG_ERROR("Requested resolution=%ux%u is unavailable", dev->run->width, dev->run->height); } if (_device_apply_resolution(dev, fmt.fmt.pix.width, fmt.fmt.pix.height) < 0) { return -1; } - LOG_INFO("Using resolution: %dx%d", dev->run->width, dev->run->height); + LOG_INFO("Using resolution: %ux%u", dev->run->width, dev->run->height); // Check format if (fmt.fmt.pix.pixelformat != dev->format) { @@ -358,10 +358,10 @@ static int _device_open_mmap(struct device_t *dev) { } if (req.count < 1) { - LOG_ERROR("Insufficient buffer memory: %d", req.count); + LOG_ERROR("Insufficient buffer memory: %u", req.count); return -1; } else { - LOG_INFO("Requested %d HW buffers, got %d", dev->n_buffers, req.count); + LOG_INFO("Requested %u HW buffers, got %u", dev->n_buffers, req.count); } LOG_DEBUG("Allocating HW buffers ..."); @@ -375,17 +375,17 @@ static int _device_open_mmap(struct device_t *dev) { buf_info.memory = V4L2_MEMORY_MMAP; buf_info.index = dev->run->n_buffers; - LOG_DEBUG("Calling ioctl(VIDIOC_QUERYBUF) for device buffer %d ...", dev->run->n_buffers); + LOG_DEBUG("Calling ioctl(VIDIOC_QUERYBUF) for device buffer %u ...", dev->run->n_buffers); if (xioctl(dev->run->fd, VIDIOC_QUERYBUF, &buf_info) < 0) { LOG_PERROR("Can't VIDIOC_QUERYBUF"); return -1; } - LOG_DEBUG("Mapping device buffer %d ...", dev->run->n_buffers); + LOG_DEBUG("Mapping device buffer %u ...", dev->run->n_buffers); dev->run->hw_buffers[dev->run->n_buffers].length = buf_info.length; dev->run->hw_buffers[dev->run->n_buffers].start = mmap(NULL, buf_info.length, PROT_READ|PROT_WRITE, MAP_SHARED, dev->run->fd, buf_info.m.offset); if (dev->run->hw_buffers[dev->run->n_buffers].start == MAP_FAILED) { - LOG_PERROR("Can't map device buffer %d", dev->run->n_buffers); + LOG_PERROR("Can't map device buffer %u", dev->run->n_buffers); return -1; } } @@ -401,7 +401,7 @@ static int _device_open_queue_buffers(struct device_t *dev) { buf_info.memory = V4L2_MEMORY_MMAP; buf_info.index = index; - LOG_DEBUG("Calling ioctl(VIDIOC_QBUF) for buffer %d ...", index); + LOG_DEBUG("Calling ioctl(VIDIOC_QBUF) for buffer %u ...", index); if (xioctl(dev->run->fd, VIDIOC_QBUF, &buf_info) < 0) { LOG_PERROR("Can't VIDIOC_QBUF"); return -1; @@ -416,7 +416,7 @@ static void _device_open_alloc_picbufs(struct device_t *dev) { dev->run->max_picture_size = ((dev->run->width * dev->run->height) << 1) * 2; for (unsigned index = 0; index < dev->run->n_buffers; ++index) { - LOG_DEBUG("Allocating picture buffer %d sized %lu bytes... ", index, dev->run->max_picture_size); + LOG_DEBUG("Allocating picture buffer %u sized %lu bytes... ", index, dev->run->max_picture_size); A_CALLOC(dev->run->pictures[index].data, dev->run->max_picture_size); dev->run->pictures[index].allocated = dev->run->max_picture_size; } diff --git a/src/encoder.c b/src/encoder.c index d93ff9c..88a1ccd 100644 --- a/src/encoder.c +++ b/src/encoder.c @@ -65,7 +65,7 @@ void encoder_prepare(struct encoder_t *encoder, struct device_t *dev) { LOG_DEBUG("Initializing encoder ..."); } - LOG_INFO("Using JPEG quality: %d%%", encoder->quality); + LOG_INFO("Using JPEG quality: %u%%", encoder->quality); # ifdef OMX_ENCODER if (encoder->type == ENCODER_TYPE_OMX) { diff --git a/src/http.c b/src/http.c index 71481a5..a864b8a 100644 --- a/src/http.c +++ b/src/http.c @@ -180,12 +180,12 @@ int http_server_listen(struct http_server_t *server) { LOG_INFO("Listening HTTP on UNIX socket '%s'", server->unix_path); } else { - LOG_DEBUG("Binding HTTP to [%s]:%d ...", server->host, server->port); + LOG_DEBUG("Binding HTTP to [%s]:%u ...", server->host, server->port); if (evhttp_bind_socket(server->run->http, server->host, server->port) < 0) { - LOG_PERROR("Can't bind HTTP on [%s]:%d", server->host, server->port) + LOG_PERROR("Can't bind HTTP on [%s]:%u", server->host, server->port) return -1; } - LOG_INFO("Listening HTTP on [%s]:%d", server->host, server->port); + LOG_INFO("Listening HTTP on [%s]:%u", server->host, server->port); } return 0; diff --git a/src/main.c b/src/main.c index 11717fc..a70ea63 100644 --- a/src/main.c +++ b/src/main.c @@ -99,32 +99,32 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s printf("------------------\n"); printf(" -d|--device -- Path to V4L2 device. Default: %s.\n\n", dev->path); printf(" -i|--input -- Input channel. Default: %u.\n\n", dev->input); - printf(" -x|--width -- Initial image width. Default: %d.\n\n", dev->width); - printf(" -y|--height -- Initial image height. Default: %d.\n\n", dev->height); + printf(" -x|--width -- Initial image width. Default: %u.\n\n", dev->width); + printf(" -y|--height -- Initial image height. Default: %u.\n\n", dev->height); printf(" -m|--format -- Image format.\n"); printf(" Available: %s; default: YUYV.\n\n", FORMATS_STR); printf(" -a|--tv-standard -- Force TV standard.\n"); printf(" Available: %s; default: disabled.\n\n", STANDARDS_STR); - printf(" -f|--desired-fps -- Desired FPS; default: maximum as possible.\n\n"); + printf(" -f|--desired-fps -- Desired FPS. Default: maximum as possible.\n\n"); printf(" -z|--min-frame-size -- Drop frames smaller then this limit.\n"); printf(" Useful if the device produces small-sized garbage frames.\n\n"); printf(" -t|--dv-timings -- Enable DV timings queriyng and events processing.\n"); printf(" Supports automatic resolution changing. Default: disabled.\n\n"); printf(" -b|--buffers -- The number of buffers to receive data from the device.\n"); printf(" Each buffer may processed using an intermediate thread.\n"); - printf(" Default: %d (number of CPU cores + 1)\n\n", dev->n_buffers); - printf(" -w|--workers -- The number of compressing threads. Default: %d (== --buffers).\n\n", dev->n_workers); - printf(" -q|--quality -- Set quality of JPEG encoding from 1 to 100 (best). Default: %d.\n\n", encoder->quality); + printf(" Default: %u (number of CPU cores + 1)\n\n", dev->n_buffers); + printf(" -w|--workers -- The number of compressing threads. Default: %u (== --buffers).\n\n", dev->n_workers); + printf(" -q|--quality -- Set quality of JPEG encoding from 1 to 100 (best). Default: %u.\n\n", encoder->quality); printf(" -c|--encoder -- Use specified encoder. It may affects to workers number.\n"); printf(" -- Available: %s; default: CPU.\n\n", ENCODER_TYPES_STR); - printf(" --device-timeout -- Timeout for device querying. Default: %d\n\n", dev->timeout); + printf(" --device-timeout -- Timeout for device querying. Default: %u\n\n", dev->timeout); printf(" --device-persistent -- Don't re-initialize device on timeout. Default: disabled.\n\n"); printf(" --device-error-delay -- Delay before trying to connect to the device again\n"); - printf(" after a timeout. Default: %d\n\n", dev->error_delay); + printf(" after a timeout. Default: %u\n\n", dev->error_delay); printf("HTTP server options:\n"); printf("--------------------\n"); printf(" -s|--host
-- Listen on Hostname or IP. Default: %s\n\n", server->host); - printf(" -p|--port -- Bind to this TCP port. Default: %d\n\n", server->port); + printf(" -p|--port -- Bind to this TCP port. Default: %u\n\n", server->port); printf(" -u|--unix -- Bind to UNIX domain socket. Default: disabled\n\n"); printf(" -r|--unix-rm -- Try to remove old UNIX socket file before binding. Default: disabled\n\n"); printf(" -o|--unix-mode -- Set UNIX socket file permissions (like 777). Default: disabled\n\n"); @@ -134,15 +134,15 @@ static void _help(struct device_t *dev, struct encoder_t *encoder, struct http_s printf(" or webcams, it's useless. Default: disabled.\n\n"); printf(" --fake-width -- Override image width for /state. Default: disabled\n\n"); printf(" --fake-height -- Override image height for /state. Default: disabled.\n\n"); - printf(" --server-timeout -- Timeout for client connections. Default: %d\n\n", server->timeout); + printf(" --server-timeout -- Timeout for client connections. Default: %u\n\n", server->timeout); printf("Misc options:\n"); printf("-------------\n"); printf(" --log-level -- Verbosity level of messages from 0 (info) to 3 (debug).\n"); printf(" Enabling debugging messages can slow down the program.\n"); printf(" Available levels: 0=info, 1=performance, 2=verbose, 3=debug.\n"); - printf(" Default: %d.\n\n", log_level); - printf(" --perf -- Enable performance messages (same as log-level=1). Default: disabled.\n\n"); - printf(" --verbose -- Enable verbose messages and lower (same as log-level=2). Default: disabled.\n\n"); + printf(" Default: %u.\n\n", log_level); + printf(" --perf -- Enable performance messages (same as --log-level=1). Default: disabled.\n\n"); + printf(" --verbose -- Enable verbose messages and lower (same as --log-level=2). Default: disabled.\n\n"); printf(" --debug -- Enable debug messages and lower (same as --log-level=3). Default: disabled.\n\n"); printf(" -h|--help -- Print this messages and exit.\n\n"); } diff --git a/src/stream.c b/src/stream.c index adac20a..69e4636 100644 --- a/src/stream.c +++ b/src/stream.c @@ -189,7 +189,7 @@ void stream_loop(struct stream_t *stream) { // For example a VGA (640x480) webcam picture is normally >= 8kByte large, // corrupted frames are smaller. if (buf_info.bytesused < stream->dev->min_frame_size) { - LOG_DEBUG("Dropping too small frame sized %d bytes, assuming it as broken", buf_info.bytesused); + LOG_DEBUG("Dropping too small frame sized %u bytes, assuming it as broken", buf_info.bytesused); goto pass_frame; } @@ -215,7 +215,7 @@ void stream_loop(struct stream_t *stream) { LOG_VERBOSE("Fluency: delay=%.03Lf; grab_after=%.03Lf", fluency_delay, grab_after); } - LOG_DEBUG("Grabbed a new frame to buffer %d", buf_info.index); + LOG_DEBUG("Grabbed a new frame to buffer %u", buf_info.index); pool.workers[free_worker_number].ctx.buf_info = buf_info; if (!oldest_worker) { @@ -343,7 +343,7 @@ static int _stream_init_loop(struct device_t *dev, struct workers_pool_t *pool) LOG_DEBUG("%s: *dev->stop = %d", __FUNCTION__, dev->stop); while (!dev->stop) { if ((retval = _stream_init(dev, pool)) < 0) { - LOG_INFO("Sleeping %d seconds before new stream init ...", dev->error_delay); + LOG_INFO("Sleeping %u seconds before new stream init ...", dev->error_delay); sleep(dev->error_delay); } else { break; @@ -378,7 +378,7 @@ static int _stream_init(struct device_t *dev, struct workers_pool_t *pool) { } static void _stream_init_workers(struct device_t *dev, struct workers_pool_t *pool) { - LOG_INFO("Spawning %d workers ...", dev->n_workers); + LOG_INFO("Spawning %u workers ...", dev->n_workers); *pool->workers_stop = false; A_CALLOC(pool->workers, dev->n_workers); @@ -434,7 +434,7 @@ static void *_stream_worker_thread(void *v_ctx) { # define PICTURE(_next) ctx->dev->run->pictures[ctx->buf_index]._next if (!*ctx->workers_stop) { - LOG_DEBUG("Worker %u compressing JPEG from buffer %d ...", ctx->number, ctx->buf_index); + LOG_DEBUG("Worker %u compressing JPEG from buffer %u ...", ctx->number, ctx->buf_index); PICTURE(encode_begin_time) = get_now_monotonic(); if (encoder_compress_buffer(ctx->encoder, ctx->dev, ctx->number, ctx->buf_index) < 0) { @@ -453,7 +453,7 @@ static void *_stream_worker_thread(void *v_ctx) { A_PTHREAD_M_UNLOCK(ctx->last_comp_time_mutex); LOG_VERBOSE( - "Compressed JPEG size=%ld; time=%0.3Lf; worker=%u; buffer=%d", + "Compressed JPEG size=%ld; time=%0.3Lf; worker=%u; buffer=%u", PICTURE(size), last_comp_time, ctx->number, ctx->buf_index ); } else { @@ -470,7 +470,7 @@ static void *_stream_worker_thread(void *v_ctx) { A_PTHREAD_C_SIGNAL(ctx->free_workers_cond); } - LOG_DEBUG("Bye-bye (worker %d)", ctx->number); + LOG_DEBUG("Bye-bye (worker %u)", ctx->number); return NULL; } @@ -528,9 +528,9 @@ static int _stream_grab_buffer(struct device_t *dev, struct v4l2_buffer *buf_inf return -1; } - LOG_DEBUG("Got a new frame in buffer index=%d; bytesused=%d", buf_info->index, buf_info->bytesused); + LOG_DEBUG("Got a new frame in buffer index=%u; bytesused=%u", buf_info->index, buf_info->bytesused); if (buf_info->index >= dev->run->n_buffers) { - LOG_ERROR("Got invalid buffer index=%d; nbuffers=%d", buf_info->index, dev->run->n_buffers); + LOG_ERROR("Got invalid buffer index=%u; nbuffers=%u", buf_info->index, dev->run->n_buffers); return -1; } return 0;