Received: by 2002:a05:6a10:a841:0:0:0:0 with SMTP id d1csp1475189pxy; Thu, 29 Apr 2021 07:51:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7LCXD8CKDpGG9Q3FExTzchxcfwfYtve4tDT2k8StJp2AK9YgHleBZwAT4ktBMT+O9w3ZC X-Received: by 2002:a17:902:a70f:b029:ea:d4a8:6a84 with SMTP id w15-20020a170902a70fb02900ead4a86a84mr36613878plq.42.1619707914263; Thu, 29 Apr 2021 07:51:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619707914; cv=none; d=google.com; s=arc-20160816; b=081dD8DsoZT76/3y8NYN8BuPwP+0nM+kDiZTqk9opCmo3kd8aUSUzsGkHTtTzQ9IuR flWXGWUhT5v1YBIhVB3zCs1S2FSstukTNmNzaolphcGV5Ib0zbRx0fXXUcNIBnoj2QpL P07XJDEINpx3qY/XsG9lOijN53KUhfQbOJ3Z1Non9143EOInGZiArVGGXMOgBEJrniaW x89q50mvUykqAteKVWn8uJ+7Xjrysj7GQwir5se9me7Z4PJqETkt43mXtH9lCUSi+VV6 kvQZWfqz7aiwbmha92ZTnewiO1aeicT1WdToLS1pVSom81rTIKbQ6h9NSSSH/ROgUyvG EPjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=j3Lj31Z64z0go50ySmNY3PcE6CJ3VlM+7m+Pqw2GofM=; b=E0p+sPLsNcvXag8f2l7UQm89pB7XcDGslyBDVK6qeSHl0YkEmi1ph7bpE2zYLKhed6 DPnBWGZmosydkJ3iTRcSq9ZzKcQc/VutS1u7wrEfqvAtHej55PeDrpUowc13OrtKy9Vu IUF7yoRpX/faG5j+tcwsQO60nzzfSPHBaSm10nnCNWZtZWFKnMp9PS5FTGxasvfL5ViI A8I8bIIHj56O8jn897BpmgFZgl3ARXX9caSFxa2qQdhVtlzAbvY082M5+e05qKkV05LN GMXxjQC1cLFUzjwBpNHS6wIi0XVbae5wZWLQdOxFE+yVe4YDOMKP5/+3pqfm2vBFmegG jK6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g1si3617808pjm.65.2021.04.29.07.51.40; Thu, 29 Apr 2021 07:51:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240734AbhD2OuT (ORCPT + 99 others); Thu, 29 Apr 2021 10:50:19 -0400 Received: from bhuna.collabora.co.uk ([46.235.227.227]:35900 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240689AbhD2OuI (ORCPT ); Thu, 29 Apr 2021 10:50:08 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: ezequiel) with ESMTPSA id 876751F43532 From: Ezequiel Garcia To: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: kernel@collabora.com, Jonas Karlman , Hans Verkuil , Nicolas Dufresne , Philipp Zabel , Maxime Ripard , Paul Kocialkowski , Jernej Skrabec , Daniel Almeida , Ezequiel Garcia Subject: [PATCH v7 08/10] media: uapi: Move the MPEG-2 stateless control type out of staging Date: Thu, 29 Apr 2021 11:48:16 -0300 Message-Id: <20210429144818.67105-9-ezequiel@collabora.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210429144818.67105-1-ezequiel@collabora.com> References: <20210429144818.67105-1-ezequiel@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the MPEG-2 stateless control types out of staging, and re-number it to avoid any confusion. Signed-off-by: Ezequiel Garcia Tested-by: Jernej Skrabec Reviewed-by: Jernej Skrabec Tested-by: Daniel Almeida --- include/media/mpeg2-ctrls.h | 4 ---- include/uapi/linux/videodev2.h | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/media/mpeg2-ctrls.h b/include/media/mpeg2-ctrls.h index a84ce088a42e..a3d19de9e53a 100644 --- a/include/media/mpeg2-ctrls.h +++ b/include/media/mpeg2-ctrls.h @@ -16,10 +16,6 @@ #define V4L2_CID_MPEG_VIDEO_MPEG2_PICTURE (V4L2_CID_CODEC_BASE+253) /* enum v4l2_ctrl_type type values */ -#define V4L2_CTRL_TYPE_MPEG2_QUANTISATION 0x0131 -#define V4L2_CTRL_TYPE_MPEG2_SEQUENCE 0x0132 -#define V4L2_CTRL_TYPE_MPEG2_PICTURE 0x0133 - #define V4L2_MPEG2_SEQ_FLAG_PROGRESSIVE 0x01 /** diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 311a01cc5775..d3bb18a3a51b 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -1807,6 +1807,10 @@ enum v4l2_ctrl_type { V4L2_CTRL_TYPE_FWHT_PARAMS = 0x0220, V4L2_CTRL_TYPE_VP8_FRAME = 0x0240, + + V4L2_CTRL_TYPE_MPEG2_QUANTISATION = 0x0250, + V4L2_CTRL_TYPE_MPEG2_SEQUENCE = 0x0251, + V4L2_CTRL_TYPE_MPEG2_PICTURE = 0x0252, }; /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ -- 2.30.0