@@ -1313,7 +1313,8 @@ static void video_query_menu(struct device *dev,
printf(" %u: %.32s%s\n", menu.index, menu.name,
menu.index == value ? " (*)" : "");
else
- printf(" %u: %lld%s\n", menu.index, menu.value,
+ printf(" %u: %lld%s\n", menu.index,
+ (long long)menu.value,
menu.index == value ? " (*)" : "");
};
}
@@ -1360,7 +1361,7 @@ static void video_print_control_value(const struct v4l2_query_ext_ctrl *query,
printf("0x%08x", ctrl->value);
break;
case V4L2_CTRL_TYPE_INTEGER64:
- printf("%lld", ctrl->value64);
+ printf("%lld", (long long)ctrl->value64);
break;
case V4L2_CTRL_TYPE_STRING:
printf("%s", ctrl->string);
@@ -1399,9 +1400,11 @@ static int video_get_control(struct device *dev,
}
if (full) {
- printf("control 0x%08x `%s' min %lld max %lld step %lld default %lld ",
- query->id, query->name, query->minimum, query->maximum,
- query->step, query->default_value);
+ printf("control 0x%08x `%s' min %lld max %lld step %llu default %lld ",
+ query->id, query->name, (long long)query->minimum,
+ (long long)query->maximum,
+ (unsigned long long)query->step,
+ (long long)query->default_value);
if (query->nr_of_dims) {
for (i = 0; i < query->nr_of_dims; ++i)
printf("[%u]", query->dims[i]);
@@ -2190,13 +2193,16 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
clock_gettime(CLOCK_MONOTONIC, &ts);
get_ts_flags(buf.flags, &ts_type, &ts_source);
- printf("%u (%u) [%c] %s %u %u B %ld.%06ld %ld.%06ld %.3f fps ts %s/%s\n", i, buf.index,
- (buf.flags & V4L2_BUF_FLAG_ERROR) ? 'E' : '-',
- v4l2_field_name(buf.field),
- buf.sequence, video_buffer_bytes_used(dev, &buf),
- buf.timestamp.tv_sec, buf.timestamp.tv_usec,
- ts.tv_sec, ts.tv_nsec/1000, fps,
- ts_type, ts_source);
+ printf("%u (%u) [%c] %s %u %u B %lld.%06lld %lld.%06lld %.3f fps ts %s/%s\n",
+ i, buf.index,
+ (buf.flags & V4L2_BUF_FLAG_ERROR) ? 'E' : '-',
+ v4l2_field_name(buf.field),
+ buf.sequence, video_buffer_bytes_used(dev, &buf),
+ (long long)buf.timestamp.tv_sec,
+ (long long)buf.timestamp.tv_usec,
+ (long long)ts.tv_sec,
+ (long long)(ts.tv_nsec / 1000), fps,
+ ts_type, ts_source);
last = buf.timestamp;
@@ -2252,8 +2258,9 @@ static int video_do_capture(struct device *dev, unsigned int nframes,
bps = size/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0;
fps = i/(ts.tv_nsec/1000.0+1000000.0*ts.tv_sec)*1000000.0;
- printf("Captured %u frames in %lu.%06lu seconds (%f fps, %f B/s).\n",
- i, ts.tv_sec, ts.tv_nsec/1000, fps, bps);
+ printf("Captured %u frames in %llu.%06llu seconds (%f fps, %f B/s).\n",
+ i, (long long)ts.tv_sec, (long long)(ts.tv_nsec / 1000), fps,
+ bps);
done:
video_free_buffers(dev);
mipsel64el, ppc64el, ia64, ppc64, sparc64 and x32 have different lenghts for long long ints, which result in some compilation errors. Lets add some castings to help the compiler deal with this. We cannot use the Format macro constants ffrom inttypes because they seem to not be compatible with kernel (__u64 et al) types. Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> --- yavta.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)