From patchwork Fri Aug 30 02:17:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pawel Osciak X-Patchwork-Id: 2851735 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B4636C0AB5 for ; Fri, 30 Aug 2013 02:18:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BD3FA2018D for ; Fri, 30 Aug 2013 02:18:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B337A2017A for ; Fri, 30 Aug 2013 02:18:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755426Ab3H3CR4 (ORCPT ); Thu, 29 Aug 2013 22:17:56 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:38948 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755034Ab3H3CRy (ORCPT ); Thu, 29 Aug 2013 22:17:54 -0400 Received: by mail-pa0-f48.google.com with SMTP id kp13so1677168pab.7 for ; Thu, 29 Aug 2013 19:17:54 -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; bh=M3kk+ziDXCKEGPXPNjl7b2n4zaAj6uAlVBWVPaPdAow=; b=H1MYj1mNanUlj9Tx/YzWK+ndnOE6qYr9EGZFYyCBCacOLDF0yCuhjgyxijqHm0NCUe GiY6EbHwAP+fxt1h2Ad5RdDH2EFqfrrICFV3zCEPAr+jGXpZdGI+7s0CVBLq5yrEAgJt bF9wRn4PW4F9Cbtdqze3bTlGnF/prRrUs5IB8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=M3kk+ziDXCKEGPXPNjl7b2n4zaAj6uAlVBWVPaPdAow=; b=RknIRkRJgKNACGed/lzans75zcFEs0fapMKMJTmfKfUppppQhS5yAl9uD454/hTXzQ gYlBq3I8bI5jbe6QAwnk5CEVfVIoB366wDyRyaEpQfgP3iOVNZNTqyP9jTovdkNX56nV CoVEjW/Vqq/EEV3d5o5AAa4on2i5PoUuGH4NkxmbsdbdFErizdUVXfFST8JOL5rEFaSz rQg+iLa08FSPlO8UbPpaPr6mkqdD0se6egr/MebSzNQnJh/XRt+uF/FmOG/2qw4tEh3U JcJqCS2ruN78AQ+6Gt9XzNzHT0VZdLxgxEujdFjfgDDI6ONFywcG7lCw+gs5rBPNFxuV nNHA== X-Gm-Message-State: ALoCoQnETrIHuKicEc4x+TjcPdTP09J6kLOcV0i1VNwh9ag0M6hEK2FKlRGPzSjSop6aw1usf1tq X-Received: by 10.68.225.232 with SMTP id rn8mr6919627pbc.32.1377829074461; Thu, 29 Aug 2013 19:17:54 -0700 (PDT) Received: from kawagoe.tok.corp.google.com (kawagoe.tok.corp.google.com [172.30.88.114]) by mx.google.com with ESMTPSA id ye1sm27935254pab.19.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 29 Aug 2013 19:17:53 -0700 (PDT) From: Pawel Osciak To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, Pawel Osciak Subject: [PATCH v1 16/19] v4l: Add encoding camera controls. Date: Fri, 30 Aug 2013 11:17:15 +0900 Message-Id: <1377829038-4726-17-git-send-email-posciak@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1377829038-4726-1-git-send-email-posciak@chromium.org> References: <1377829038-4726-1-git-send-email-posciak@chromium.org> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add defines for controls found in UVC 1.5 encoding cameras. Signed-off-by: Pawel Osciak --- drivers/media/v4l2-core/v4l2-ctrls.c | 29 +++++++++++++++++++++++++++++ include/uapi/linux/v4l2-controls.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c index c3f0803..0b3a632 100644 --- a/drivers/media/v4l2-core/v4l2-ctrls.c +++ b/drivers/media/v4l2-core/v4l2-ctrls.c @@ -781,6 +781,35 @@ const char *v4l2_ctrl_get_name(u32 id) case V4L2_CID_AUTO_FOCUS_STATUS: return "Auto Focus, Status"; case V4L2_CID_AUTO_FOCUS_RANGE: return "Auto Focus, Range"; + case V4L2_CID_ENCODER_MIN_FRAME_INTERVAL: return "Encoder, min. frame interval"; + case V4L2_CID_ENCODER_RATE_CONTROL_MODE: return "Encoder, rate control mode"; + case V4L2_CID_ENCODER_AVERAGE_BITRATE: return "Encoder, average bitrate"; + case V4L2_CID_ENCODER_CPB_SIZE: return "Encoder, CPB size"; + case V4L2_CID_ENCODER_PEAK_BIT_RATE: return "Encoder, peak bit rate"; + case V4L2_CID_ENCODER_QP_PARAM_I: return "Encoder, QP param for I frames"; + case V4L2_CID_ENCODER_QP_PARAM_P: return "Encoder, QP param for P frames"; + case V4L2_CID_ENCODER_QP_PARAM_BG: return "Encoder, QP param for B/G frames"; + case V4L2_CID_ENCODER_NUM_GDR_FRAMES: return "Encoder, number of GDR frames"; + case V4L2_CID_ENCODER_LTR_BUFFER_CONTROL: return "Encoder, LTR buffer control"; + case V4L2_CID_ENCODER_LTR_BUFFER_TRUST_MODE: return "Encoder, LTR buffer trust mode"; + case V4L2_CID_ENCODER_LTR_PICTURE_POSITION: return "Encoder, LTR picture position"; + case V4L2_CID_ENCODER_LTR_PICTURE_MODE: return "Encoder, LTR picture mode"; + case V4L2_CID_ENCODER_LTR_VALIDATION: return "Encoder, LTR validation"; + case V4L2_CID_ENCODER_MIN_QP: return "Encoder, minimum QP param"; + case V4L2_CID_ENCODER_MAX_QP: return "Encoder, maximum QP param"; + case V4L2_CID_ENCODER_SYNC_FRAME_INTERVAL: return "Encoder, sync frame interval"; + case V4L2_CID_ENCODER_ERROR_RESILIENCY: return "Encoder, error resiliency"; + case V4L2_CID_ENCODER_TEMPORAL_LAYER_ENABLE: return "Encoder, temporal layer enable"; + + case V4L2_CID_ENCODER_VP8_SLICE_MODE: return "Encoder, VP8 slice mode"; + case V4L2_CID_ENCODER_VP8_SYNC_FRAME_TYPE: return "Encoder, VP8 sync frame type"; + case V4L2_CID_ENCODER_VP8_DCT_PARTS_PER_FRAME: return "Encoder, VP8, DCT partitions per frame"; + + case V4L2_CID_ENCODER_H264_PROFILE_TOOLSET: return "Encoder, H.264 profile and toolset"; + case V4L2_CID_ENCODER_H264_LEVEL_IDC_LIMIT: return "Encoder, H.264 level IDC limit"; + case V4L2_CID_ENCODER_H264_SEI_PAYLOAD_TYPE: return "Encoder, H.264 SEI payload type"; + case V4L2_CID_ENCODER_H264_LAYER_PRIORITY: return "Encoder, H.264 layer priority"; + /* FM Radio Modulator control */ /* Keep the order of the 'case's the same as in videodev2.h! */ case V4L2_CID_FM_TX_CLASS: return "FM Radio Modulator Controls"; diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index 083bb5a..ef3a30d 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -729,6 +729,37 @@ enum v4l2_auto_focus_range { V4L2_AUTO_FOCUS_RANGE_INFINITY = 3, }; +/* Controls found in UVC 1.5 encoding cameras */ +#define V4L2_CID_ENCODER_MIN_FRAME_INTERVAL (V4L2_CID_CAMERA_CLASS_BASE+32) +#define V4L2_CID_ENCODER_RATE_CONTROL_MODE (V4L2_CID_CAMERA_CLASS_BASE+33) +#define V4L2_CID_ENCODER_AVERAGE_BITRATE (V4L2_CID_CAMERA_CLASS_BASE+34) +#define V4L2_CID_ENCODER_CPB_SIZE (V4L2_CID_CAMERA_CLASS_BASE+35) +#define V4L2_CID_ENCODER_PEAK_BIT_RATE (V4L2_CID_CAMERA_CLASS_BASE+36) +#define V4L2_CID_ENCODER_QP_PARAM_I (V4L2_CID_CAMERA_CLASS_BASE+37) +#define V4L2_CID_ENCODER_QP_PARAM_P (V4L2_CID_CAMERA_CLASS_BASE+38) +#define V4L2_CID_ENCODER_QP_PARAM_BG (V4L2_CID_CAMERA_CLASS_BASE+39) +#define V4L2_CID_ENCODER_NUM_GDR_FRAMES (V4L2_CID_CAMERA_CLASS_BASE+40) +#define V4L2_CID_ENCODER_LTR_BUFFER_CONTROL (V4L2_CID_CAMERA_CLASS_BASE+41) +#define V4L2_CID_ENCODER_LTR_BUFFER_TRUST_MODE (V4L2_CID_CAMERA_CLASS_BASE+42) +#define V4L2_CID_ENCODER_LTR_PICTURE_POSITION (V4L2_CID_CAMERA_CLASS_BASE+43) +#define V4L2_CID_ENCODER_LTR_PICTURE_MODE (V4L2_CID_CAMERA_CLASS_BASE+44) +#define V4L2_CID_ENCODER_LTR_VALIDATION (V4L2_CID_CAMERA_CLASS_BASE+45) +#define V4L2_CID_ENCODER_MIN_QP (V4L2_CID_CAMERA_CLASS_BASE+46) +#define V4L2_CID_ENCODER_MAX_QP (V4L2_CID_CAMERA_CLASS_BASE+47) +#define V4L2_CID_ENCODER_SYNC_FRAME_INTERVAL (V4L2_CID_CAMERA_CLASS_BASE+48) +#define V4L2_CID_ENCODER_ERROR_RESILIENCY (V4L2_CID_CAMERA_CLASS_BASE+49) +#define V4L2_CID_ENCODER_TEMPORAL_LAYER_ENABLE (V4L2_CID_CAMERA_CLASS_BASE+50) + +/* VP8-specific controls */ +#define V4L2_CID_ENCODER_VP8_SLICE_MODE (V4L2_CID_CAMERA_CLASS_BASE+51) +#define V4L2_CID_ENCODER_VP8_DCT_PARTS_PER_FRAME (V4L2_CID_CAMERA_CLASS_BASE+52) +#define V4L2_CID_ENCODER_VP8_SYNC_FRAME_TYPE (V4L2_CID_CAMERA_CLASS_BASE+53) + +/* H.264-specific controls */ +#define V4L2_CID_ENCODER_H264_PROFILE_TOOLSET (V4L2_CID_CAMERA_CLASS_BASE+54) +#define V4L2_CID_ENCODER_H264_LEVEL_IDC_LIMIT (V4L2_CID_CAMERA_CLASS_BASE+55) +#define V4L2_CID_ENCODER_H264_SEI_PAYLOAD_TYPE (V4L2_CID_CAMERA_CLASS_BASE+56) +#define V4L2_CID_ENCODER_H264_LAYER_PRIORITY (V4L2_CID_CAMERA_CLASS_BASE+57) /* FM Modulator class control IDs */