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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D5ADAC4332F for ; Fri, 24 Dec 2021 08:43:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352125AbhLXIng (ORCPT ); Fri, 24 Dec 2021 03:43:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32986 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352081AbhLXInb (ORCPT ); Fri, 24 Dec 2021 03:43:31 -0500 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6F6A3C061401 for ; Fri, 24 Dec 2021 00:43:31 -0800 (PST) Received: by mail-pj1-x1031.google.com with SMTP id f18-20020a17090aa79200b001ad9cb23022so7872128pjq.4 for ; Fri, 24 Dec 2021 00:43:31 -0800 (PST) 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=h+Fh/qAuMn5CdjDLnYjyrqGITfKBSqt/cZsobAY6JEc=; b=CA6zjrhwXkkgRb/m1JYwPl/QSP10VHx89RbzeBKbGYf92y4v78Co10GSZ2WJWclqOX UUhBgFdbdJslb2b0q9ca4mimZLvlgTWBgnvkLiUJD8VFG7cecMWukGKCW8j+TwwpUb3E S8OpRmnQAdBzzqcdIzmawhHe0Eg6v1C94dG68= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h+Fh/qAuMn5CdjDLnYjyrqGITfKBSqt/cZsobAY6JEc=; b=rgF9CDf19T/tccpBNe94TLQBpfJsbWxC9P9rrMFCm+U/LroYQDOH2SyPYtRjlozxmH IttBALllEJ6DEXA56DctSaI4pQGeNlOg1gG+WV0XzwXRbwTtBaSmC4dz7kJiKnEs0ypE FLoITMICkegpVbibGqwNS9IYqtcBeNwLsYvzfQPHh6MyOeOF+k+shwMNVlXvyNhKFbWs NNQlkAxZ5SYEFfQXX3WN9Fo3r7xrRnvMPXUE+cAyPajIVEn5zrdC9UP5bX4J1ex5E7xg Ghk5m/6GSZ8buH7Ya+osOiRKSybx7wvJPXJLWJMQx9VJ+5LRb3DedSpoLxf0fnkphfS3 GcYA== X-Gm-Message-State: AOAM532escs4zlI5GAAKW06X9CXx+YGs0mEJunnnKVMNBo92DvS5MAje SzCnn8A8jXEOcO82r3S1IVI0Ng== X-Google-Smtp-Source: ABdhPJy2kPiDpVLrzhjIwpHjW68Llg7zXf8Fj6vB99LCVDNqz4QNyABP30EHnthg9er6mH8NjVRd6Q== X-Received: by 2002:a17:902:7785:b0:149:5945:40ac with SMTP id o5-20020a170902778500b00149594540acmr3576627pll.35.1640335411024; Fri, 24 Dec 2021 00:43:31 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:fd40:cbd0:c42a:3c26]) by smtp.gmail.com with ESMTPSA id p13sm436369pgl.23.2021.12.24.00.43.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Dec 2021 00:43:30 -0800 (PST) From: Chen-Yu Tsai To: Ezequiel Garcia , Philipp Zabel , Mauro Carvalho Chehab , Hans Verkuil , Greg Kroah-Hartman Cc: Tomasz Figa , Chen-Yu Tsai , linux-media@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH RFT 6/7] media: hantro: Implement V4L2_CID_JPEG_ACTIVE_MARKER control Date: Fri, 24 Dec 2021 16:42:47 +0800 Message-Id: <20211224084248.3070568-7-wenst@chromium.org> X-Mailer: git-send-email 2.34.1.448.ga2b2bfdf31-goog In-Reply-To: <20211224084248.3070568-1-wenst@chromium.org> References: <20211224084248.3070568-1-wenst@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Hantro JPEG encoder driver adds various segments to the JPEG header. While it would be quite complicated to make these segments selectable to userspace, given that the driver has to fill in various fields in these segments, and also take care of alignment, it would be nice if the driver could signal to userspace what segments are included. Implement the V4L2_CID_JPEG_ACTIVE_MARKER control, and make it always return the set of segments that the driver adds. Signed-off-by: Chen-Yu Tsai --- drivers/staging/media/hantro/hantro_drv.c | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c index 6a51f39dde56..33232479dcb7 100644 --- a/drivers/staging/media/hantro/hantro_drv.c +++ b/drivers/staging/media/hantro/hantro_drv.c @@ -280,6 +280,26 @@ static int hantro_try_ctrl(struct v4l2_ctrl *ctrl) return 0; } +#define HANTRO_JPEG_ACTIVE_MARKERS (V4L2_JPEG_ACTIVE_MARKER_APP0 | \ + V4L2_JPEG_ACTIVE_MARKER_COM | \ + V4L2_JPEG_ACTIVE_MARKER_DQT | \ + V4L2_JPEG_ACTIVE_MARKER_DHT) + +static int hantro_jpeg_try_ctrl(struct v4l2_ctrl *ctrl) +{ + switch (ctrl->id) { + case V4L2_CID_JPEG_COMPRESSION_QUALITY: + break; + case V4L2_CID_JPEG_ACTIVE_MARKER: + ctrl->val = HANTRO_JPEG_ACTIVE_MARKERS; + break; + default: + return -EINVAL; + } + + return 0; +} + static int hantro_jpeg_s_ctrl(struct v4l2_ctrl *ctrl) { struct hantro_ctx *ctx; @@ -293,6 +313,8 @@ static int hantro_jpeg_s_ctrl(struct v4l2_ctrl *ctrl) case V4L2_CID_JPEG_COMPRESSION_QUALITY: ctx->jpeg_quality = ctrl->val; break; + case V4L2_CID_JPEG_ACTIVE_MARKER: + break; default: return -EINVAL; } @@ -325,6 +347,7 @@ static const struct v4l2_ctrl_ops hantro_ctrl_ops = { }; static const struct v4l2_ctrl_ops hantro_jpeg_ctrl_ops = { + .try_ctrl = hantro_jpeg_try_ctrl, .s_ctrl = hantro_jpeg_s_ctrl, }; @@ -343,6 +366,14 @@ static const struct hantro_ctrl controls[] = { .def = 50, .ops = &hantro_jpeg_ctrl_ops, }, + }, { + .codec = HANTRO_JPEG_ENCODER, + .cfg = { + .id = V4L2_CID_JPEG_ACTIVE_MARKER, + .max = HANTRO_JPEG_ACTIVE_MARKERS, + .def = HANTRO_JPEG_ACTIVE_MARKERS, + .ops = &hantro_jpeg_ctrl_ops, + }, }, { .codec = HANTRO_MPEG2_DECODER, .cfg = { -- 2.34.1.448.ga2b2bfdf31-goog