From patchwork Mon Nov 9 13:25:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sakari Ailus X-Patchwork-Id: 7583911 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6F2AE9F4F5 for ; Mon, 9 Nov 2015 13:26:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94BE720609 for ; Mon, 9 Nov 2015 13:26:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 11D2020667 for ; Mon, 9 Nov 2015 13:26:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751645AbbKIN0Q (ORCPT ); Mon, 9 Nov 2015 08:26:16 -0500 Received: from mga14.intel.com ([192.55.52.115]:32016 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751840AbbKIN0P (ORCPT ); Mon, 9 Nov 2015 08:26:15 -0500 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP; 09 Nov 2015 05:26:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,266,1444719600"; d="scan'208";a="831690299" Received: from paasikivi.fi.intel.com ([10.237.72.42]) by fmsmga001.fm.intel.com with ESMTP; 09 Nov 2015 05:26:13 -0800 Received: from nauris.fi.intel.com (nauris.localdomain [192.168.240.2]) by paasikivi.fi.intel.com (Postfix) with ESMTP id 14FA22022B; Mon, 9 Nov 2015 15:26:12 +0200 (EET) Received: by nauris.fi.intel.com (Postfix, from userid 1000) id 0FF0C200E6; Mon, 9 Nov 2015 15:25:30 +0200 (EET) From: Sakari Ailus To: linux-media@vger.kernel.org Cc: laurent.pinchart@ideasonboard.com, hverkuil@xs4all.nl Subject: [v4l-utils PATCH 1/4] libv4l2subdev: Switch to media bus formats Date: Mon, 9 Nov 2015 15:25:22 +0200 Message-Id: <1447075525-32321-2-git-send-email-sakari.ailus@linux.intel.com> X-Mailer: git-send-email 2.1.0.231.g7484e3b In-Reply-To: <1447075525-32321-1-git-send-email-sakari.ailus@linux.intel.com> References: <1447075525-32321-1-git-send-email-sakari.ailus@linux.intel.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY, UPPERCASE_50_75 autolearn=unavailable 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 No longer use the old V4L2 based MBUS_FMT definitions. Instead, use the newer media bus format definitions. Signed-off-by: Sakari Ailus --- utils/media-ctl/libv4l2subdev.c | 54 ++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/utils/media-ctl/libv4l2subdev.c b/utils/media-ctl/libv4l2subdev.c index 949eeff..b33d3fd 100644 --- a/utils/media-ctl/libv4l2subdev.c +++ b/utils/media-ctl/libv4l2subdev.c @@ -719,33 +719,33 @@ static struct { const char *name; enum v4l2_mbus_pixelcode code; } mbus_formats[] = { - { "Y8", V4L2_MBUS_FMT_Y8_1X8}, - { "Y10", V4L2_MBUS_FMT_Y10_1X10 }, - { "Y12", V4L2_MBUS_FMT_Y12_1X12 }, - { "YUYV", V4L2_MBUS_FMT_YUYV8_1X16 }, - { "YUYV1_5X8", V4L2_MBUS_FMT_YUYV8_1_5X8 }, - { "YUYV2X8", V4L2_MBUS_FMT_YUYV8_2X8 }, - { "UYVY", V4L2_MBUS_FMT_UYVY8_1X16 }, - { "UYVY1_5X8", V4L2_MBUS_FMT_UYVY8_1_5X8 }, - { "UYVY2X8", V4L2_MBUS_FMT_UYVY8_2X8 }, - { "SBGGR8", V4L2_MBUS_FMT_SBGGR8_1X8 }, - { "SGBRG8", V4L2_MBUS_FMT_SGBRG8_1X8 }, - { "SGRBG8", V4L2_MBUS_FMT_SGRBG8_1X8 }, - { "SRGGB8", V4L2_MBUS_FMT_SRGGB8_1X8 }, - { "SBGGR10", V4L2_MBUS_FMT_SBGGR10_1X10 }, - { "SGBRG10", V4L2_MBUS_FMT_SGBRG10_1X10 }, - { "SGRBG10", V4L2_MBUS_FMT_SGRBG10_1X10 }, - { "SRGGB10", V4L2_MBUS_FMT_SRGGB10_1X10 }, - { "SBGGR10_DPCM8", V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 }, - { "SGBRG10_DPCM8", V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 }, - { "SGRBG10_DPCM8", V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 }, - { "SRGGB10_DPCM8", V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8 }, - { "SBGGR12", V4L2_MBUS_FMT_SBGGR12_1X12 }, - { "SGBRG12", V4L2_MBUS_FMT_SGBRG12_1X12 }, - { "SGRBG12", V4L2_MBUS_FMT_SGRBG12_1X12 }, - { "SRGGB12", V4L2_MBUS_FMT_SRGGB12_1X12 }, - { "AYUV32", V4L2_MBUS_FMT_AYUV8_1X32 }, - { "ARGB32", V4L2_MBUS_FMT_ARGB8888_1X32 }, + { "Y8", MEDIA_BUS_FMT_Y8_1X8}, + { "Y10", MEDIA_BUS_FMT_Y10_1X10 }, + { "Y12", MEDIA_BUS_FMT_Y12_1X12 }, + { "YUYV", MEDIA_BUS_FMT_YUYV8_1X16 }, + { "YUYV1_5X8", MEDIA_BUS_FMT_YUYV8_1_5X8 }, + { "YUYV2X8", MEDIA_BUS_FMT_YUYV8_2X8 }, + { "UYVY", MEDIA_BUS_FMT_UYVY8_1X16 }, + { "UYVY1_5X8", MEDIA_BUS_FMT_UYVY8_1_5X8 }, + { "UYVY2X8", MEDIA_BUS_FMT_UYVY8_2X8 }, + { "SBGGR8", MEDIA_BUS_FMT_SBGGR8_1X8 }, + { "SGBRG8", MEDIA_BUS_FMT_SGBRG8_1X8 }, + { "SGRBG8", MEDIA_BUS_FMT_SGRBG8_1X8 }, + { "SRGGB8", MEDIA_BUS_FMT_SRGGB8_1X8 }, + { "SBGGR10", MEDIA_BUS_FMT_SBGGR10_1X10 }, + { "SGBRG10", MEDIA_BUS_FMT_SGBRG10_1X10 }, + { "SGRBG10", MEDIA_BUS_FMT_SGRBG10_1X10 }, + { "SRGGB10", MEDIA_BUS_FMT_SRGGB10_1X10 }, + { "SBGGR10_DPCM8", MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8 }, + { "SGBRG10_DPCM8", MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8 }, + { "SGRBG10_DPCM8", MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8 }, + { "SRGGB10_DPCM8", MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8 }, + { "SBGGR12", MEDIA_BUS_FMT_SBGGR12_1X12 }, + { "SGBRG12", MEDIA_BUS_FMT_SGBRG12_1X12 }, + { "SGRBG12", MEDIA_BUS_FMT_SGRBG12_1X12 }, + { "SRGGB12", MEDIA_BUS_FMT_SRGGB12_1X12 }, + { "AYUV32", MEDIA_BUS_FMT_AYUV8_1X32 }, + { "ARGB32", MEDIA_BUS_FMT_ARGB8888_1X32 }, }; const char *v4l2_subdev_pixelcode_to_string(enum v4l2_mbus_pixelcode code)