From patchwork Sun Feb 17 13:42:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 10817023 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62377922 for ; Sun, 17 Feb 2019 13:42:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E1C82A1A8 for ; Sun, 17 Feb 2019 13:42:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42BB52A1AB; Sun, 17 Feb 2019 13:42:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AECEC2A1A8 for ; Sun, 17 Feb 2019 13:42:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727661AbfBQNmX (ORCPT ); Sun, 17 Feb 2019 08:42:23 -0500 Received: from mail-wm1-f51.google.com ([209.85.128.51]:32843 "EHLO mail-wm1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726583AbfBQNmW (ORCPT ); Sun, 17 Feb 2019 08:42:22 -0500 Received: by mail-wm1-f51.google.com with SMTP id h22so10135228wmb.0 for ; Sun, 17 Feb 2019 05:42:21 -0800 (PST) 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=GBbQ/vkk1SAuZy9P+bDsHlaMw6sm4ht6Ti5xqOT37qs=; b=RaeToYV4ggs6sSbeHIBP6k6X29cRNVbBNCFiGmV71OXw6FfOWmfk6DsKYNbj8xoJjH pJ3oYoi7ApCq/3FNnOPQdSYpEOezG+iJubjHX/AWELbI49VqEhY55crwkwc8VpcgO7pn gCA0CtT7J5rYaFMA56yUYuyXm0ih5UByy0ZXyoYI9ZlY/gtBh+WxC3KsBU4W7n5pMRXg gFtBW2p+Zgq/tG33Mzaj6JQLoHPw88IBZSW/BCxgXkCvkBQtlo9sEhpkoh5c2TRCqhAX Dcvynzkclrp3Zax+0JfUYOdhnFMFynUgMdVuIr631NoAPAFiw7rIy2aNumnWlta4EqzU ZbWA== 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=GBbQ/vkk1SAuZy9P+bDsHlaMw6sm4ht6Ti5xqOT37qs=; b=jJ+n2oRFxF6LhZXB7zq/yXmKtVukztlI56a6xo4Bibg3VAosgwO5yl+JUgVlmG3iTM Mt0ACQBWdPj7g8fWg+wMpNPWi4wEWHs0fMnS0FWExVgmHdgJRd5w65U6U5SOVJFIDaNF 831OWUOD67l0CLThDUMsTzxGsksfHVlvv2n0ITVIrrspNLXyv9OsBs7q+pj3Q3O3l8NZ bQjSFimimLMgCtEEwiPOpYIMLVmMNMFWpxCGtZpetJczkpDIDMTbD8xN0Z9cSPAZWBeF Sz6mrqT2gKBTbifaD9bTDSpojvYRrcfB0F6pxrS9o4IPg5QVaX4F+eP9rA+Lmq8jC3RE VSlw== X-Gm-Message-State: AHQUAublrsxnNzDD1nt6fLwQ688JIfpByKsVy0I2o3yBmr7yGIsiMj0J EFzqaZht7XIWuZ0v2kjG727fqu9LbPk= X-Google-Smtp-Source: AHgI3IaiP9zBbX5MaZ+KV6sVhX85iP23JZA/FsHsaEOG2kVidpyWo6ruwThw3/ZfqIwVkiXLF3gLeQ== X-Received: by 2002:a1c:2884:: with SMTP id o126mr13295540wmo.17.1550410940114; Sun, 17 Feb 2019 05:42:20 -0800 (PST) Received: from localhost.localdomain ([87.71.54.246]) by smtp.gmail.com with ESMTPSA id o5sm39200711wrh.34.2019.02.17.05.42.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 05:42:19 -0800 (PST) From: Dafna Hirschfeld To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, helen.koike@collabora.com, Dafna Hirschfeld Subject: [v4l-utils PATCH v2 1/4] v4l2-ctl: move stateful m2m decode code to a separate function Date: Sun, 17 Feb 2019 05:42:06 -0800 Message-Id: <20190217134209.84066-2-dafna3@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190217134209.84066-1-dafna3@gmail.com> References: <20190217134209.84066-1-dafna3@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the function stateful_m2m that implements the stateful codec api. This is a preparation for having both stateful and stateless implementations Signed-off-by: Dafna Hirschfeld --- utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 95 ++++++++++++++------------- 1 file changed, 50 insertions(+), 45 deletions(-) diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp index 766872b5..40ddc1c3 100644 --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp @@ -1933,16 +1933,12 @@ static int capture_setup(cv4l_fd &fd, cv4l_queue &in, cv4l_fd *exp_fd) return 0; } -static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) +static void stateful_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out, + FILE *fin, FILE *fout, cv4l_fd *exp_fd_p) { int fd_flags = fcntl(fd.g_fd(), F_GETFL); - cv4l_queue in(fd.g_type(), memory); - cv4l_queue out(v4l_type_invert(fd.g_type()), out_memory); - cv4l_queue exp_q(exp_fd.g_type(), V4L2_MEMORY_MMAP); - cv4l_fd *exp_fd_p = NULL; fps_timestamps fps_ts[2]; unsigned count[2] = { 0, 0 }; - FILE *file[2] = {NULL, NULL}; fd_set fds[3]; fd_set *rd_fds = &fds[0]; /* for capture */ fd_set *ex_fds = &fds[1]; /* for capture */ @@ -1953,19 +1949,6 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) fd.g_fmt(fmt[OUT], out.g_type()); fd.g_fmt(fmt[CAP], in.g_type()); - if (!fd.has_vid_m2m()) { - fprintf(stderr, "unsupported m2m stream type\n"); - return; - } - if (options[OptStreamDmaBuf] && options[OptStreamOutDmaBuf]) { - fprintf(stderr, "--stream-dmabuf and --stream-out-dmabuf not supported for m2m devices\n"); - return; - } - if ((options[OptStreamDmaBuf] || options[OptStreamOutDmaBuf]) && exp_fd.g_fd() < 0) { - fprintf(stderr, "--stream-dmabuf or --stream-out-dmabuf can only work in combination with --export-device\n"); - return; - } - struct v4l2_event_subscription sub; memset(&sub, 0, sizeof(sub)); @@ -1986,34 +1969,18 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) sub.type = V4L2_EVENT_SOURCE_CHANGE; bool have_source_change = !fd.subscribe_event(sub); - file[CAP] = open_output_file(fd); - file[OUT] = open_input_file(fd, out.g_type()); - if (out.reqbufs(&fd, reqbufs_count_out)) - goto done; - - if (options[OptStreamDmaBuf]) { - if (exp_q.reqbufs(&exp_fd, reqbufs_count_cap)) - goto done; - exp_fd_p = &exp_fd; - } - - if (options[OptStreamOutDmaBuf]) { - if (exp_q.reqbufs(&exp_fd, reqbufs_count_out)) - goto done; - if (out.export_bufs(&exp_fd, exp_fd.g_type())) - goto done; - } + return; - if (do_setup_out_buffers(fd, out, file[OUT], true)) - goto done; + if (do_setup_out_buffers(fd, out, fout, true)) + return; if (fd.streamon(out.g_type())) - goto done; + return; if (codec_type != DECODER || !have_source_change) if (capture_setup(fd, in, exp_fd_p)) - goto done; + return; fps_ts[CAP].determine_field(fd.g_fd(), in.g_type()); fps_ts[OUT].determine_field(fd.g_fd(), out.g_type()); @@ -2049,15 +2016,15 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) continue; fprintf(stderr, "select error: %s\n", strerror(errno)); - goto done; + return; } if (r == 0) { fprintf(stderr, "select timeout\n"); - goto done; + return; } if (rd_fds && FD_ISSET(fd.g_fd(), rd_fds)) { - r = do_handle_cap(fd, in, file[CAP], NULL, + r = do_handle_cap(fd, in, fin, NULL, count[CAP], fps_ts[CAP], fmt[CAP]); if (r < 0) { rd_fds = NULL; @@ -2069,7 +2036,7 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) } if (wr_fds && FD_ISSET(fd.g_fd(), wr_fds)) { - r = do_handle_out(fd, out, file[OUT], NULL, + r = do_handle_out(fd, out, fout, NULL, count[OUT], fps_ts[OUT], fmt[OUT]); if (r < 0) { wr_fds = NULL; @@ -2120,7 +2087,7 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) in_source_change_event = false; last_buffer = false; if (capture_setup(fd, in, exp_fd_p)) - goto done; + return; fd.g_fmt(fmt[OUT], out.g_type()); fd.g_fmt(fmt[CAP], in.g_type()); cap_streaming = true; @@ -2138,7 +2105,45 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) in.free(&fd); out.free(&fd); tpg_free(&tpg); +} + +static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) +{ + cv4l_queue in(fd.g_type(), memory); + cv4l_queue out(v4l_type_invert(fd.g_type()), out_memory); + cv4l_queue exp_q(exp_fd.g_type(), V4L2_MEMORY_MMAP); + cv4l_fd *exp_fd_p = NULL; + FILE *file[2] = {NULL, NULL}; + + if (!fd.has_vid_m2m()) { + fprintf(stderr, "unsupported m2m stream type\n"); + return; + } + if (options[OptStreamDmaBuf] && options[OptStreamOutDmaBuf]) { + fprintf(stderr, "--stream-dmabuf and --stream-out-dmabuf not supported for m2m devices\n"); + return; + } + if ((options[OptStreamDmaBuf] || options[OptStreamOutDmaBuf]) && exp_fd.g_fd() < 0) { + fprintf(stderr, "--stream-dmabuf or --stream-out-dmabuf can only work in combination with --export-device\n"); + return; + } + file[CAP] = open_output_file(fd); + file[OUT] = open_input_file(fd, out.g_type()); + + if (options[OptStreamDmaBuf]) { + if (exp_q.reqbufs(&exp_fd, reqbufs_count_cap)) + return; + exp_fd_p = &exp_fd; + } + + if (options[OptStreamOutDmaBuf]) { + if (exp_q.reqbufs(&exp_fd, reqbufs_count_out)) + return; + if (out.export_bufs(&exp_fd, exp_fd.g_type())) + return; + } + stateful_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p); done: if (options[OptStreamDmaBuf] || options[OptStreamOutDmaBuf]) exp_q.close_exported_fds(); From patchwork Sun Feb 17 13:42:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 10817025 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 66716922 for ; Sun, 17 Feb 2019 13:42:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53FE42A1A8 for ; Sun, 17 Feb 2019 13:42:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 485362A1AB; Sun, 17 Feb 2019 13:42:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC4762A1A8 for ; Sun, 17 Feb 2019 13:42:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727686AbfBQNmY (ORCPT ); Sun, 17 Feb 2019 08:42:24 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:41280 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727462AbfBQNmX (ORCPT ); Sun, 17 Feb 2019 08:42:23 -0500 Received: by mail-wr1-f67.google.com with SMTP id n2so3176744wrw.8 for ; Sun, 17 Feb 2019 05:42:22 -0800 (PST) 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=2Kz4T0TAMia1m8zxthVlaxPb1YjonSLkcRZLcMO9ol4=; b=AL6qIFJnnCENQivTZrpSDk7isP21INSs8n+DLBE0lpqOBiHBfAoOMZgXLGbgiaS0Nn +vRr0yr+HXzqW5sujplbcA+30j+xgsKlT2ZBxaFrcM58vH2epO7zOv20clA/4iu3CtYH 7t8SnTuuR5fI9VoAq0DVwyzhP3MqbVxeEDeA4GWlkvq89jAwzzFI8hYFsi8UuZnS/dE5 XK/FE8mdsAhMsaLwoxuH5SEmYIULMNFoN0JpfXvKCqgRBwEjRF2HsqAvfZpbmmK4v5ec yOneyJOv4jvpjy3vkGZVbXscM3QMpoSyk8yZbuZ4EjAQS55XqprUXv1Y++Wd+13uausL sYfg== 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=2Kz4T0TAMia1m8zxthVlaxPb1YjonSLkcRZLcMO9ol4=; b=t1cO8FIFNO+ZYtwR1c7UCvMplv+h4QKwtJV982pMyqoh8yY5EnzvpAQbZGVtFVF1BE phDIEbRs5Vy86LxIBskg52XKaulzrhOIq3nOiCzbfQEVbqlOUW5B7P/5FIBzOhpwN+Dd B39z86pUaRjai8LduiFYoD+UvSX0+4dlQLmE3Khgc6JrbiXj9/hR2dElxX+QnG9XyMq/ LQ+ZbIQwxbOaKLVs8HP+/YQ83nWoqBhHt9ISjjjUcw/WRnABs++PO+6CMmqxh4MJc3Fl ag+tMB3lm4k3NGNJ2d7tNeuSDLs9Shyry8j5kf4BRzgJen0w1Ddvtz0iKRE9CrfSzNXM 0tYA== X-Gm-Message-State: AHQUAubQXZjjNBnoeniUFqhUUs9eXHv//lNmrJeOuEKVdyaHq1IsLg8L hsThXwQ8CMkpAhZcl/RYwei9jPRorMs= X-Google-Smtp-Source: AHgI3IbK7fGfcGZlQpc0IYimceF0T4lW2bioljpvjza4ac4WRwa7aL86QY1Z2MwH9Jn4E1DidkqqUQ== X-Received: by 2002:adf:e30f:: with SMTP id b15mr13122706wrj.0.1550410941396; Sun, 17 Feb 2019 05:42:21 -0800 (PST) Received: from localhost.localdomain ([87.71.54.246]) by smtp.gmail.com with ESMTPSA id o5sm39200711wrh.34.2019.02.17.05.42.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 05:42:20 -0800 (PST) From: Dafna Hirschfeld To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, helen.koike@collabora.com, Dafna Hirschfeld Subject: [v4l-utils PATCH v2 2/4] (c)v4l-helpers.h: Add support for the request api Date: Sun, 17 Feb 2019 05:42:07 -0800 Message-Id: <20190217134209.84066-3-dafna3@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190217134209.84066-1-dafna3@gmail.com> References: <20190217134209.84066-1-dafna3@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add an array of request file descriptors to v4l_queue and add methods to allocate and get them. Signed-off-by: Dafna Hirschfeld --- utils/common/cv4l-helpers.h | 5 +++++ utils/common/v4l-helpers.h | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/utils/common/cv4l-helpers.h b/utils/common/cv4l-helpers.h index 1cd2b6b2..551d4673 100644 --- a/utils/common/cv4l-helpers.h +++ b/utils/common/cv4l-helpers.h @@ -745,6 +745,7 @@ public: unsigned g_capabilities() const { return v4l_queue_g_capabilities(this); } unsigned g_length(unsigned plane) const { return v4l_queue_g_length(this, plane); } unsigned g_mem_offset(unsigned index, unsigned plane) const { return v4l_queue_g_mem_offset(this, index, plane); } + unsigned g_req_fd(unsigned index) const { return v4l_queue_g_req_fd(this, index); } void *g_mmapping(unsigned index, unsigned plane) const { return v4l_queue_g_mmapping(this, index, plane); } void s_mmapping(unsigned index, unsigned plane, void *m) { v4l_queue_s_mmapping(this, index, plane, m); } void *g_userptr(unsigned index, unsigned plane) const { return v4l_queue_g_userptr(this, index, plane); } @@ -797,6 +798,10 @@ public: { return v4l_queue_export_bufs(fd->g_v4l_fd(), this, exp_type); } + int alloc_req(int media_fd, unsigned index) + { + return v4l_queue_alloc_req(this, media_fd, index); + } void close_exported_fds() { v4l_queue_close_exported_fds(this); diff --git a/utils/common/v4l-helpers.h b/utils/common/v4l-helpers.h index 59d8566a..daa49a1f 100644 --- a/utils/common/v4l-helpers.h +++ b/utils/common/v4l-helpers.h @@ -10,6 +10,7 @@ #define _V4L_HELPERS_H_ #include +#include #include #include #include @@ -1414,6 +1415,7 @@ struct v4l_queue { void *mmappings[VIDEO_MAX_FRAME][VIDEO_MAX_PLANES]; unsigned long userptrs[VIDEO_MAX_FRAME][VIDEO_MAX_PLANES]; int fds[VIDEO_MAX_FRAME][VIDEO_MAX_PLANES]; + int req_fds[VIDEO_MAX_FRAME]; }; static inline void v4l_queue_init(struct v4l_queue *q, @@ -1445,6 +1447,11 @@ static inline __u32 v4l_queue_g_mem_offset(const struct v4l_queue *q, unsigned i return q->mem_offsets[index][plane]; } +static inline unsigned v4l_queue_g_req_fd(const struct v4l_queue *q, unsigned index) +{ + return q->req_fds[index]; +} + static inline void v4l_queue_s_mmapping(struct v4l_queue *q, unsigned index, unsigned plane, void *m) { q->mmappings[index][plane] = m; @@ -1701,6 +1708,21 @@ static inline int v4l_queue_export_bufs(struct v4l_fd *f, struct v4l_queue *q, return 0; } +static inline int v4l_queue_alloc_req(struct v4l_queue *q, int media_fd, unsigned index) +{ + int rc = 0; + + rc = ioctl(media_fd, MEDIA_IOC_REQUEST_ALLOC, &q->req_fds[index]); + if (rc < 0) { + fprintf(stderr, "Unable to allocate media request: %s\n", + strerror(errno)); + return rc; + } + + return 0; +} + + static inline void v4l_queue_close_exported_fds(struct v4l_queue *q) { unsigned b, p; From patchwork Sun Feb 17 13:42:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 10817027 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 496FE922 for ; Sun, 17 Feb 2019 13:42:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 378AE2A1A8 for ; Sun, 17 Feb 2019 13:42:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2C0372A1AB; Sun, 17 Feb 2019 13:42:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FF822A1A8 for ; Sun, 17 Feb 2019 13:42:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728995AbfBQNmZ (ORCPT ); Sun, 17 Feb 2019 08:42:25 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41281 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726583AbfBQNmZ (ORCPT ); Sun, 17 Feb 2019 08:42:25 -0500 Received: by mail-wr1-f66.google.com with SMTP id n2so3176776wrw.8 for ; Sun, 17 Feb 2019 05:42:23 -0800 (PST) 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=hhP16LADqSTjNXD+WPerFVsTAV8qU6SbtqyqTkW/fzI=; b=gKYhhhb0RKr9s3Hc4nwMPA2b+NBbqgPKoQhSaynulhhv+Ckm0jU4cA43ugfUaXv/wH lGBpQ7Xkm0G8S9grQRlDy8m2xn9+7lHNWNbA4N5OkN0AcakM6IukrU9zKnNBKkNAsser oVrklHTBPcoVipDNGLPhkEtTaJXQtDiBkTEUfl1uSmhlrln39htxgI3fs7k20vBGZx8u tRkrD0NjOwQ0g+4fuWTDYfFtGZnOv21SP77yqEb4+hulMwZZco+32IKeKN3SgHKe5i0B algPkfE6/nLppkkTAF1IuCRSlldkNs1Kq3rY9FBInqdQXubOAAeAYCN6wflJWsGmNrNm nkqQ== 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=hhP16LADqSTjNXD+WPerFVsTAV8qU6SbtqyqTkW/fzI=; b=bR4+uma7vVJkNSZHRVq16japyLI6zEodfSEPhHq2PrFUztxZJ9Gs5gwe8Wkiw12VMN HAUJ9eIl/jmTEE/l3fs1duld36ZWYSJqPtLOgZnE4jl3rpVBLZgO4Ma1EX43pAgMk/FG 05yBodRN9ZYsMxqmvENHRSofvErrHBQDkOzPAJF6rVt5PFoq1UL+AO/aP0hVeuEnyfbV F4l9KMOHjOSdBRnTR8ahXO00sYXGgrRBLGcXlRCcADeVf6rJYAuuSeg+7TdT1bITbMhK Ga8FTZ5o2MPRGP8S0ySmyidNFcbg7FRt0FlPYdWg8dsUQk+Bie6vSe0s0hAK7s+Y90sm K6Og== X-Gm-Message-State: AHQUAuad1OTteF3SzDdT+TXVuNj0Bu+4NisGOPqFBWPIenKhNTRNXLZ3 TNbb4W3r0GLt3d0qQvWdVQ5vkfp+ucY= X-Google-Smtp-Source: AHgI3IbN4xXgqf19oMOlODy1IuyDOrbp9z55iTw0jfQcQMB7TW4PbazbjGeWa3rBEggIK842TPkB6g== X-Received: by 2002:adf:822d:: with SMTP id 42mr13179018wrb.63.1550410942737; Sun, 17 Feb 2019 05:42:22 -0800 (PST) Received: from localhost.localdomain ([87.71.54.246]) by smtp.gmail.com with ESMTPSA id o5sm39200711wrh.34.2019.02.17.05.42.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 05:42:22 -0800 (PST) From: Dafna Hirschfeld To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, helen.koike@collabora.com, Dafna Hirschfeld Subject: [v4l-utils PATCH v2 3/4] v4l2-ctl: Add functions and variables to support fwht stateless decoder Date: Sun, 17 Feb 2019 05:42:08 -0800 Message-Id: <20190217134209.84066-4-dafna3@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190217134209.84066-1-dafna3@gmail.com> References: <20190217134209.84066-1-dafna3@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add the variable 'last_fwht_bf_ts' and the array 'fwht_reqs' to allow the fwht stateless decoder to maintain the requests. Signed-off-by: Dafna Hirschfeld --- utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 120 ++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp index 40ddc1c3..ec43bd03 100644 --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp @@ -20,11 +20,17 @@ #include "v4l2-ctl.h" #include "v4l-stream.h" +#include extern "C" { #include "v4l2-tpg.h" } +#define VICODEC_CID_CUSTOM_BASE (V4L2_CID_MPEG_BASE | 0xf000) +#define VICODEC_CID_I_FRAME_QP (VICODEC_CID_CUSTOM_BASE + 0) +#define VICODEC_CID_P_FRAME_QP (VICODEC_CID_CUSTOM_BASE + 1) +#define VICODEC_CID_STATELESS_FWHT (VICODEC_CID_CUSTOM_BASE + 2) + static unsigned stream_count; static unsigned stream_skip; static __u32 memory = V4L2_MEMORY_MMAP; @@ -80,6 +86,16 @@ static bool support_cap_compose; static bool support_out_crop; static bool in_source_change_event; +static __u64 last_fwht_bf_ts; + +struct request_fwht { + int fd; + __u64 ts; + struct v4l2_ctrl_fwht_params params; +}; + +static request_fwht fwht_reqs[VIDEO_MAX_FRAME]; + #define TS_WINDOW 241 #define FILE_HDR_ID v4l2_fourcc('V', 'h', 'd', 'r') @@ -420,6 +436,12 @@ static int get_out_crop_rect(cv4l_fd &fd) return 0; } +static __u64 get_ns_timestamp(cv4l_buffer &buf) +{ + const struct timeval tv = buf.g_timestamp(); + return v4l2_timeval_to_ns(&tv); +} + static void set_time_stamp(cv4l_buffer &buf) { if ((buf.g_flags() & V4L2_BUF_FLAG_TIMESTAMP_MASK) != V4L2_BUF_FLAG_TIMESTAMP_COPY) @@ -749,6 +771,104 @@ void streaming_cmd(int ch, char *optarg) } } +/* + * Assume that the fwht stream is valid and that each + * frame starts right after the previous one. + */ +static void read_fwht_frame(cv4l_fmt &fmt, unsigned char *buf, + FILE *fpointer, unsigned &sz, + unsigned &len) +{ + struct fwht_cframe_hdr *h = (struct fwht_cframe_hdr *)buf; + + len = sizeof(struct fwht_cframe_hdr); + sz = fread(buf, 1, sizeof(struct fwht_cframe_hdr), fpointer); + if (sz < sizeof(struct fwht_cframe_hdr)) + return; + + len += ntohl(h->size); + sz += fread(buf + sz, 1, ntohl(h->size), fpointer); +} + +static void set_fwht_stateless_params(struct v4l2_ctrl_fwht_params &fwht_params, + const struct fwht_cframe_hdr *hdr, + __u64 last_bf_ts) +{ + fwht_params.backward_ref_ts = last_bf_ts; + fwht_params.version = ntohl(hdr->version); + fwht_params.width = ntohl(hdr->width); + fwht_params.height = ntohl(hdr->height); + fwht_params.flags = ntohl(hdr->flags); + fwht_params.colorspace = ntohl(hdr->colorspace); + fwht_params.xfer_func = ntohl(hdr->xfer_func); + fwht_params.ycbcr_enc = ntohl(hdr->ycbcr_enc); + fwht_params.quantization = ntohl(hdr->quantization); + fwht_params.comp_frame_size = ntohl(hdr->size); + + if (!last_bf_ts) + fwht_params.flags |= FWHT_FL_I_FRAME; +} + +static void set_fwht_req_by_idx(unsigned idx, struct fwht_cframe_hdr *hdr, + int req_fd, __u64 last_bf_ts, __u64 ts) +{ + struct v4l2_ctrl_fwht_params fwht_params; + + set_fwht_stateless_params(fwht_params, hdr, last_bf_ts); + + fwht_reqs[idx].fd = req_fd; + fwht_reqs[idx].ts = ts; + fwht_reqs[idx].params = fwht_params; +} + +static int get_fwht_req_by_ts(__u64 ts) +{ + for (int idx = 0; idx < VIDEO_MAX_FRAME; idx++) { + if (fwht_reqs[idx].ts == ts) + return idx; + } + return -1; +} + +static bool set_fwht_req_by_fd(struct fwht_cframe_hdr *hdr, + int req_fd, __u64 last_bf_ts, __u64 ts) +{ + struct v4l2_ctrl_fwht_params fwht_params; + + set_fwht_stateless_params(fwht_params, hdr, last_bf_ts); + + for (int idx = 0; idx < VIDEO_MAX_FRAME; idx++) { + if (fwht_reqs[idx].fd == req_fd) { + fwht_reqs[idx].ts = ts; + fwht_reqs[idx].params = fwht_params; + return true; + } + } + return false; +} + +static int set_fwht_ext_ctrl(cv4l_fd &fd, struct fwht_cframe_hdr *hdr, + __u64 last_bf_ts, int req_fd) +{ + v4l2_ext_controls controls; + struct v4l2_ext_control control; + struct v4l2_ctrl_fwht_params fwht_params; + + memset(&control, 0, sizeof(control)); + memset(&controls, 0, sizeof(controls)); + + set_fwht_stateless_params(fwht_params, hdr, last_bf_ts); + + control.id = VICODEC_CID_STATELESS_FWHT; + control.ptr = &fwht_params; + control.size = sizeof(fwht_params); + controls.which = V4L2_CTRL_WHICH_REQUEST_VAL; + controls.request_fd = req_fd; + controls.controls = &control; + controls.count = 1; + return fd.s_ext_ctrls(controls); +} + static void read_write_padded_frame(cv4l_fmt &fmt, unsigned char *buf, FILE *fpointer, unsigned &sz, unsigned &len, bool is_read) From patchwork Sun Feb 17 13:42:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dafna Hirschfeld X-Patchwork-Id: 10817029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 811B1922 for ; Sun, 17 Feb 2019 13:42:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E1C82A1A8 for ; Sun, 17 Feb 2019 13:42:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62CCB2A1AB; Sun, 17 Feb 2019 13:42:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 998122A1A8 for ; Sun, 17 Feb 2019 13:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729037AbfBQNm1 (ORCPT ); Sun, 17 Feb 2019 08:42:27 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40468 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727462AbfBQNm0 (ORCPT ); Sun, 17 Feb 2019 08:42:26 -0500 Received: by mail-wr1-f68.google.com with SMTP id q1so15328537wrp.7 for ; Sun, 17 Feb 2019 05:42:25 -0800 (PST) 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=cjjOnyPyn2JHfRZhcyH/y1nYrUJZ6c1Y+fdOzAdXhZE=; b=HCeXZ8+4i+aLLbr0TLbbVqi3xJa9n+XzyRDmG/fSsV8PMKNDI09Jo2LSDmXNnGekLm 5yRAqLaWgwOK5Y8xnX1VmiGuo5Kiyqec1GnnV/GUv2fajW1LIGjeg0wCsMBQPxHzLsPN YOh+zk7lvvNWHPmWN/SCO+8ttaencd6fjD4aeky0Ei+tgmNnMOQRlubjauOjqepEttsu r+lPIVG6CWXfKCGmKpyfYIPxSc5ZyOtr/bKZBMBnhWUe4TG1ukf/QvgDZqJc54SULTzS lvjEsc3sh5fBTthI6FsHQ1bHYz8SsiAzMnmG+vNkEsKX7zz4Qf3UcM+y+0heCEW3Qt3X tMpA== 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=cjjOnyPyn2JHfRZhcyH/y1nYrUJZ6c1Y+fdOzAdXhZE=; b=b7Sw9y9dCm99duRamFrYbC+LNcoWisNoJeQ9CACG1Ow1uB9zRRY2WXfS8d0bGupiWx 8oBz+SCsFw+w6iiv8loN0fbrP/yfwYMAnaHKYqZpUhhaehaWkM1HDkLoubfhiW+KLPK3 F6+qTAXngYF01M79mTwZLY3XFb0bpaHllMPMZEydFRfOTOcFR0cRaqEObhljPKJYU9At qhAUblsAi2JhlkxM+qs8nlW5XfRXm6SMF04p5UXJwVz1nytneGZA7gwHAmptxJKkJeoK K7NDa/FG6M+3XSDhXY4yIglaqMDd4v1bFDjg2CgEv8ihqJGPYNQf/Sbx4ovni8VbTNgr ZAgw== X-Gm-Message-State: AHQUAuY6EAMJ0kbPNnqYEIZLr3hJaim41HqXWjc4ke8RZkybmeXRCX7Y YxA48PzJRfvn2XMej9vTWQ7YY65exwg= X-Google-Smtp-Source: AHgI3IYTiZOgpwyr0LLjszs9AhntG6mC1/DQ2PqFa7eqm6fo/wmovv2VNAShateOYsLcnpIlTu4B3Q== X-Received: by 2002:adf:efc4:: with SMTP id i4mr14737901wrp.42.1550410944183; Sun, 17 Feb 2019 05:42:24 -0800 (PST) Received: from localhost.localdomain ([87.71.54.246]) by smtp.gmail.com with ESMTPSA id o5sm39200711wrh.34.2019.02.17.05.42.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Feb 2019 05:42:23 -0800 (PST) From: Dafna Hirschfeld To: linux-media@vger.kernel.org Cc: hverkuil@xs4all.nl, helen.koike@collabora.com, Dafna Hirschfeld Subject: [v4l-utils PATCH v2 4/4] v4l2-ctl: Add implementation for the stateless fwht decoder. Date: Sun, 17 Feb 2019 05:42:09 -0800 Message-Id: <20190217134209.84066-5-dafna3@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190217134209.84066-1-dafna3@gmail.com> References: <20190217134209.84066-1-dafna3@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add code to support the stateless decoder and the function 'stateless_m2m' that implements it. Signed-off-by: Dafna Hirschfeld --- utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 236 +++++++++++++++++++++++++- 1 file changed, 233 insertions(+), 3 deletions(-) diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp index ec43bd03..2bdee280 100644 --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp @@ -1054,8 +1054,9 @@ restart: return false; } } - - if (support_out_crop && v4l2_fwht_find_pixfmt(fmt.g_pixelformat())) + if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) + read_fwht_frame(fmt, (unsigned char *)buf, fin, sz, len); + else if (support_out_crop && v4l2_fwht_find_pixfmt(fmt.g_pixelformat())) read_write_padded_frame(fmt, (unsigned char *)buf, fin, sz, len, true); else sz = fread(buf, 1, len, fin); @@ -1082,6 +1083,21 @@ restart: return true; } +static bool split_fwht_frame(u8 *frame, struct fwht_cframe_hdr *hdr, unsigned max_len) +{ + unsigned int len; + bool ret = true; + + memcpy(hdr, frame, sizeof(struct fwht_cframe_hdr)); + len = ntohl(hdr->size); + if (len > max_len) { + len = max_len; + ret = false; + } + memmove(frame, frame + sizeof(struct fwht_cframe_hdr), len); + return ret; +} + static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf) { tpg_pixel_aspect aspect = TPG_PIXEL_ASPECT_SQUARE; @@ -1186,6 +1202,35 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf if (fin && !fill_buffer_from_file(fd, q, buf, fmt, fin)) return -2; + struct fwht_cframe_hdr hdr; + + if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) { + int media_fd = mi_get_media_fd(fd.g_fd()); + + if (!split_fwht_frame((u8 *)q.g_dataptr(buf.g_index(), 0), + &hdr, buf.g_length(0))) + fprintf(stderr, "%s: warning: size field in fwht header is larger than buf size\n", + __func__); + + if (media_fd < 0) { + fprintf(stderr, "%s: mi_get_media_fd failed\n", __func__); + return media_fd; + } + + if (q.alloc_req(media_fd, i)) { + fprintf(stderr, "%s: q.alloc_req failed\n", __func__); + return -1; + } + buf.s_request_fd(q.g_req_fd(i)); + buf.or_flags(V4L2_BUF_FLAG_REQUEST_FD); + + if (set_fwht_ext_ctrl(fd, &hdr, last_fwht_bf_ts, + buf.g_request_fd())) { + fprintf(stderr, "%s: set_fwht_ext_ctrls failed on %dth buf: %s\n", + __func__, i, strerror(errno)); + return -1; + } + } if (qbuf) { set_time_stamp(buf); if (fd.qbuf(buf)) @@ -1195,6 +1240,16 @@ static int do_setup_out_buffers(cv4l_fd &fd, cv4l_queue &q, FILE *fin, bool qbuf fprintf(stderr, ">"); fflush(stderr); } + if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) { + set_fwht_req_by_idx(i, &hdr, q.g_req_fd(i), + last_fwht_bf_ts, get_ns_timestamp(buf)); + last_fwht_bf_ts = get_ns_timestamp(buf); + if (ioctl(q.g_req_fd(i), MEDIA_REQUEST_IOC_QUEUE) < 0) { + fprintf(stderr, "Unable to queue media request: %s\n", + strerror(errno)); + return -1; + } + } } if (qbuf) output_field = field; @@ -1433,12 +1488,48 @@ static int do_handle_out(cv4l_fd &fd, cv4l_queue &q, FILE *fin, cv4l_buffer *cap (u8 *)q.g_dataptr(buf.g_index(), j)); } + struct fwht_cframe_hdr hdr; + + if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) { + if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_REINIT, NULL)) { + fprintf(stderr, "Unable to reinit media request: %s\n", + strerror(errno)); + return -1; + } + if (!split_fwht_frame((u8 *)q.g_dataptr(buf.g_index(), 0), &hdr, buf.g_length(0))) + fprintf(stderr, "%s: warning: size field in fwht header is larger than buf size\n", + __func__); + + if (set_fwht_ext_ctrl(fd, &hdr, last_fwht_bf_ts, + buf.g_request_fd())) { + fprintf(stderr, "%s: set_fwht_ext_ctrls failed: %s\n", + __func__, strerror(errno)); + return -1; + } + } + set_time_stamp(buf); if (fd.qbuf(buf)) { fprintf(stderr, "%s: failed: %s\n", "VIDIOC_QBUF", strerror(errno)); return -1; } + if (q.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) { + if (!set_fwht_req_by_fd(&hdr, buf.g_request_fd(), last_fwht_bf_ts, + get_ns_timestamp(buf))) { + fprintf(stderr, "%s: request for fd %d does not exist\n", + __func__, buf.g_request_fd()); + return -1; + } + + last_fwht_bf_ts = get_ns_timestamp(buf); + if (ioctl(buf.g_request_fd(), MEDIA_REQUEST_IOC_QUEUE) < 0) { + fprintf(stderr, "Unable to queue media request: %s\n", + strerror(errno)); + return -1; + } + } + tpg_update_mv_count(&tpg, V4L2_FIELD_HAS_T_OR_B(output_field)); if (!verbose) @@ -2227,6 +2318,140 @@ static void stateful_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out, tpg_free(&tpg); } +static void stateless_m2m(cv4l_fd &fd, cv4l_queue &in, cv4l_queue &out, + FILE *fin, FILE *fout, cv4l_fd *exp_fd_p) +{ + fps_timestamps fps_ts[2]; + unsigned count[2] = { 0, 0 }; + cv4l_fmt fmt[2]; + int fd_flags = fcntl(fd.g_fd(), F_GETFL); + + fd.g_fmt(fmt[OUT], out.g_type()); + fd.g_fmt(fmt[CAP], in.g_type()); + + if (out.reqbufs(&fd, reqbufs_count_out)) { + fprintf(stderr, "%s: out.reqbufs failed\n", __func__); + return; + } + + if (in.reqbufs(&fd, reqbufs_count_cap)) { + fprintf(stderr, "%s: in.reqbufs failed\n", __func__); + return; + } + + if (exp_fd_p && in.export_bufs(exp_fd_p, exp_fd_p->g_type())) + return; + + if (in.obtain_bufs(&fd)) { + fprintf(stderr, "%s: in.obtain_bufs error\n", __func__); + return; + } + + if (do_setup_out_buffers(fd, out, fout, true)) { + fprintf(stderr, "%s: do_setup_out_buffers failed\n", __func__); + return; + } + + if (in.queue_all(&fd)) { + fprintf(stderr, "%s: in.queue_all failed\n", __func__); + return; + } + + if (fd.streamon(out.g_type())) { + fprintf(stderr, "%s: streamon for out failed\n", __func__); + return; + } + + if (fd.streamon(in.g_type())) { + fprintf(stderr, "%s: streamon for in failed\n", __func__); + return; + } + int index = 0; + bool queue_lst_buf = false; + cv4l_buffer last_in_buf; + + fcntl(fd.g_fd(), F_SETFL, fd_flags | O_NONBLOCK); + + while (true) { + fd_set except_fds; + int req_fd = out.g_req_fd(index); + struct timeval tv = { 2, 0 }; + + FD_ZERO(&except_fds); + FD_SET(req_fd, &except_fds); + + int rc = select(req_fd + 1, NULL, NULL, &except_fds, &tv); + + if (rc == 0) { + fprintf(stderr, "Timeout when waiting for media request\n"); + return; + } else if (rc < 0) { + fprintf(stderr, "Unable to select media request: %s\n", + strerror(errno)); + return; + } + /* + * it is safe to queue back last cap buffer only after + * the following request is done so that the buffer + * is not needed anymore as a reference frame + */ + if (queue_lst_buf) { + if (fd.qbuf(last_in_buf) < 0) { + fprintf(stderr, "%s: qbuf failed\n", __func__); + return; + } + } + int buf_idx = -1; + /* + * fin is not sent to do_handle_cap since the capture buf is + * written to the file in current function + */ + rc = do_handle_cap(fd, in, NULL, &buf_idx, count[CAP], + fps_ts[CAP], fmt[CAP]); + if (rc) { + fprintf(stderr, "%s: do_handle_cap err\n", __func__); + return; + } + /* + * in case of an error in the frame, set last ts to 0 as a mean + * to recover so that next request will not use a + * reference buffer. Otherwise the error flag will be set to + * all the future capture buffers. + */ + if (buf_idx == -1) { + fprintf(stderr, "%s: frame returned with error\n", __func__); + last_fwht_bf_ts = 0; + } else { + cv4l_buffer cap_buf(in, index); + if (fd.querybuf(cap_buf)) + return; + last_in_buf = cap_buf; + queue_lst_buf = true; + if (fin && cap_buf.g_bytesused(0) && + !(cap_buf.g_flags() & V4L2_BUF_FLAG_ERROR)) { + int idx = get_fwht_req_by_ts(get_ns_timestamp(cap_buf)); + + if (idx < 0) { + fprintf(stderr, "%s: could not find request from buffer\n", __func__); + fprintf(stderr, "%s: ts = %llu\n", __func__, get_ns_timestamp(cap_buf)); + return; + } + composed_width = fwht_reqs[idx].params.width; + composed_height = fwht_reqs[idx].params.height; + write_buffer_to_file(fd, in, cap_buf, + fmt[CAP], fin); + } + } + rc = do_handle_out(fd, out, fout, NULL, count[OUT], + fps_ts[OUT], fmt[OUT]); + if (rc) { + fprintf(stderr, "%s: output stream ended\n", __func__); + close(req_fd); + } + index = (index + 1) % out.g_buffers(); + } +} + static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) { cv4l_queue in(fd.g_type(), memory); @@ -2263,7 +2488,12 @@ static void streaming_set_m2m(cv4l_fd &fd, cv4l_fd &exp_fd) if (out.export_bufs(&exp_fd, exp_fd.g_type())) return; } - stateful_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p); + if (out.reqbufs(&fd, 0)) + goto done; + if (out.g_capabilities() & V4L2_BUF_CAP_SUPPORTS_REQUESTS) + stateless_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p); + else + stateful_m2m(fd, in, out, file[CAP], file[OUT], exp_fd_p); done: if (options[OptStreamDmaBuf] || options[OptStreamOutDmaBuf]) exp_q.close_exported_fds();