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.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,URIBL_BLOCKED,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 3DE7BC432C1 for ; Tue, 24 Sep 2019 07:44:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E1F920872 for ; Tue, 24 Sep 2019 07:44:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503902AbfIXHoJ (ORCPT ); Tue, 24 Sep 2019 03:44:09 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:42327 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2503745AbfIXHoI (ORCPT ); Tue, 24 Sep 2019 03:44:08 -0400 X-UUID: d9f8117364cd40f09c4436505c6ecf1f-20190924 X-UUID: d9f8117364cd40f09c4436505c6ecf1f-20190924 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw02.mediatek.com (envelope-from ) (Cellopoint E-mail Firewall v4.1.10 Build 0809 with TLS) with ESMTP id 1018321716; Tue, 24 Sep 2019 15:44:02 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 24 Sep 2019 15:43:59 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 24 Sep 2019 15:43:59 +0800 From: Xia Jiang To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Rick Chang CC: , , , , , Marek Szyprowski , Tomasz Figa , , Xia Jiang Subject: [PATCH v3 4/5] media: v4l2-ctrl: Add jpeg enc exif mode control Date: Tue, 24 Sep 2019 15:43:04 +0800 Message-ID: <20190924074303.22713-5-xia.jiang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190924074303.22713-1-xia.jiang@mediatek.com> References: <20190924074303.22713-1-xia.jiang@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add jpeg enc CID definition for exif mode control. Signed-off-by: Xia Jiang --- v3: new add patch for V4L2_CID_JPEG_ENABLE_EXIF --- Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst | 10 ++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 1 + include/uapi/linux/v4l2-controls.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst b/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst index 60ce3f949319..d44a539e2eb4 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst @@ -109,5 +109,15 @@ JPEG Control IDs +``V4L2_CID_JPEG_ENABLE_EXIF (integer)`` + ``V4L2_CID_JPEG_ENABLE_EXIF (integer)`` control determines JPEG + encoder mode. Its value of 0 means JPEG mode, 1 means EXIF mode. If + EXIF mode is enabled, the JPEG encoder will not write out SOI marker + (start from 0xffd8) but write out from DQT marker(start from + 0xffdb). Software program can fill the EXIF content above the DQT + marker to finish one EXIF JPEG. + + + For more details about JPEG specification, refer to :ref:`itu-t81`, :ref:`jfif`, :ref:`w3c-jpeg-jfif`. diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 371537dd8cd3..c96c10480ebd 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1025,6 +1025,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_JPEG_RESTART_INTERVAL: return "Restart Interval"; case V4L2_CID_JPEG_COMPRESSION_QUALITY: return "Compression Quality"; case V4L2_CID_JPEG_ACTIVE_MARKER: return "Active Markers"; + case V4L2_CID_JPEG_ENABLE_EXIF: return "Enable Exif"; /* Image source controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index a2669b79b294..da619f43de65 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -1022,6 +1022,8 @@ enum v4l2_jpeg_chroma_subsampling { #define V4L2_JPEG_ACTIVE_MARKER_DQT (1 << 17) #define V4L2_JPEG_ACTIVE_MARKER_DHT (1 << 18) +#define V4L2_CID_JPEG_ENABLE_EXIF (V4L2_CID_JPEG_CLASS_BASE + 5) + /* Image source controls */ #define V4L2_CID_IMAGE_SOURCE_CLASS_BASE (V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900) -- 2.18.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Xia Jiang Subject: [PATCH v3 4/5] media: v4l2-ctrl: Add jpeg enc exif mode control Date: Tue, 24 Sep 2019 15:43:04 +0800 Message-ID: <20190924074303.22713-5-xia.jiang@mediatek.com> References: <20190924074303.22713-1-xia.jiang@mediatek.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: In-Reply-To: <20190924074303.22713-1-xia.jiang@mediatek.com> Sender: linux-kernel-owner@vger.kernel.org To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , Matthias Brugger , Rick Chang Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Marek Szyprowski , Tomasz Figa , srv_heupstream@mediatek.com, Xia Jiang List-Id: devicetree@vger.kernel.org Add jpeg enc CID definition for exif mode control. Signed-off-by: Xia Jiang --- v3: new add patch for V4L2_CID_JPEG_ENABLE_EXIF --- Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst | 10 ++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 1 + include/uapi/linux/v4l2-controls.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst b/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst index 60ce3f949319..d44a539e2eb4 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst @@ -109,5 +109,15 @@ JPEG Control IDs +``V4L2_CID_JPEG_ENABLE_EXIF (integer)`` + ``V4L2_CID_JPEG_ENABLE_EXIF (integer)`` control determines JPEG + encoder mode. Its value of 0 means JPEG mode, 1 means EXIF mode. If + EXIF mode is enabled, the JPEG encoder will not write out SOI marker + (start from 0xffd8) but write out from DQT marker(start from + 0xffdb). Software program can fill the EXIF content above the DQT + marker to finish one EXIF JPEG. + + + For more details about JPEG specification, refer to :ref:`itu-t81`, :ref:`jfif`, :ref:`w3c-jpeg-jfif`. diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 371537dd8cd3..c96c10480ebd 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1025,6 +1025,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_JPEG_RESTART_INTERVAL: return "Restart Interval"; case V4L2_CID_JPEG_COMPRESSION_QUALITY: return "Compression Quality"; case V4L2_CID_JPEG_ACTIVE_MARKER: return "Active Markers"; + case V4L2_CID_JPEG_ENABLE_EXIF: return "Enable Exif"; /* Image source controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index a2669b79b294..da619f43de65 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -1022,6 +1022,8 @@ enum v4l2_jpeg_chroma_subsampling { #define V4L2_JPEG_ACTIVE_MARKER_DQT (1 << 17) #define V4L2_JPEG_ACTIVE_MARKER_DHT (1 << 18) +#define V4L2_CID_JPEG_ENABLE_EXIF (V4L2_CID_JPEG_CLASS_BASE + 5) + /* Image source controls */ #define V4L2_CID_IMAGE_SOURCE_CLASS_BASE (V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900) -- 2.18.0 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.7 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 B6AF7C432C1 for ; Tue, 24 Sep 2019 07:45:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8870320872 for ; Tue, 24 Sep 2019 07:45:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="F2iCX05r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8870320872 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8sLNwPUo1PjzA+FktJFLWtvUo+Qzmj3Axz0LFcoDRTs=; b=F2iCX05r+ItR+6 YSg6S6LLVAQ6oCsNvalxaSM92C+bmicKC2UNro1vfU8LPNYFPfOPHYOfl41SlqzTmlydoeAFHCfhV 2U572V2/sQ/qA9HkzAD2JQMaecVoke4LfCbu04DY9QRY76Cqby6daWa3NBeGhA/B8qUqQod1TaDjj 2R4rtF0kZuLoamuTY9ure2Tv/hiMwIct8rSuP3a/WBmpO713sObZVvIwgtpBZI7wghmmzJIMi0xEN kLPI4xTChJSc1q/yrMKrCCFUGPU6mkfu8LEAZs+Hov3Kuf8ycT3NWgiDasfml5jzu/6+tZas32i3/ mtv3hRdYaEBAYmy67Syg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCfVh-00036x-4e; Tue, 24 Sep 2019 07:45:21 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iCfUU-000183-Gb; Tue, 24 Sep 2019 07:44:10 +0000 X-UUID: fe724f4d95a748a6a59b998a5dd81a2a-20190923 X-UUID: fe724f4d95a748a6a59b998a5dd81a2a-20190923 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 310139571; Mon, 23 Sep 2019 23:44:02 -0800 Received: from mtkmbs07n1.mediatek.inc (172.21.101.16) by MTKMBS62N1.mediatek.inc (172.29.193.41) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 24 Sep 2019 00:44:00 -0700 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 24 Sep 2019 15:43:59 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 24 Sep 2019 15:43:59 +0800 From: Xia Jiang To: Hans Verkuil , Mauro Carvalho Chehab , Rob Herring , "Matthias Brugger" , Rick Chang Subject: [PATCH v3 4/5] media: v4l2-ctrl: Add jpeg enc exif mode control Date: Tue, 24 Sep 2019 15:43:04 +0800 Message-ID: <20190924074303.22713-5-xia.jiang@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20190924074303.22713-1-xia.jiang@mediatek.com> References: <20190924074303.22713-1-xia.jiang@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190924_004406_634376_375C04EC X-CRM114-Status: UNSURE ( 9.66 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Xia Jiang , devicetree@vger.kernel.org, srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Tomasz Figa , linux-mediatek@lists.infradead.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Marek Szyprowski Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add jpeg enc CID definition for exif mode control. Signed-off-by: Xia Jiang --- v3: new add patch for V4L2_CID_JPEG_ENABLE_EXIF --- Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst | 10 ++++++++++ drivers/media/v4l2-core/v4l2-ctrls.c | 1 + include/uapi/linux/v4l2-controls.h | 2 ++ 3 files changed, 13 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst b/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst index 60ce3f949319..d44a539e2eb4 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst @@ -109,5 +109,15 @@ JPEG Control IDs +``V4L2_CID_JPEG_ENABLE_EXIF (integer)`` + ``V4L2_CID_JPEG_ENABLE_EXIF (integer)`` control determines JPEG + encoder mode. Its value of 0 means JPEG mode, 1 means EXIF mode. If + EXIF mode is enabled, the JPEG encoder will not write out SOI marker + (start from 0xffd8) but write out from DQT marker(start from + 0xffdb). Software program can fill the EXIF content above the DQT + marker to finish one EXIF JPEG. + + + For more details about JPEG specification, refer to :ref:`itu-t81`, :ref:`jfif`, :ref:`w3c-jpeg-jfif`. diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index 371537dd8cd3..c96c10480ebd 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -1025,6 +1025,7 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_JPEG_RESTART_INTERVAL: return "Restart Interval"; case V4L2_CID_JPEG_COMPRESSION_QUALITY: return "Compression Quality"; case V4L2_CID_JPEG_ACTIVE_MARKER: return "Active Markers"; + case V4L2_CID_JPEG_ENABLE_EXIF: return "Enable Exif"; /* Image source controls */ /* Keep the order of the 'case's the same as in v4l2-controls.h! */ diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index a2669b79b294..da619f43de65 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -1022,6 +1022,8 @@ enum v4l2_jpeg_chroma_subsampling { #define V4L2_JPEG_ACTIVE_MARKER_DQT (1 << 17) #define V4L2_JPEG_ACTIVE_MARKER_DHT (1 << 18) +#define V4L2_CID_JPEG_ENABLE_EXIF (V4L2_CID_JPEG_CLASS_BASE + 5) + /* Image source controls */ #define V4L2_CID_IMAGE_SOURCE_CLASS_BASE (V4L2_CTRL_CLASS_IMAGE_SOURCE | 0x900) -- 2.18.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel