From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BA0BC4CECD for ; Tue, 17 Sep 2019 09:56:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E939A21670 for ; Tue, 17 Sep 2019 09:56:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NGBZGF2W" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725972AbfIQJ4d (ORCPT ); Tue, 17 Sep 2019 05:56:33 -0400 Received: from mail-pf1-f179.google.com ([209.85.210.179]:34299 "EHLO mail-pf1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725801AbfIQJ4d (ORCPT ); Tue, 17 Sep 2019 05:56:33 -0400 Received: by mail-pf1-f179.google.com with SMTP id b128so1867988pfa.1 for ; Tue, 17 Sep 2019 02:56:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BpKDj2JJHMSbDTEZ/ijmMR74snHq+w7OfvzYmQKVpKo=; b=NGBZGF2WD1RJ0lIe4x7HLE3fho5FkgP9CRw9fj3dSTWsQzherGZ6aHbM1lZA4DiAXO KA9KvX/9pY1efxPOJ8w7Qo0oJuea3jmZC6HjnglwRtCZ6SUs+Zx7GSkZOvrLDyi8LWdD uPQchTs8a9Bl87+VIv300uBfTadAHogy5UlGGBWrli+5IxNnSVaU4XFZYMY80Vkk4LGs NMxXi9f7AgoewahfPWmangD/GVU2WjSB/UKv34JjGhPi2VZpG2tEQnfMsipk71GFhkTi bSG/d/aXC/Nua/QIuosM17Du2mek41QONPiTj52r5W+RJUUz44Wlqx/0n3AexjZ7PbEf byRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BpKDj2JJHMSbDTEZ/ijmMR74snHq+w7OfvzYmQKVpKo=; b=Kv4oUN/93Vh3t1t7NrF5k7CY1SYy07KGQ3h1dBzQyJEq3m9xS7cDzMq/aCsSl/xrKh srl9jAuFsY9Mr/xjuYaYleNUBthVVM5k2zAluG8IUHUbJtTTiDWlLmm+HTGmQ+LRVOBP LpChi2y6EsDKEyeQZvbmG1GP62tkCVlstljQhpiwOQJsvb2b8LEWjvjsnQ36wyLhIaCK jqg5ZUNwaBWdzX1Wfgiqq7Zd8UB49AX39zMkx7/bWziIWHni+AZzWQv6FkUn7ZVhxGuH BydO2E7g3dm5d2G+wi1q512EWzmZJWdwYWIZsTKjziscey6Vos3e6ArS08iHFa/3d2nz eBaQ== X-Gm-Message-State: APjAAAUpzPM90k8s3oVeC9curoZo3duQKh9UAmiclwaQntSb4k1Qvyct +k/39mXVhcfsTrnIfLbWJkJpymINNK8= X-Google-Smtp-Source: APXvYqybOAjm21k3Ej+Tjqtyxdqel8egiR3tnRV35y1025C6T48QjeNrfs7rjuTXfjp/EfLEm+RFKQ== X-Received: by 2002:a63:4562:: with SMTP id u34mr2469190pgk.288.1568714191958; Tue, 17 Sep 2019 02:56:31 -0700 (PDT) Received: from bnva-HP-Pavilion-g6-Notebook-PC.domain.name ([117.241.200.70]) by smtp.gmail.com with ESMTPSA id s5sm1916980pfe.52.2019.09.17.02.56.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 02:56:31 -0700 (PDT) From: Vandana BN To: linux-media@vger.kernel.org, linux-kernel-mentees@lists.linuxfoundation.org Cc: hverkuil@xs4all.nl, Vandana BN Subject: [PATCH v4] v4l2-ctl: Print UVC meta info Date: Tue, 17 Sep 2019 15:26:16 +0530 Message-Id: <20190917095616.3554-1-bnvandana@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <97514f22-b21a-ae56-2972-e845c16c90a0@xs4all.nl> References: <97514f22-b21a-ae56-2972-e845c16c90a0@xs4all.nl> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Print UVC Metadata information in verbose mode. Signed-off-by: Vandana BN --- Changes since v3: - Coding style corrections in print_meta_buffer. --- utils/v4l2-ctl/v4l2-ctl-meta.cpp | 27 +++++++++++++++++++++++++++ utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 14 ++++++++------ utils/v4l2-ctl/v4l2-ctl.h | 1 + 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/utils/v4l2-ctl/v4l2-ctl-meta.cpp b/utils/v4l2-ctl/v4l2-ctl-meta.cpp index 75fbd6f4..1755798a 100644 --- a/utils/v4l2-ctl/v4l2-ctl-meta.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-meta.cpp @@ -127,3 +127,30 @@ void meta_list(cv4l_fd &fd) print_video_formats(fd, V4L2_BUF_TYPE_META_OUTPUT); } } + +struct vivid_uvc_meta_buf { + __u64 ns; + __u16 sof; + __u8 length; + __u8 flags; + __u8 buf[]; +}; + +void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q) +{ + struct vivid_uvc_meta_buf *vbuf; + + switch (fmt.g_pixelformat()) { + case V4L2_META_FMT_UVC: + fprintf(f, "UVC: "); + for (unsigned i = 0; i < buf.g_num_planes(); i++) { + vbuf = (vivid_uvc_meta_buf *)q.g_dataptr(buf.g_index(), i); + fprintf(f, "%.6fs, sof %u, len %u, flags 0x%x\n", + (double)vbuf[i].ns / 1000000000.0, + vbuf[i].sof, + vbuf[i].length, + vbuf[i].flags); + } + break; + } +} diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp index 11157434..46d53f23 100644 --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp @@ -540,9 +540,9 @@ static void print_buffer(FILE *f, struct v4l2_buffer &buf) fprintf(f, "\n"); } -static void print_concise_buffer(FILE *f, cv4l_buffer &buf, - fps_timestamps &fps_ts, int comp_perc, - bool skip_ts = false) +static void print_concise_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, + cv4l_queue &q, fps_timestamps &fps_ts, + int comp_perc, bool skip_ts = false) { static double last_ts; @@ -592,6 +592,8 @@ static void print_concise_buffer(FILE *f, cv4l_buffer &buf, if (fl) fprintf(f, " (%s)", bufferflags2s(fl).c_str()); fprintf(f, "\n"); + if (v4l_type_is_meta(buf.g_type())) + print_meta_buffer(f, buf, fmt, q); } static void stream_buf_caps(cv4l_fd &fd, unsigned buftype) @@ -1390,7 +1392,7 @@ static int do_handle_cap(cv4l_fd &fd, cv4l_queue &q, FILE *fout, int *index, if (!(buf.g_flags() & V4L2_BUF_FLAG_ERROR)) break; if (verbose) - print_concise_buffer(stderr, buf, fps_ts, -1); + print_concise_buffer(stderr, buf, fmt, q, fps_ts, -1); if (fd.qbuf(buf)) return QUEUE_ERROR; } @@ -1412,7 +1414,7 @@ static int do_handle_cap(cv4l_fd &fd, cv4l_queue &q, FILE *fout, int *index, else if (buf.g_flags() & V4L2_BUF_FLAG_BFRAME) ch = 'B'; if (verbose) { - print_concise_buffer(stderr, buf, fps_ts, + print_concise_buffer(stderr, buf, fmt, q, fps_ts, host_fd_to >= 0 ? 100 - comp_perc / comp_perc_count : -1); comp_perc_count = comp_perc = 0; } @@ -1502,7 +1504,7 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap double ts_secs = buf.g_timestamp().tv_sec + buf.g_timestamp().tv_usec / 1000000.0; fps_ts.add_ts(ts_secs, buf.g_sequence(), buf.g_field()); if (verbose) - print_concise_buffer(stderr, buf, fps_ts, -1); + print_concise_buffer(stderr, buf, fmt, q, fps_ts, -1); for (unsigned j = 0; j < buf.g_num_planes(); j++) buf.s_bytesused(buf.g_length(j), j); diff --git a/utils/v4l2-ctl/v4l2-ctl.h b/utils/v4l2-ctl/v4l2-ctl.h index 5797d784..36051566 100644 --- a/utils/v4l2-ctl/v4l2-ctl.h +++ b/utils/v4l2-ctl/v4l2-ctl.h @@ -406,6 +406,7 @@ void meta_cmd(int ch, char *optarg); void meta_set(cv4l_fd &fd); void meta_get(cv4l_fd &fd); void meta_list(cv4l_fd &fd); +void print_meta_buffer(FILE *f, cv4l_buffer &buf, cv4l_fmt &fmt, cv4l_queue &q); // v4l2-ctl-subdev.cpp void subdev_usage(void); -- 2.17.1