From patchwork Fri Sep 28 17:04:23 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Kumar K X-Patchwork-Id: 1518021 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id CDD143FC71 for ; Fri, 28 Sep 2012 09:38:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757302Ab2I1JiN (ORCPT ); Fri, 28 Sep 2012 05:38:13 -0400 Received: from mailout2.samsung.com ([203.254.224.25]:51389 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756967Ab2I1JiJ (ORCPT ); Fri, 28 Sep 2012 05:38:09 -0400 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MB2008C603CGFY0@mailout2.samsung.com> for linux-media@vger.kernel.org; Fri, 28 Sep 2012 18:38:07 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.123]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 02.69.03783.FFF65605; Fri, 28 Sep 2012 18:38:07 +0900 (KST) X-AuditID: cbfee61a-b7f726d000000ec7-b7-50656fff79f3 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 31.69.03783.FFF65605; Fri, 28 Sep 2012 18:38:07 +0900 (KST) Received: from localhost.localdomain ([107.108.73.106]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MB2001BW035DVC0@mmp1.samsung.com> for linux-media@vger.kernel.org; Fri, 28 Sep 2012 18:38:07 +0900 (KST) From: Arun Kumar K To: linux-media@vger.kernel.org Cc: k.debski@samsung.com, jtp.park@samsung.com, janghyuck.kim@samsung.com, jaeryul.oh@samsung.com, ch.naveen@samsung.com, arun.kk@samsung.com, m.szyprowski@samsung.com, s.nawrocki@samsung.com, kmpark@infradead.org, joshi@samsung.com Subject: [PATCH v7 1/6] [media] v4l: Add fourcc definitions for new formats Date: Fri, 28 Sep 2012 22:34:23 +0530 Message-id: <1348851868-7698-2-git-send-email-arun.kk@samsung.com> X-Mailer: git-send-email 1.7.0.4 In-reply-to: <1348851868-7698-1-git-send-email-arun.kk@samsung.com> References: <1348851868-7698-1-git-send-email-arun.kk@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrDLMWRmVeSWpSXmKPExsWyRsSkWvd/fmqAweV7ShY9G7ayOjB6fN4k F8AYxWWTkpqTWZZapG+XwJWxcKd2wT+9ijcvf7I2MN5Q72Lk5JAQMJE4tOEEG4QtJnHh3nog m4tDSGApo8TcOU+ZYIp+v7rEBJFYxCix4s1UFghnOZPE14U7wdrZBDQk7p14zApiiwjISzzp vQE2ilngHaPE1w3XwIqEBbwllnZ/ACtiEVCV+HG6FSzOK+AksWXBTFaIdQoSrcsOsYPYnALO Ei/ezgCzhYBqdtw4xgbRKyDxbfIhoCs4gOplJTYdYAbZJSFwhk1i6lWYsyUlDq64wTKBUXgB I8MqRtHUguSC4qT0XEO94sTc4tK8dL3k/NxNjMAgPP3vmdQOxpUNFocYBTgYlXh4LVamBAix JpYVV+YeYpTgYFYS4XVeDBTiTUmsrEotyo8vKs1JLT7E6AN0yURmKdHkfGCE5JXEGxqbmJsa m1oaGZmZmuIQVhLnbfYAmiWQnliSmp2aWpBaBDOOiYNTqoHRf/PtCo0UPcnzT+bZXpx77fn+ CI4+l9a84NvJi0P0/q95+PuwsH/YRkltHjW/mLZ6YZUAqzuLyvn/7T7EJW685EXOM8Z/ZfMt HU6F1r/wfWW96k/vWemXhw6cVTzv4HvhaL7blPl1k1rmr5Letb3q9/9N8+/uD/8suLR0p3uE QOrvSkXD9NcnlFiKMxINtZiLihMBZPEus28CAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeLIzCtJLcpLzFFi42I5/e+xgO7//NQAgymrxC16NmxldWD0+LxJ LoAxqoHRJiM1MSW1SCE1Lzk/JTMv3VbJOzjeOd7UzMBQ19DSwlxJIS8xN9VWycUnQNctMwdo qpJCWWJOKVAoILG4WEnfDtOE0BA3XQuYxghd35AguB4jAzSQsIYxY+FO7YJ/ehVvXv5kbWC8 od7FyMkhIWAi8fvVJSYIW0ziwr31bF2MXBxCAosYJVa8mcoC4Sxnkvi6cCcbSBWbgIbEvROP WUFsEQF5iSe9N8A6mAXeMUp83XANrEhYwFtiafcHsCIWAVWJH6dbweK8Ak4SWxbMZIVYpyDR uuwQO4jNKeAs8eLtDDBbCKhmx41jbBMYeRcwMqxiFE0tSC4oTkrPNdQrTswtLs1L10vOz93E CA7xZ1I7GFc2WBxiFOBgVOLhtViZEiDEmlhWXJl7iFGCg1lJhNd5MVCINyWxsiq1KD++qDQn tfgQow/QVROZpUST84Hxl1cSb2hsYm5qbGppYmFiZolDWEmct9kDaJZAemJJanZqakFqEcw4 Jg5OqQZGt3RLlW/8CR439//Ym6fzQnOty8OQjLnri9/uSdLaP20q73TFst9vD85+tdXk6d2+ Pxn3/kWbXRTbmxCy9NvJ3YxrGGumNC1NrP7+5l+Qe8n/wO//T7GzFt2WXNsrUfP2QvwKM3ON Yy1xZRnKmo95Ofquzs51uSR5STOJc1+qkk6H2vdJ9xi/KLEUZyQaajEXFScCAGzQlIaeAgAA X-CFilter-Loop: Reflected Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Adds the following new fourcc definitions. For multiplanar YCbCr - V4L2_PIX_FMT_NV21M - V4L2_PIX_FMT_NV12MT_16X16 and compressed formats - V4L2_PIX_FMT_H264_MVC - V4L2_PIX_FMT_VP8 Signed-off-by: Jeongtae Park Signed-off-by: Naveen Krishna Chatradhi Signed-off-by: Arun Kumar K --- Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 17 ++++++++++++----- Documentation/DocBook/media/v4l/pixfmt.xml | 10 ++++++++++ include/linux/videodev2.h | 4 ++++ 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml b/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml index 5274c24..a990b34 100644 --- a/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml +++ b/Documentation/DocBook/media/v4l/pixfmt-nv12m.xml @@ -1,11 +1,13 @@ - + - V4L2_PIX_FMT_NV12M ('NM12') + V4L2_PIX_FMT_NV12M ('NM12'), V4L2_PIX_FMT_NV21M ('NM21'), V4L2_PIX_FMT_NV12MT_16X16 &manvol; - V4L2_PIX_FMT_NV12M - Variation of V4L2_PIX_FMT_NV12 with planes + V4L2_PIX_FMT_NV12M + V4L2_PIX_FMT_NV21M + V4L2_PIX_FMT_NV12MT_16X16 + Variation of V4L2_PIX_FMT_NV12 and V4L2_PIX_FMT_NV21 with planes non contiguous in memory. @@ -22,7 +24,12 @@ The CbCr plane is the same width, in bytes, as the Y plane (and of the image), but is half as tall in pixels. Each CbCr pair belongs to four pixels. For example, Cb0/Cr0 belongs to Y'00, Y'01, -Y'10, Y'11. +Y'10, Y'11. +V4L2_PIX_FMT_NV12MT_16X16 is the tiled version of +V4L2_PIX_FMT_NV12M with 16x16 macroblock tiles. Here pixels +are arranged in 16x16 2D tiles and tiles are arranged in linear order in memory. +V4L2_PIX_FMT_NV21M is the same as V4L2_PIX_FMT_NV12M +except the Cb and Cr bytes are swapped, the CrCb plane starts with a Cr byte. V4L2_PIX_FMT_NV12M is intended to be used only in drivers and applications that support the multi-planar API, diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml index 1ddbfab..6ca0be4 100644 --- a/Documentation/DocBook/media/v4l/pixfmt.xml +++ b/Documentation/DocBook/media/v4l/pixfmt.xml @@ -758,6 +758,11 @@ extended control V4L2_CID_MPEG_STREAM_TYPE, see 'AVC1' H264 video elementary stream without start codes. + + V4L2_PIX_FMT_H264_MVC + 'MVC' + H264 MVC video elementary stream. + V4L2_PIX_FMT_H263 'H263' @@ -793,6 +798,11 @@ extended control V4L2_CID_MPEG_STREAM_TYPE, see 'VC1L' VC1, SMPTE 421M Annex L compliant stream. + + V4L2_PIX_FMT_VP8 + 'VP8' + VP8 video elementary stream. + diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 61395ef..16e6ab0 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -366,7 +366,9 @@ struct v4l2_pix_format { /* two non contiguous planes - one Y, one Cr + Cb interleaved */ #define V4L2_PIX_FMT_NV12M v4l2_fourcc('N', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 */ +#define V4L2_PIX_FMT_NV21M v4l2_fourcc('N', 'M', '2', '1') /* 21 Y/CrCb 4:2:0 */ #define V4L2_PIX_FMT_NV12MT v4l2_fourcc('T', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 64x32 macroblocks */ +#define V4L2_PIX_FMT_NV12MT_16X16 v4l2_fourcc('V', 'M', '1', '2') /* 12 Y/CbCr 4:2:0 16x16 macroblocks */ /* three non contiguous planes - Y, Cb, Cr */ #define V4L2_PIX_FMT_YUV420M v4l2_fourcc('Y', 'M', '1', '2') /* 12 YUV420 planar */ @@ -403,6 +405,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 Multiplexed */ #define V4L2_PIX_FMT_H264 v4l2_fourcc('H', '2', '6', '4') /* H264 with start codes */ #define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */ +#define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */ #define V4L2_PIX_FMT_H263 v4l2_fourcc('H', '2', '6', '3') /* H263 */ #define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */ #define V4L2_PIX_FMT_MPEG2 v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES */ @@ -410,6 +413,7 @@ struct v4l2_pix_format { #define V4L2_PIX_FMT_XVID v4l2_fourcc('X', 'V', 'I', 'D') /* Xvid */ #define V4L2_PIX_FMT_VC1_ANNEX_G v4l2_fourcc('V', 'C', '1', 'G') /* SMPTE 421M Annex G compliant stream */ #define V4L2_PIX_FMT_VC1_ANNEX_L v4l2_fourcc('V', 'C', '1', 'L') /* SMPTE 421M Annex L compliant stream */ +#define V4L2_PIX_FMT_VP8 v4l2_fourcc('V', 'P', '8', '0') /* VP8 */ /* Vendor-specific formats */ #define V4L2_PIX_FMT_CPIA1 v4l2_fourcc('C', 'P', 'I', 'A') /* cpia1 YUV */