forked/ustreamer
1
0
Fork 0
mirror of https://github.com/pikvm/ustreamer.git synced 2026-03-01 05:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

dump fourcc

Browse Source
This commit is contained in:
Devaev Maxim
2021-01-07 09:58:33 +03:00
parent db00971622
commit 63c7d35b25
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/dump/main.c
View File

@@ -185,8 +185,11 @@ static int _dump_sink(const char *sink_name, unsigned sink_timeout, const char *
const long double now = get_now_monotonic();
const long long now_second = floor_ms(now);
LOG_VERBOSE("Frame: size=%zu, resolution=%ux%u, format=%u, stride=%u, online=%d",
frame->used, frame->width, frame->height, frame->format, frame->stride, frame->online);
char fourcc_str[8];
LOG_VERBOSE("Frame: size=%zu, resolution=%ux%u, fourcc=%s, stride=%u, online=%d",
frame->used, frame->width, frame->height,
fourcc_to_string(frame->format, fourcc_str, 8),
frame->stride, frame->online);
LOG_DEBUG(" grab_ts=%.3Lf, encode_begin_ts=%.3Lf, encode_end_ts=%.3Lf, latency=%.3Lf",
frame->grab_ts, frame->encode_begin_ts, frame->encode_end_ts, now - frame->grab_ts);

11
src/ustreamer/device.c
View File

@@ -501,18 +501,17 @@ static int _device_open_format(device_s *dev, bool first) {
// Check format
if (fmt.fmt.pix.pixelformat != dev->format) {
char format_obtained_str[8];
char *format_str_nullable;
LOG_ERROR("Could not obtain the requested pixelformat=%s; driver gave us %s",
_format_to_string_supported(dev->format),
_format_to_string_supported(fmt.fmt.pix.pixelformat));
if ((format_str_nullable = (char *)_format_to_string_nullable(fmt.fmt.pix.pixelformat)) != NULL) {
LOG_INFO("Falling back to pixelformat=%s", format_str_nullable);
char *format_str;
if ((format_str = (char *)_format_to_string_nullable(fmt.fmt.pix.pixelformat)) != NULL) {
LOG_INFO("Falling back to pixelformat=%s", format_str);
} else {
char fourcc_str[8];
LOG_ERROR("Unsupported pixelformat=%s (fourcc)",
fourcc_to_string(fmt.fmt.pix.pixelformat, format_obtained_str, 8));
fourcc_to_string(fmt.fmt.pix.pixelformat, fourcc_str, 8));
return -1;
}
}