aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2019-04-29 16:53:35 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2019-04-29 16:53:35 +0200
commit851fc5c8a1543e19bd777e3588269a60b94b924f (patch)
tree613cb6ea1931a0ba11f6feed8c6270c8b25d4a92
parent679f65eb1c6acd7aa7cb98dd55b71ad92bdc1b4f (diff)
v4l2-ctl: disable tracing in get_codec_type and do_setup_out_buffers
Disable spurious tracing messages in the get_codec_type() and do_setup_out_buffers() functions. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--utils/v4l2-ctl/v4l2-ctl-streaming.cpp28
1 files changed, 16 insertions, 12 deletions
diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
index 239826d3..28b2b3b9 100644
--- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp
@@ -364,6 +364,7 @@ void streaming_usage(void)
static enum codec_type get_codec_type(cv4l_fd &fd)
{
+ cv4l_disable_trace dt(fd);
struct v4l2_fmtdesc fmt_desc;
int num_cap_fmts = 0;
int num_compressed_cap_fmts = 0;
@@ -1146,20 +1147,23 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf
return QUEUE_ERROR;
fd.g_fmt(fmt, q.g_type());
- if (fd.g_std(stream_out_std)) {
- struct v4l2_dv_timings timings;
-
- stream_out_std = 0;
- if (fd.g_dv_timings(timings))
- memset(&timings, 0, sizeof(timings));
- else if (timings.bt.width == 720 && timings.bt.height == 480)
+ {
+ cv4l_disable_trace dt(fd);
+ if (fd.g_std(stream_out_std)) {
+ struct v4l2_dv_timings timings;
+
+ stream_out_std = 0;
+ if (fd.g_dv_timings(timings))
+ memset(&timings, 0, sizeof(timings));
+ else if (timings.bt.width == 720 && timings.bt.height == 480)
+ aspect = TPG_PIXEL_ASPECT_NTSC;
+ else if (timings.bt.width == 720 && timings.bt.height == 576)
+ aspect = TPG_PIXEL_ASPECT_PAL;
+ } else if (stream_out_std & V4L2_STD_525_60) {
aspect = TPG_PIXEL_ASPECT_NTSC;
- else if (timings.bt.width == 720 && timings.bt.height == 576)
+ } else if (stream_out_std & V4L2_STD_625_50) {
aspect = TPG_PIXEL_ASPECT_PAL;
- } else if (stream_out_std & V4L2_STD_525_60) {
- aspect = TPG_PIXEL_ASPECT_NTSC;
- } else if (stream_out_std & V4L2_STD_625_50) {
- aspect = TPG_PIXEL_ASPECT_PAL;
+ }
}
field = fmt.g_field();

Privacy Policy