From patchwork Fri Mar 19 05:53:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 72468 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1lN85x-005Bf2-2k; Fri, 19 Mar 2021 05:54:49 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233938AbhCSFyN (ORCPT + 1 other); Fri, 19 Mar 2021 01:54:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233932AbhCSFxv (ORCPT ); Fri, 19 Mar 2021 01:53:51 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5FBCC06175F for ; Thu, 18 Mar 2021 22:53:51 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id ha17so4123888pjb.2 for ; Thu, 18 Mar 2021 22:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M8yI9pONKYY0sMtxSPqYhJCaoBpRMHpHxuKzPkbcKnw=; b=a/Q+9zFOi/z88f5a29IjqDzLSR/ARlMu9Daw7AVTBSPe2vtRyniWR0+tbU1cc6Npnp 1YOrqlNzlf3ruak326Hvc3ywll+VpvFmMpqrxQ+/yCfMXaEirsJ9D8Ko2qBotoJFtIX2 sbyrDTRApMht6MyaMza4ebQVAtBaLfWoC3fp4= 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:mime-version:content-transfer-encoding; bh=M8yI9pONKYY0sMtxSPqYhJCaoBpRMHpHxuKzPkbcKnw=; b=oN3FwEZQ8IkP05c+P0kef6P8OVQzd8MkzKH2YwlOflwz5M7AKtqPHhRwUoFbiTCGDW j2QuLg+KlJMf3VkpjpAlmKYdZlFTlSrHvD/o3mN2GDSCGdcmMOitIw7r5kIYbvBtjNFl 1k9gkZDU1QcTXlpxExT3wlR0FbXQqj/6s5StVBZKmfcMOOQ5KeklR3kiKTgiSttG7Owp qsuKKjypQCy/6B3Mm2azCDFz5c0qX8E+HnAGXjs7yJdSbo8TX6pBOF7Fewf8YIo4KjWV lrDcGkoYIrwUaZNJ+sxZCbQJn9nR7W5qX9tcxfrjKyiPV/O2yoAU6SDFGak0kMDHC3g6 RzdQ== X-Gm-Message-State: AOAM533VafZ4rj0dMNGixgBhBi19DuR6FMmBac2yIsLxjUd7N40mG/pH 2nJxM/a3O5Bw40pkXFjV2yqjeA== X-Google-Smtp-Source: ABdhPJxLbOpxIyVOyEuInGFY94ZDdn7+DAxWKQOvTw3ngM5mq7Jp8WsvaEaU1LEU5QGO/xyViA5FSQ== X-Received: by 2002:a17:90b:1987:: with SMTP id mv7mr7819501pjb.152.1616133231281; Thu, 18 Mar 2021 22:53:51 -0700 (PDT) Received: from senozhatsky.flets-east.jp ([2409:10:2e40:5100:6577:f83d:5865:dfac]) by smtp.gmail.com with ESMTPSA id o13sm4043704pgv.40.2021.03.18.22.53.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:53:50 -0700 (PDT) From: Sergey Senozhatsky To: Laurent Pinchart , Ricardo Ribalda Cc: Tomasz Figa , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv3 1/6] media: v4l UAPI: add ROI selection targets Date: Fri, 19 Mar 2021 14:53:37 +0900 Message-Id: <20210319055342.127308-2-senozhatsky@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210319055342.127308-1-senozhatsky@chromium.org> References: <20210319055342.127308-1-senozhatsky@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no UVC 1.5 requires Region Of Interest control to implement GET_CUR, GET_DEF, GET_MIN and GET_MAX requests. This patch adds new V4L2 selection API targets that will implement those ROI requests. Signed-off-by: Sergey Senozhatsky --- include/uapi/linux/v4l2-common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/uapi/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h index 7d21c1634b4d..3651ebb8cb23 100644 --- a/include/uapi/linux/v4l2-common.h +++ b/include/uapi/linux/v4l2-common.h @@ -78,6 +78,14 @@ #define V4L2_SEL_TGT_COMPOSE_BOUNDS 0x0102 /* Current composing area plus all padding pixels */ #define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103 +/* Current Region of Interest area */ +#define V4L2_SEL_TGT_ROI 0x0200 +/* Default Region of Interest area */ +#define V4L2_SEL_TGT_ROI_DEFAULT 0x0201 +/* Region of Interest minimum values */ +#define V4L2_SEL_TGT_ROI_BOUNDS_MIN 0x0202 +/* Region of Interest maximum values */ +#define V4L2_SEL_TGT_ROI_BOUNDS_MAX 0x0203 /* Selection flags */ #define V4L2_SEL_FLAG_GE (1 << 0) From patchwork Fri Mar 19 05:53:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 72469 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1lN85x-005Bf2-Ui; Fri, 19 Mar 2021 05:54:50 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233947AbhCSFyO (ORCPT + 1 other); Fri, 19 Mar 2021 01:54:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233934AbhCSFxz (ORCPT ); Fri, 19 Mar 2021 01:53:55 -0400 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 049E8C06175F for ; Thu, 18 Mar 2021 22:53:55 -0700 (PDT) Received: by mail-pg1-x52b.google.com with SMTP id v3so2968509pgq.2 for ; Thu, 18 Mar 2021 22:53:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hUuLvnE4iNx9waeqgL5Xgn7vAWrbF4/6uYgvJNfJksg=; b=UVOTQqJHmqbSvw07EbUCTFAVj5IMI31Xz8uAB6N6OxqUi9fvgpOSEhhVcnnyVWpW+s 5bo73igaDKOwnax+Vqrf1uP/AUeY23eXLoiJrxepJwIofAghqVltSB383yzb5807HEYF yZh/wHRNZ4KzOdfB5knPeXK6yV93hxkQ9rxTw= 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:mime-version:content-transfer-encoding; bh=hUuLvnE4iNx9waeqgL5Xgn7vAWrbF4/6uYgvJNfJksg=; b=MuZxJndNPtidtcCgaJw/f/0P6P3h6t1K8cuCRGo+Wksjlp0vYt74adbURwiBN1cvig lrueivs/MhJJqgokZYd75E+Gy6zA+uj0o0DWmMzRWvEHAkdAI6NUXg1ftJ0v+VfBCoKX Kinag5zDGhaaH15CVLMc5GgYR5w40/Egqcly7ywI6D6ih3IZoQuasiQoR0MTlfcT/DH9 a456xUqIY7BctYeTXeAvA8OMEvi1mmzzayoMkODdMAgqJUDe9zpil90XKun6jjS3cE9l ByTc46+5oysUsP4EPuwwEr/mN46dIiGqDbZ52YbaXHyDLK44mbPbo0ZDIVxeuRMx8bP1 THZQ== X-Gm-Message-State: AOAM530Hk1UzUv557LdYttt0A/PyQUOR1M+c4imF9RGZjrOQdOkN6wus Ax6+FkM+QDodLIZOws1IMU3oww== X-Google-Smtp-Source: ABdhPJxVy4XVGCcz82gGDVFXdWhb4Y4yAGSiwmz+FlkVcTFDrFAkDmAg+DhTeTysBhsmD/fZmXSEfw== X-Received: by 2002:aa7:8dda:0:b029:1fa:19b3:7ed9 with SMTP id j26-20020aa78dda0000b02901fa19b37ed9mr7681554pfr.32.1616133234579; Thu, 18 Mar 2021 22:53:54 -0700 (PDT) Received: from senozhatsky.flets-east.jp ([2409:10:2e40:5100:6577:f83d:5865:dfac]) by smtp.gmail.com with ESMTPSA id o13sm4043704pgv.40.2021.03.18.22.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:53:54 -0700 (PDT) From: Sergey Senozhatsky To: Laurent Pinchart , Ricardo Ribalda Cc: Tomasz Figa , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv3 2/6] media: v4l UAPI: document ROI selection targets Date: Fri, 19 Mar 2021 14:53:38 +0900 Message-Id: <20210319055342.127308-3-senozhatsky@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210319055342.127308-1-senozhatsky@chromium.org> References: <20210319055342.127308-1-senozhatsky@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no Document V4L2 selection targets that will be used to ROI implementation. Signed-off-by: Sergey Senozhatsky --- .../media/v4l/selection-api-configuration.rst | 22 +++++++++++++++ .../media/v4l/selection-api-examples.rst | 28 +++++++++++++++++++ .../media/v4l/v4l2-selection-targets.rst | 24 ++++++++++++++++ 3 files changed, 74 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/selection-api-configuration.rst b/Documentation/userspace-api/media/v4l/selection-api-configuration.rst index fee49bf1a1c0..b5fdd765e2db 100644 --- a/Documentation/userspace-api/media/v4l/selection-api-configuration.rst +++ b/Documentation/userspace-api/media/v4l/selection-api-configuration.rst @@ -135,3 +135,25 @@ and the height of rectangles obtained using ``V4L2_SEL_TGT_CROP`` and ``V4L2_SEL_TGT_COMPOSE`` targets. If these are not equal then the scaling is applied. The application can compute the scaling ratios using these values. + +Configuration of Region of Interest (ROI) +========================================= + +The range of auto-controls values and of coordinates of the top left +corner, width and height of areas that can be ROI is given by the +``V4L2_SEL_TGT_ROI_BOUNDS_MIN`` and ``V4L2_SEL_TGT_ROI_BOUNDS_MAX`` +targets. It is recommended for the driver developers to put the top/left +corner at position ``(0,0)``. + +The top left corner, width and height of the Region of Interest area +and auto-controls currently being employed by the device are given by +the ``V4L2_SEL_TGT_ROI`` target. It uses the same coordinate system +as ``V4L2_SEL_TGT_ROI_BOUNDS_MIN`` and ``V4L2_SEL_TGT_ROI_BOUNDS_MAX``. + +In order to change active ROI top left, width and height coordinates +and ROI auto-controls use ``V4L2_SEL_TGT_ROI`` target. + +Each capture device has a default ROI rectangle and auto-controls +value given by the ``V4L2_SEL_TGT_ROI_DEFAULT`` target. Drivers shall +set the ROI rectangle to the default when the driver is first loaded, +but not later. diff --git a/Documentation/userspace-api/media/v4l/selection-api-examples.rst b/Documentation/userspace-api/media/v4l/selection-api-examples.rst index 5f8e8a1f59d7..ad2664888700 100644 --- a/Documentation/userspace-api/media/v4l/selection-api-examples.rst +++ b/Documentation/userspace-api/media/v4l/selection-api-examples.rst @@ -82,3 +82,31 @@ Example: Querying for scaling factors /* computing scaling factors */ hscale = (double)compose.r.width / crop.r.width; vscale = (double)compose.r.height / crop.r.height; + +Setting Region Of Interest area to half of the default value + +Example: Simple ROI +=========================== + +.. code-block:: c + + struct v4l2_selection roi = { + .type = V4L2_BUF_TYPE_VIDEO_CAPTURE, + .target = V4L2_SEL_TGT_ROI_DEFAULT, + }; + struct v4l2_rect r; + + ret = ioctl(fd, VIDIOC_G_SELECTION, &roi); + if (ret) + exit(-1); + /* setting smaller ROI rectangle */ + r.width = roi.r.width / 2; + r.height = roi.r.height / 2; + r.left = roi.r.width / 4; + r.top = roi.r.height / 4; + roi.r = r; + roi.target = V4L2_SEL_TGT_ROI; + roi.flags = V4L2_SEL_FLAG_ROI_AUTO_EXPOSURE; + ret = ioctl(fd, VIDIOC_S_SELECTION, &roi); + if (ret) + exit(-1); diff --git a/Documentation/userspace-api/media/v4l/v4l2-selection-targets.rst b/Documentation/userspace-api/media/v4l/v4l2-selection-targets.rst index b46bae984f35..d1dc9c50eb05 100644 --- a/Documentation/userspace-api/media/v4l/v4l2-selection-targets.rst +++ b/Documentation/userspace-api/media/v4l/v4l2-selection-targets.rst @@ -75,6 +75,30 @@ of the two interfaces they are used. modified by hardware. - Yes - No + * - ``V4L2_SEL_TGT_ROI`` + - 0x0200 + - Current Region of Interest rectangle and auto-controls value. + - Yes + - No + * - ``V4L2_SEL_TGT_ROI_DEFAULT`` + - 0x0201 + - Suggested Region of Interest rectangle and auto-controls value. + - Yes + - No + * - ``V4L2_SEL_TGT_ROI_BOUNDS_MIN`` + - 0x0202 + - Minimum bounds of the Region of Interest rectangle and minimum + auto-controls value. All valid ROI rectangles and auto-controls + should be within minimum-maximum range. + - Yes + - No + * - ``V4L2_SEL_TGT_ROI_BOUNDS_MAX`` + - 0x0203 + - Maximum bounds of the Region of Interest rectangle and maximum + auto-controls value. All valid ROI rectangles and auto-controls + should be within minimum-maximum range. + - Yes + - No .. raw:: latex From patchwork Fri Mar 19 05:53:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 72471 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1lN85z-005Bf2-Re; Fri, 19 Mar 2021 05:54:52 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233950AbhCSFyP (ORCPT + 1 other); Fri, 19 Mar 2021 01:54:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233935AbhCSFx6 (ORCPT ); Fri, 19 Mar 2021 01:53:58 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9723C06174A for ; Thu, 18 Mar 2021 22:53:57 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id m7so2959444pgj.8 for ; Thu, 18 Mar 2021 22:53:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7bBizUYYzN3HQgW0K4Fq8tSkGNuVzaIR04mHPd6N77g=; b=H1AC9ucGadxZAm4U2ob93CWFKIDNbUVeNj2XJzkJFYUuj1Z4ACD3uxFvOtxxI9iiQj /0LoXpe3/TyU3iML47ghcy6s+vP89mOr3g7B+00iT9U6cuqaZ1PQ4FeMix0pjMYcYlh+ 1kVY6wgcP5Z4p5ofNcb/yXKhRMALZwibVDrj8= 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:mime-version:content-transfer-encoding; bh=7bBizUYYzN3HQgW0K4Fq8tSkGNuVzaIR04mHPd6N77g=; b=GA7l0rCOewaTaTiFOCMie///kjGySFSEu4unARLWyNpofgCH5G0Q7zqxnJfJuV7Fxs eQ454+W5cODc0JwfewLnmuQbModxTb+KjCNgfqdVB9rJRGf/wdkhtG43APwfyoHntuar KGuTP/yCKfYBXY2cQiBOgsZpCcw54mM4z/R6+65jFSwSar4keJRn3mbk1c96ZU+WH1di eFWZti7gMpTU7i9t2vLGVLBmZE3ZcrW/hZ/TmFGHu31JjJuiBl+8N7yV8rhKkL/foeP8 jWHXOb/vxswUi/ZA1WDzJSrt7lhn5kYsTi/3GNrW7t9EhwQ8hgc1pLSxi1U6M2OOxIKP DY7A== X-Gm-Message-State: AOAM532QpoKwPFAYVJvLhZkTUIItmWKam5AtkYxEXKAvbYnATqMNdZmY 7tvMIGe2108nSEbyik9rw2f0hyePcKxeXw== X-Google-Smtp-Source: ABdhPJyBASKQu5ZuY+1mAh+SW7AT0fIGNRvC2lwEGtw9hTKkG9EH4viLR11DOW0JtTN/FD5erhMhjQ== X-Received: by 2002:aa7:96cc:0:b029:202:6873:8ab4 with SMTP id h12-20020aa796cc0000b029020268738ab4mr7536566pfq.42.1616133237574; Thu, 18 Mar 2021 22:53:57 -0700 (PDT) Received: from senozhatsky.flets-east.jp ([2409:10:2e40:5100:6577:f83d:5865:dfac]) by smtp.gmail.com with ESMTPSA id o13sm4043704pgv.40.2021.03.18.22.53.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:53:57 -0700 (PDT) From: Sergey Senozhatsky To: Laurent Pinchart , Ricardo Ribalda Cc: Tomasz Figa , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv3 3/6] media: v4l UAPI: add ROI auto-controls flags Date: Fri, 19 Mar 2021 14:53:39 +0900 Message-Id: <20210319055342.127308-4-senozhatsky@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210319055342.127308-1-senozhatsky@chromium.org> References: <20210319055342.127308-1-senozhatsky@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no UVC 1.5 defines the following Region Of Interest auto controls: D0: Auto Exposure D1: Auto Iris D2: Auto White Balance D3: Auto Focus D4: Auto Face Detect D5: Auto Detect and Track D6: Image Stabilization D7: Higher Quality D8 – D15: Reserved, set to zero Signed-off-by: Sergey Senozhatsky --- include/uapi/linux/v4l2-common.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/include/uapi/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h index 3651ebb8cb23..34f1c262d6aa 100644 --- a/include/uapi/linux/v4l2-common.h +++ b/include/uapi/linux/v4l2-common.h @@ -92,6 +92,16 @@ #define V4L2_SEL_FLAG_LE (1 << 1) #define V4L2_SEL_FLAG_KEEP_CONFIG (1 << 2) +/* ROI auto-controls flags */ +#define V4L2_SEL_FLAG_ROI_AUTO_EXPOSURE (1 << 0) +#define V4L2_SEL_FLAG_ROI_AUTO_IRIS (1 << 1) +#define V4L2_SEL_FLAG_ROI_AUTO_WHITE_BALANCE (1 << 2) +#define V4L2_SEL_FLAG_ROI_AUTO_FOCUS (1 << 3) +#define V4L2_SEL_FLAG_ROI_AUTO_FACE_DETECT (1 << 4) +#define V4L2_SEL_FLAG_ROI_AUTO_DETECT_AND_TRACK (1 << 5) +#define V4L2_SEL_FLAG_ROI_AUTO_IMAGE_STABILIXATION (1 << 6) +#define V4L2_SEL_FLAG_ROI_AUTO_HIGHER_QUALITY (1 << 7) + struct v4l2_edid { __u32 pad; __u32 start_block; From patchwork Fri Mar 19 05:53:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 72470 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1lN85y-005Bf2-W4; Fri, 19 Mar 2021 05:54:51 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233956AbhCSFyQ (ORCPT + 1 other); Fri, 19 Mar 2021 01:54:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57130 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233936AbhCSFyB (ORCPT ); Fri, 19 Mar 2021 01:54:01 -0400 Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DCCA8C06174A for ; Thu, 18 Mar 2021 22:54:00 -0700 (PDT) Received: by mail-pg1-x530.google.com with SMTP id l1so2955037pgb.5 for ; Thu, 18 Mar 2021 22:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jyTPoXC+agDm6WJSaqjfD12BGhd0Fxr1GYMHe0K10zA=; b=kxXuWcZJwRjoAmyd5MBMk+3mlZzONtdXDbWaBQUKYaFy6tm4Kao0LVcVdWL6waVb2d UZq02baLfySUlSWCn69hYebwohAGySW/ztsDxc3x6C8a/pBGSb8UE3csE9C6ID3kIoaW AGoo4IJy/5na8z2ZSDc1FgyqTSeBUsdvqYeqQ= 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:mime-version:content-transfer-encoding; bh=jyTPoXC+agDm6WJSaqjfD12BGhd0Fxr1GYMHe0K10zA=; b=dn34AZ355TEAWc2FGyXT/hUT5t89LMvMOjENCbQTY2HZmTzbDCYbOqjPUv1FrCksFo J1KRqZ4ABecQpLjCZnO9IQm1l+Jd42E7DTFi/UUIL3NqgcLoiuWGSjIHb249W3mRPqNN HivO0RWr5jvt7VhbPLpYVZiHdvurw39Ac7/jpyl3sMA4QWX63Goy7MlplgmHHw5AY22k zkgeAWVAEeWkUwjEdIyzeN8My9BD1gU8LmrP2ZuL/4cqJ39BAqDS4d8KdindTywZQcb1 gcJVoluRpNfdSd7Wahs42LnJhAUirQRlQE8sZt+ir/6RKNdPI2WtEcTMVycgQW0tb810 ZqTw== X-Gm-Message-State: AOAM532Kf9SQnrcE0/NZtRewywXRIXTJyaV8/AoiLBzW+ZiTmXaSzgbm jbSawYEAdFaCk+YEOGI/orsZog== X-Google-Smtp-Source: ABdhPJw9T2zzejTlLx3jjaqPgN9EwMOTRdXXODGEEtSe1op00FIxeX3UZGDXWLURWuLWgQ3wAeTgAw== X-Received: by 2002:a63:4658:: with SMTP id v24mr9973502pgk.258.1616133240492; Thu, 18 Mar 2021 22:54:00 -0700 (PDT) Received: from senozhatsky.flets-east.jp ([2409:10:2e40:5100:6577:f83d:5865:dfac]) by smtp.gmail.com with ESMTPSA id o13sm4043704pgv.40.2021.03.18.22.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:54:00 -0700 (PDT) From: Sergey Senozhatsky To: Laurent Pinchart , Ricardo Ribalda Cc: Tomasz Figa , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv3 4/6] media: v4l UAPI: document ROI auto-controls flags Date: Fri, 19 Mar 2021 14:53:40 +0900 Message-Id: <20210319055342.127308-5-senozhatsky@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210319055342.127308-1-senozhatsky@chromium.org> References: <20210319055342.127308-1-senozhatsky@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no Document ROI auto controls. Signed-off-by: Sergey Senozhatsky --- .../media/v4l/v4l2-selection-flags.rst | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/v4l2-selection-flags.rst b/Documentation/userspace-api/media/v4l/v4l2-selection-flags.rst index 1cb1531c1e52..536d29a6c4a5 100644 --- a/Documentation/userspace-api/media/v4l/v4l2-selection-flags.rst +++ b/Documentation/userspace-api/media/v4l/v4l2-selection-flags.rst @@ -48,6 +48,46 @@ Selection flags inside the subdevice to all further processing steps. - No - Yes + * - ``V4L2_SEL_FLAG_ROI_AUTO_EXPOSURE`` + - (1 << 0) + - Auto Exposure. + - Yes + - No + * - ``V4L2_SEL_FLAG_ROI_AUTO_IRIS`` + - (1 << 1) + - Auto Iris. + - Yes + - No + * - ``V4L2_SEL_FLAG_ROI_AUTO_WHITE_BALANCE`` + - (1 << 2) + - Auto White Balance. + - Yes + - No + * - ``V4L2_SEL_FLAG_ROI_AUTO_FOCUS`` + - (1 << 3) + - Auto Focus. + - Yes + - No + * - ``V4L2_SEL_FLAG_ROI_AUTO_FACE_DETECT`` + - (1 << 4) + - Auto Face Detect. + - Yes + - No + * - ``V4L2_SEL_FLAG_ROI_AUTO_DETECT_AND_TRACK`` + - (1 << 5) + - Auto Detect and Track. + - Yes + - No + * - ``V4L2_SEL_FLAG_ROI_AUTO_IMAGE_STABILIXATION`` + - (1 << 6) + - Image Stabilization. + - Yes + - No + * - ``V4L2_SEL_FLAG_ROI_AUTO_HIGHER_QUALITY`` + - (1 << 7) + - Higher Quality. + - Yes + - No .. raw:: latex From patchwork Fri Mar 19 05:53:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 72472 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1lN860-005Bf2-NC; Fri, 19 Mar 2021 05:54:53 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233960AbhCSFyQ (ORCPT + 1 other); Fri, 19 Mar 2021 01:54:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233913AbhCSFyE (ORCPT ); Fri, 19 Mar 2021 01:54:04 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 24FDAC06174A for ; Thu, 18 Mar 2021 22:54:04 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id mz6-20020a17090b3786b02900c16cb41d63so4323931pjb.2 for ; Thu, 18 Mar 2021 22:54:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nN3cyypD50YIer7R6hJ7b5NtipMav+xNrUBvw8Xf75k=; b=RUVhBkNNCKfY5LsCwBttb3GCaoAb2QQoiS7zXktBU+mkbVQrDL3FzWjDjCSeAu9O+M bY3UZK6zg6F2qRg4xddcOc520JLN3uKzPk1uTq97m8ypN9Ja80AUveRgvCFEIqshNVdX Jtiw5IIbjWk/A/mBaMvuhlfb3l/a6xjhzyncA= 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:mime-version:content-transfer-encoding; bh=nN3cyypD50YIer7R6hJ7b5NtipMav+xNrUBvw8Xf75k=; b=GQFNUSO5LvYX+ftOUC57eN6H23iU98j0YD4+4GmIJn0Boz5rBSQsagj6xrEyDBEhvV xx6HUrsjbrOiEKZsu/WX/gju8pVvcEnnB34PQPQsjEf8G87MAg1FGQcft71NQghSa1l+ oKd5NOo3oiAtGxvqa3EqlgXL6R3YSyFwo8RLn15uOHCEwSxXvG/gv0xNIaqLQhHaX2Jd 9LOZowTelzNbsPAtqsxP6dBwifHGYbzAjJMoYrL17yvFqiwSSl/x2BpogHEFVmyndeTO +ZyyKe/79Zv7ImnmTI6taLtElhiqTS9r0KTTHbzW6dDzpGG8eCN0RSRcWl0bvjEK/vgz TfKA== X-Gm-Message-State: AOAM533ysBd/FGHuWKBk20gHJCM83/Etr3xQAOwqwWtnhAz8XHH6DIfy NM202neNjDbVQHtW1D8tNYal2w== X-Google-Smtp-Source: ABdhPJzXyIANw3Xu3yt4hSLEe7n6BV56rGQo1GcEl1h9jvcceyFcjoYIOHmZPNGSNwv9ZC44kRNpUw== X-Received: by 2002:a17:90a:c201:: with SMTP id e1mr8079682pjt.30.1616133243755; Thu, 18 Mar 2021 22:54:03 -0700 (PDT) Received: from senozhatsky.flets-east.jp ([2409:10:2e40:5100:6577:f83d:5865:dfac]) by smtp.gmail.com with ESMTPSA id o13sm4043704pgv.40.2021.03.18.22.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:54:03 -0700 (PDT) From: Sergey Senozhatsky To: Laurent Pinchart , Ricardo Ribalda Cc: Tomasz Figa , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv3 5/6] media: uvcvideo: add UVC 1.5 ROI control Date: Fri, 19 Mar 2021 14:53:41 +0900 Message-Id: <20210319055342.127308-6-senozhatsky@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210319055342.127308-1-senozhatsky@chromium.org> References: <20210319055342.127308-1-senozhatsky@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no This patch implements UVC 1.5 Region of Interest (ROI) control. Note that, UVC 1.5 defines CT_DIGITAL_WINDOW_CONTROL controls and mentions that ROI rectangle coordinates "must be within the current Digital Window as specified by the CT_WINDOW control." (4.2.2.1.20 Digital Region of Interest (ROI) Control). It's is not entirely clear if we need to implement WINDOW_CONTROL. ROI is naturally limited by GET_MIN and GET_MAX rectangles. Another thing to note is that ROI support is implemented as V4L2 selection target: selection rectangle represents ROI rectangle and selection flags represent ROI auto-controls. User-space is required to set valid values for both rectangle and auto-controls every time SET_CUR is issued. Usage example: struct v4l2_selection roi = {0, }; roi.target = V4L2_SEL_TGT_ROI; roi.r.left = 0; roi.r.top = 0; roi.r.width = 42; roi.r.height = 42; roi.flags = V4L2_SEL_FLAG_ROI_AUTO_EXPOSURE; ioctl(fd, VIDIOC_S_SELECTION, &roi); Signed-off-by: Sergey Senozhatsky --- drivers/media/usb/uvc/uvc_v4l2.c | 147 ++++++++++++++++++++++++++++++- include/uapi/linux/usb/video.h | 1 + 2 files changed, 145 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 252136cc885c..d0fe6c33fab6 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -1139,14 +1139,66 @@ static int uvc_ioctl_querymenu(struct file *file, void *fh, return uvc_query_v4l2_menu(chain, qm); } -static int uvc_ioctl_g_selection(struct file *file, void *fh, - struct v4l2_selection *sel) +/* UVC 1.5 ROI rectangle is half the size of v4l2_rect */ +struct uvc_roi_rect { + __u16 top; + __u16 left; + __u16 bottom; + __u16 right; + __u16 auto_controls; +} __packed; + +static int uvc_ioctl_g_roi_target(struct file *file, void *fh, + struct v4l2_selection *sel) { struct uvc_fh *handle = fh; struct uvc_streaming *stream = handle->stream; + struct uvc_roi_rect *roi; + u8 query; + int ret; - if (sel->type != stream->type) + switch (sel->target) { + case V4L2_SEL_TGT_ROI: + query = UVC_GET_CUR; + break; + case V4L2_SEL_TGT_ROI_DEFAULT: + query = UVC_GET_DEF; + break; + case V4L2_SEL_TGT_ROI_BOUNDS_MIN: + query = UVC_GET_MAX; + break; + case V4L2_SEL_TGT_ROI_BOUNDS_MAX: + query = UVC_GET_MAX; + break; + default: return -EINVAL; + } + + roi = kzalloc(sizeof(struct uvc_roi_rect), GFP_KERNEL); + if (!roi) + return -ENOMEM; + + ret = uvc_query_ctrl(stream->dev, query, 1, stream->dev->intfnum, + UVC_CT_REGION_OF_INTEREST_CONTROL, roi, + sizeof(struct uvc_roi_rect)); + if (!ret) { + /* ROI left, top, right, bottom are global coordinates. */ + sel->r.left = roi->left; + sel->r.top = roi->top; + sel->r.width = roi->right - roi->left + 1; + sel->r.height = roi->bottom - roi->top + 1; + sel->flags = roi->auto_controls; + } + + kfree(roi); + return ret; +} + +static int uvc_ioctl_g_sel_target(struct file *file, void *fh, + struct v4l2_selection *sel) +{ + struct uvc_fh *handle = fh; + struct uvc_streaming *stream = handle->stream; switch (sel->target) { case V4L2_SEL_TGT_CROP_DEFAULT: @@ -1173,6 +1225,94 @@ static int uvc_ioctl_g_selection(struct file *file, void *fh, return 0; } +static int uvc_ioctl_g_selection(struct file *file, void *fh, + struct v4l2_selection *sel) +{ + struct uvc_fh *handle = fh; + struct uvc_streaming *stream = handle->stream; + + if (sel->type != stream->type) + return -EINVAL; + + switch (sel->target) { + case V4L2_SEL_TGT_CROP_DEFAULT: + case V4L2_SEL_TGT_CROP_BOUNDS: + case V4L2_SEL_TGT_COMPOSE_DEFAULT: + case V4L2_SEL_TGT_COMPOSE_BOUNDS: + return uvc_ioctl_g_sel_target(file, fh, sel); + case V4L2_SEL_TGT_ROI: + case V4L2_SEL_TGT_ROI_DEFAULT: + case V4L2_SEL_TGT_ROI_BOUNDS_MIN: + case V4L2_SEL_TGT_ROI_BOUNDS_MAX: + return uvc_ioctl_g_roi_target(file, fh, sel); + } + + return -EINVAL; +} + +static bool validate_roi_bounds(struct uvc_streaming *stream, + struct v4l2_selection *sel) +{ + if (sel->r.left > USHRT_MAX || + sel->r.top > USHRT_MAX || + (sel->r.width + sel->r.left) > USHRT_MAX || + (sel->r.height + sel->r.top) > USHRT_MAX || + !sel->r.width || !sel->r.height) + return false; + + if (sel->flags > V4L2_SEL_FLAG_ROI_AUTO_HIGHER_QUALITY) + return false; + + return true; +} + +static int uvc_ioctl_s_roi(struct file *file, void *fh, + struct v4l2_selection *sel) +{ + struct uvc_fh *handle = fh; + struct uvc_streaming *stream = handle->stream; + struct uvc_roi_rect *roi; + int ret; + + if (!validate_roi_bounds(stream, sel)) + return -E2BIG; + + roi = kzalloc(sizeof(struct uvc_roi_rect), GFP_KERNEL); + if (!roi) + return -ENOMEM; + + /* ROI left, top, right, bottom are global coordinates. */ + roi->left = sel->r.left; + roi->top = sel->r.top; + roi->right = sel->r.width + sel->r.left - 1; + roi->bottom = sel->r.height + sel->r.top - 1; + roi->auto_controls = sel->flags; + + ret = uvc_query_ctrl(stream->dev, UVC_SET_CUR, 1, stream->dev->intfnum, + UVC_CT_REGION_OF_INTEREST_CONTROL, roi, + sizeof(struct uvc_roi_rect)); + + kfree(roi); + return ret; +} + +static int uvc_ioctl_s_selection(struct file *file, void *fh, + struct v4l2_selection *sel) +{ + struct uvc_fh *handle = fh; + struct uvc_streaming *stream = handle->stream; + + if (sel->type != stream->type) + return -EINVAL; + + switch (sel->target) { + case V4L2_SEL_TGT_ROI: + return uvc_ioctl_s_roi(file, fh, sel); + } + + return -EINVAL; +} + static int uvc_ioctl_g_parm(struct file *file, void *fh, struct v4l2_streamparm *parm) { @@ -1533,6 +1673,7 @@ const struct v4l2_ioctl_ops uvc_ioctl_ops = { .vidioc_try_ext_ctrls = uvc_ioctl_try_ext_ctrls, .vidioc_querymenu = uvc_ioctl_querymenu, .vidioc_g_selection = uvc_ioctl_g_selection, + .vidioc_s_selection = uvc_ioctl_s_selection, .vidioc_g_parm = uvc_ioctl_g_parm, .vidioc_s_parm = uvc_ioctl_s_parm, .vidioc_enum_framesizes = uvc_ioctl_enum_framesizes, diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h index d854cb19c42c..c87624962896 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h @@ -104,6 +104,7 @@ #define UVC_CT_ROLL_ABSOLUTE_CONTROL 0x0f #define UVC_CT_ROLL_RELATIVE_CONTROL 0x10 #define UVC_CT_PRIVACY_CONTROL 0x11 +#define UVC_CT_REGION_OF_INTEREST_CONTROL 0x14 /* A.9.5. Processing Unit Control Selectors */ #define UVC_PU_CONTROL_UNDEFINED 0x00 From patchwork Fri Mar 19 05:53:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Senozhatsky X-Patchwork-Id: 72473 Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1lN861-005Bf2-P3; Fri, 19 Mar 2021 05:54:54 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233933AbhCSFyR (ORCPT + 1 other); Fri, 19 Mar 2021 01:54:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233941AbhCSFyI (ORCPT ); Fri, 19 Mar 2021 01:54:08 -0400 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6D72C06174A for ; Thu, 18 Mar 2021 22:54:07 -0700 (PDT) Received: by mail-pj1-x102a.google.com with SMTP id q6-20020a17090a4306b02900c42a012202so4304784pjg.5 for ; Thu, 18 Mar 2021 22:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H2onNyMv0+ob/okZPqoYsmcDlvNeiUOmNnhS+8A8w4M=; b=C8SKwinwmwSUzf5AlT9yBNtEOjHhq+9nRDgun2x7axvox9mO9RmbDDOYset/McEz4q LJhTTNko1qjcO2Sh1oXzR/iqyl9hsAl0lOMIXFo7Ea+gxhCspcR57FeZ+2llp7BXVYiA 5gVkJo/EG7KxNMId/41ri84R8fuRz4GsyLWSg= 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:mime-version:content-transfer-encoding; bh=H2onNyMv0+ob/okZPqoYsmcDlvNeiUOmNnhS+8A8w4M=; b=l3/+yFxrpQBvw1Pd8OWXrfI1YQ4OHinJ9swF6FOFv1h6JWGEN9zgBcakamMmmMOHLF AfVh/eOxUhXiIeg2nh/qemaH/iD/uK8/NEoa3InxGVxjxladLlDQScNg5kVnoFcbEebv SJrkCQdlwXPIPAN2msKk48GNt0lUay4ugxpTV4omz+jvkAaeZJI0A5/hcaUFB5Ab4Ou1 AOZ1Nm7BoH6TZzZesA2WsQuuot03Gt4ITCRsSAnmj9bIiqAVqOYnQrhPYVyIHq9mnMPz 2j/UEr/HWr/7wz3+r/f+szCt19WS/oBcpgPmVy/oHbKeb7icsv+4CWaNWAdBGD9/tl7P O3Tg== X-Gm-Message-State: AOAM532DIASmRIQWq/JbMO4fnQwonMsHanZCPqMGMyDJiUTrKVCzrlq8 wcvPUiLMfG1jK+OXRPf2SqW8Bw== X-Google-Smtp-Source: ABdhPJwBJIVaqetY0pJPd1jFqZzlJCm42nUgGVEXObUT1HHZrsn7+lVmW2zrxq8DFoQkuOtzPe/rUA== X-Received: by 2002:a17:902:9a97:b029:e6:cb9a:292a with SMTP id w23-20020a1709029a97b02900e6cb9a292amr10264047plp.14.1616133247329; Thu, 18 Mar 2021 22:54:07 -0700 (PDT) Received: from senozhatsky.flets-east.jp ([2409:10:2e40:5100:6577:f83d:5865:dfac]) by smtp.gmail.com with ESMTPSA id o13sm4043704pgv.40.2021.03.18.22.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Mar 2021 22:54:06 -0700 (PDT) From: Sergey Senozhatsky To: Laurent Pinchart , Ricardo Ribalda Cc: Tomasz Figa , Mauro Carvalho Chehab , Hans Verkuil , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky Subject: [PATCHv3 6/6] MAINTAINERS: update Senozhatsky email address Date: Fri, 19 Mar 2021 14:53:42 +0900 Message-Id: <20210319055342.127308-7-senozhatsky@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210319055342.127308-1-senozhatsky@chromium.org> References: <20210319055342.127308-1-senozhatsky@chromium.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -2.5 (--) X-LSpam-Report: No, score=-2.5 required=5.0 tests=BAYES_00=-1.9,DKIMWL_WL_HIGH=0.001,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1 autolearn=ham autolearn_force=no I don't check my @gmail.com addresses often enough these days. Signed-off-by: Sergey Senozhatsky --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index b2baeb5e4a68..01b000cd5774 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14433,7 +14433,7 @@ F: kernel/sched/psi.c PRINTK M: Petr Mladek -M: Sergey Senozhatsky +M: Sergey Senozhatsky R: Steven Rostedt R: John Ogness S: Maintained @@ -19293,7 +19293,7 @@ F: drivers/net/vrf.c VSPRINTF M: Petr Mladek M: Steven Rostedt -M: Sergey Senozhatsky +M: Sergey Senozhatsky R: Andy Shevchenko R: Rasmus Villemoes S: Maintained @@ -19944,7 +19944,7 @@ F: drivers/staging/media/zoran/ ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER M: Minchan Kim M: Nitin Gupta -R: Sergey Senozhatsky +R: Sergey Senozhatsky L: linux-kernel@vger.kernel.org S: Maintained F: Documentation/admin-guide/blockdev/zram.rst @@ -19958,7 +19958,7 @@ F: drivers/tty/serial/zs.* ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR M: Minchan Kim M: Nitin Gupta -R: Sergey Senozhatsky +R: Sergey Senozhatsky L: linux-mm@kvack.org S: Maintained F: Documentation/vm/zsmalloc.rst