diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2013-05-17 11:32:46 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-05-13 12:48:07 -0400 |
commit | 39d39af6093038491137decdef855c703a09f983 (patch) | |
tree | 10a814a38019d7a535318bb2a56cd0b3242b42d9 | |
parent | a678a198fdeab3368f1a3171453a7d43837e587b (diff) |
[media] v4l: Add 12-bit YUV 4:2:0 media bus pixel codes
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r-- | Documentation/DocBook/media/v4l/subdev-formats.xml | 288 | ||||
-rw-r--r-- | include/uapi/linux/v4l2-mediabus.h | 6 |
2 files changed, 293 insertions, 1 deletions
diff --git a/Documentation/DocBook/media/v4l/subdev-formats.xml b/Documentation/DocBook/media/v4l/subdev-formats.xml index e3cbbb4fbd53..a0fa7e0759c8 100644 --- a/Documentation/DocBook/media/v4l/subdev-formats.xml +++ b/Documentation/DocBook/media/v4l/subdev-formats.xml | |||
@@ -2718,6 +2718,294 @@ | |||
2718 | <entry>v<subscript>1</subscript></entry> | 2718 | <entry>v<subscript>1</subscript></entry> |
2719 | <entry>v<subscript>0</subscript></entry> | 2719 | <entry>v<subscript>0</subscript></entry> |
2720 | </row> | 2720 | </row> |
2721 | <row id="V4L2-MBUS-FMT-UYVY12-2X12"> | ||
2722 | <entry>V4L2_MBUS_FMT_UYVY12_2X12</entry> | ||
2723 | <entry>0x201c</entry> | ||
2724 | <entry></entry> | ||
2725 | &dash-ent-20; | ||
2726 | <entry>u<subscript>11</subscript></entry> | ||
2727 | <entry>u<subscript>10</subscript></entry> | ||
2728 | <entry>u<subscript>9</subscript></entry> | ||
2729 | <entry>u<subscript>8</subscript></entry> | ||
2730 | <entry>u<subscript>7</subscript></entry> | ||
2731 | <entry>u<subscript>6</subscript></entry> | ||
2732 | <entry>u<subscript>5</subscript></entry> | ||
2733 | <entry>u<subscript>4</subscript></entry> | ||
2734 | <entry>u<subscript>3</subscript></entry> | ||
2735 | <entry>u<subscript>2</subscript></entry> | ||
2736 | <entry>u<subscript>1</subscript></entry> | ||
2737 | <entry>u<subscript>0</subscript></entry> | ||
2738 | </row> | ||
2739 | <row> | ||
2740 | <entry></entry> | ||
2741 | <entry></entry> | ||
2742 | <entry></entry> | ||
2743 | &dash-ent-20; | ||
2744 | <entry>y<subscript>11</subscript></entry> | ||
2745 | <entry>y<subscript>10</subscript></entry> | ||
2746 | <entry>y<subscript>9</subscript></entry> | ||
2747 | <entry>y<subscript>8</subscript></entry> | ||
2748 | <entry>y<subscript>7</subscript></entry> | ||
2749 | <entry>y<subscript>6</subscript></entry> | ||
2750 | <entry>y<subscript>5</subscript></entry> | ||
2751 | <entry>y<subscript>4</subscript></entry> | ||
2752 | <entry>y<subscript>3</subscript></entry> | ||
2753 | <entry>y<subscript>2</subscript></entry> | ||
2754 | <entry>y<subscript>1</subscript></entry> | ||
2755 | <entry>y<subscript>0</subscript></entry> | ||
2756 | </row> | ||
2757 | <row> | ||
2758 | <entry></entry> | ||
2759 | <entry></entry> | ||
2760 | <entry></entry> | ||
2761 | &dash-ent-20; | ||
2762 | <entry>v<subscript>11</subscript></entry> | ||
2763 | <entry>v<subscript>10</subscript></entry> | ||
2764 | <entry>v<subscript>9</subscript></entry> | ||
2765 | <entry>v<subscript>8</subscript></entry> | ||
2766 | <entry>v<subscript>7</subscript></entry> | ||
2767 | <entry>v<subscript>6</subscript></entry> | ||
2768 | <entry>v<subscript>5</subscript></entry> | ||
2769 | <entry>v<subscript>4</subscript></entry> | ||
2770 | <entry>v<subscript>3</subscript></entry> | ||
2771 | <entry>v<subscript>2</subscript></entry> | ||
2772 | <entry>v<subscript>1</subscript></entry> | ||
2773 | <entry>v<subscript>0</subscript></entry> | ||
2774 | </row> | ||
2775 | <row> | ||
2776 | <entry></entry> | ||
2777 | <entry></entry> | ||
2778 | <entry></entry> | ||
2779 | &dash-ent-20; | ||
2780 | <entry>y<subscript>11</subscript></entry> | ||
2781 | <entry>y<subscript>10</subscript></entry> | ||
2782 | <entry>y<subscript>9</subscript></entry> | ||
2783 | <entry>y<subscript>8</subscript></entry> | ||
2784 | <entry>y<subscript>7</subscript></entry> | ||
2785 | <entry>y<subscript>6</subscript></entry> | ||
2786 | <entry>y<subscript>5</subscript></entry> | ||
2787 | <entry>y<subscript>4</subscript></entry> | ||
2788 | <entry>y<subscript>3</subscript></entry> | ||
2789 | <entry>y<subscript>2</subscript></entry> | ||
2790 | <entry>y<subscript>1</subscript></entry> | ||
2791 | <entry>y<subscript>0</subscript></entry> | ||
2792 | </row> | ||
2793 | <row id="V4L2-MBUS-FMT-VYUY12-2X12"> | ||
2794 | <entry>V4L2_MBUS_FMT_VYUY12_2X12</entry> | ||
2795 | <entry>0x201d</entry> | ||
2796 | <entry></entry> | ||
2797 | &dash-ent-20; | ||
2798 | <entry>v<subscript>11</subscript></entry> | ||
2799 | <entry>v<subscript>10</subscript></entry> | ||
2800 | <entry>v<subscript>9</subscript></entry> | ||
2801 | <entry>v<subscript>8</subscript></entry> | ||
2802 | <entry>v<subscript>7</subscript></entry> | ||
2803 | <entry>v<subscript>6</subscript></entry> | ||
2804 | <entry>v<subscript>5</subscript></entry> | ||
2805 | <entry>v<subscript>4</subscript></entry> | ||
2806 | <entry>v<subscript>3</subscript></entry> | ||
2807 | <entry>v<subscript>2</subscript></entry> | ||
2808 | <entry>v<subscript>1</subscript></entry> | ||
2809 | <entry>v<subscript>0</subscript></entry> | ||
2810 | </row> | ||
2811 | <row> | ||
2812 | <entry></entry> | ||
2813 | <entry></entry> | ||
2814 | <entry></entry> | ||
2815 | &dash-ent-20; | ||
2816 | <entry>y<subscript>11</subscript></entry> | ||
2817 | <entry>y<subscript>10</subscript></entry> | ||
2818 | <entry>y<subscript>9</subscript></entry> | ||
2819 | <entry>y<subscript>8</subscript></entry> | ||
2820 | <entry>y<subscript>7</subscript></entry> | ||
2821 | <entry>y<subscript>6</subscript></entry> | ||
2822 | <entry>y<subscript>5</subscript></entry> | ||
2823 | <entry>y<subscript>4</subscript></entry> | ||
2824 | <entry>y<subscript>3</subscript></entry> | ||
2825 | <entry>y<subscript>2</subscript></entry> | ||
2826 | <entry>y<subscript>1</subscript></entry> | ||
2827 | <entry>y<subscript>0</subscript></entry> | ||
2828 | </row> | ||
2829 | <row> | ||
2830 | <entry></entry> | ||
2831 | <entry></entry> | ||
2832 | <entry></entry> | ||
2833 | &dash-ent-20; | ||
2834 | <entry>u<subscript>11</subscript></entry> | ||
2835 | <entry>u<subscript>10</subscript></entry> | ||
2836 | <entry>u<subscript>9</subscript></entry> | ||
2837 | <entry>u<subscript>8</subscript></entry> | ||
2838 | <entry>u<subscript>7</subscript></entry> | ||
2839 | <entry>u<subscript>6</subscript></entry> | ||
2840 | <entry>u<subscript>5</subscript></entry> | ||
2841 | <entry>u<subscript>4</subscript></entry> | ||
2842 | <entry>u<subscript>3</subscript></entry> | ||
2843 | <entry>u<subscript>2</subscript></entry> | ||
2844 | <entry>u<subscript>1</subscript></entry> | ||
2845 | <entry>u<subscript>0</subscript></entry> | ||
2846 | </row> | ||
2847 | <row> | ||
2848 | <entry></entry> | ||
2849 | <entry></entry> | ||
2850 | <entry></entry> | ||
2851 | &dash-ent-20; | ||
2852 | <entry>y<subscript>11</subscript></entry> | ||
2853 | <entry>y<subscript>10</subscript></entry> | ||
2854 | <entry>y<subscript>9</subscript></entry> | ||
2855 | <entry>y<subscript>8</subscript></entry> | ||
2856 | <entry>y<subscript>7</subscript></entry> | ||
2857 | <entry>y<subscript>6</subscript></entry> | ||
2858 | <entry>y<subscript>5</subscript></entry> | ||
2859 | <entry>y<subscript>4</subscript></entry> | ||
2860 | <entry>y<subscript>3</subscript></entry> | ||
2861 | <entry>y<subscript>2</subscript></entry> | ||
2862 | <entry>y<subscript>1</subscript></entry> | ||
2863 | <entry>y<subscript>0</subscript></entry> | ||
2864 | </row> | ||
2865 | <row id="V4L2-MBUS-FMT-YUYV12-2X12"> | ||
2866 | <entry>V4L2_MBUS_FMT_YUYV12_2X12</entry> | ||
2867 | <entry>0x201e</entry> | ||
2868 | <entry></entry> | ||
2869 | &dash-ent-20; | ||
2870 | <entry>y<subscript>11</subscript></entry> | ||
2871 | <entry>y<subscript>10</subscript></entry> | ||
2872 | <entry>y<subscript>9</subscript></entry> | ||
2873 | <entry>y<subscript>8</subscript></entry> | ||
2874 | <entry>y<subscript>7</subscript></entry> | ||
2875 | <entry>y<subscript>6</subscript></entry> | ||
2876 | <entry>y<subscript>5</subscript></entry> | ||
2877 | <entry>y<subscript>4</subscript></entry> | ||
2878 | <entry>y<subscript>3</subscript></entry> | ||
2879 | <entry>y<subscript>2</subscript></entry> | ||
2880 | <entry>y<subscript>1</subscript></entry> | ||
2881 | <entry>y<subscript>0</subscript></entry> | ||
2882 | </row> | ||
2883 | <row> | ||
2884 | <entry></entry> | ||
2885 | <entry></entry> | ||
2886 | <entry></entry> | ||
2887 | &dash-ent-20; | ||
2888 | <entry>u<subscript>11</subscript></entry> | ||
2889 | <entry>u<subscript>10</subscript></entry> | ||
2890 | <entry>u<subscript>9</subscript></entry> | ||
2891 | <entry>u<subscript>8</subscript></entry> | ||
2892 | <entry>u<subscript>7</subscript></entry> | ||
2893 | <entry>u<subscript>6</subscript></entry> | ||
2894 | <entry>u<subscript>5</subscript></entry> | ||
2895 | <entry>u<subscript>4</subscript></entry> | ||
2896 | <entry>u<subscript>3</subscript></entry> | ||
2897 | <entry>u<subscript>2</subscript></entry> | ||
2898 | <entry>u<subscript>1</subscript></entry> | ||
2899 | <entry>u<subscript>0</subscript></entry> | ||
2900 | </row> | ||
2901 | <row> | ||
2902 | <entry></entry> | ||
2903 | <entry></entry> | ||
2904 | <entry></entry> | ||
2905 | &dash-ent-20; | ||
2906 | <entry>y<subscript>11</subscript></entry> | ||
2907 | <entry>y<subscript>10</subscript></entry> | ||
2908 | <entry>y<subscript>9</subscript></entry> | ||
2909 | <entry>y<subscript>8</subscript></entry> | ||
2910 | <entry>y<subscript>7</subscript></entry> | ||
2911 | <entry>y<subscript>6</subscript></entry> | ||
2912 | <entry>y<subscript>5</subscript></entry> | ||
2913 | <entry>y<subscript>4</subscript></entry> | ||
2914 | <entry>y<subscript>3</subscript></entry> | ||
2915 | <entry>y<subscript>2</subscript></entry> | ||
2916 | <entry>y<subscript>1</subscript></entry> | ||
2917 | <entry>y<subscript>0</subscript></entry> | ||
2918 | </row> | ||
2919 | <row> | ||
2920 | <entry></entry> | ||
2921 | <entry></entry> | ||
2922 | <entry></entry> | ||
2923 | &dash-ent-20; | ||
2924 | <entry>v<subscript>11</subscript></entry> | ||
2925 | <entry>v<subscript>10</subscript></entry> | ||
2926 | <entry>v<subscript>9</subscript></entry> | ||
2927 | <entry>v<subscript>8</subscript></entry> | ||
2928 | <entry>v<subscript>7</subscript></entry> | ||
2929 | <entry>v<subscript>6</subscript></entry> | ||
2930 | <entry>v<subscript>5</subscript></entry> | ||
2931 | <entry>v<subscript>4</subscript></entry> | ||
2932 | <entry>v<subscript>3</subscript></entry> | ||
2933 | <entry>v<subscript>2</subscript></entry> | ||
2934 | <entry>v<subscript>1</subscript></entry> | ||
2935 | <entry>v<subscript>0</subscript></entry> | ||
2936 | </row> | ||
2937 | <row id="V4L2-MBUS-FMT-YVYU12-2X12"> | ||
2938 | <entry>V4L2_MBUS_FMT_YVYU12_2X12</entry> | ||
2939 | <entry>0x201f</entry> | ||
2940 | <entry></entry> | ||
2941 | &dash-ent-20; | ||
2942 | <entry>y<subscript>11</subscript></entry> | ||
2943 | <entry>y<subscript>10</subscript></entry> | ||
2944 | <entry>y<subscript>9</subscript></entry> | ||
2945 | <entry>y<subscript>8</subscript></entry> | ||
2946 | <entry>y<subscript>7</subscript></entry> | ||
2947 | <entry>y<subscript>6</subscript></entry> | ||
2948 | <entry>y<subscript>5</subscript></entry> | ||
2949 | <entry>y<subscript>4</subscript></entry> | ||
2950 | <entry>y<subscript>3</subscript></entry> | ||
2951 | <entry>y<subscript>2</subscript></entry> | ||
2952 | <entry>y<subscript>1</subscript></entry> | ||
2953 | <entry>y<subscript>0</subscript></entry> | ||
2954 | </row> | ||
2955 | <row> | ||
2956 | <entry></entry> | ||
2957 | <entry></entry> | ||
2958 | <entry></entry> | ||
2959 | &dash-ent-20; | ||
2960 | <entry>v<subscript>11</subscript></entry> | ||
2961 | <entry>v<subscript>10</subscript></entry> | ||
2962 | <entry>v<subscript>9</subscript></entry> | ||
2963 | <entry>v<subscript>8</subscript></entry> | ||
2964 | <entry>v<subscript>7</subscript></entry> | ||
2965 | <entry>v<subscript>6</subscript></entry> | ||
2966 | <entry>v<subscript>5</subscript></entry> | ||
2967 | <entry>v<subscript>4</subscript></entry> | ||
2968 | <entry>v<subscript>3</subscript></entry> | ||
2969 | <entry>v<subscript>2</subscript></entry> | ||
2970 | <entry>v<subscript>1</subscript></entry> | ||
2971 | <entry>v<subscript>0</subscript></entry> | ||
2972 | </row> | ||
2973 | <row> | ||
2974 | <entry></entry> | ||
2975 | <entry></entry> | ||
2976 | <entry></entry> | ||
2977 | &dash-ent-20; | ||
2978 | <entry>y<subscript>11</subscript></entry> | ||
2979 | <entry>y<subscript>10</subscript></entry> | ||
2980 | <entry>y<subscript>9</subscript></entry> | ||
2981 | <entry>y<subscript>8</subscript></entry> | ||
2982 | <entry>y<subscript>7</subscript></entry> | ||
2983 | <entry>y<subscript>6</subscript></entry> | ||
2984 | <entry>y<subscript>5</subscript></entry> | ||
2985 | <entry>y<subscript>4</subscript></entry> | ||
2986 | <entry>y<subscript>3</subscript></entry> | ||
2987 | <entry>y<subscript>2</subscript></entry> | ||
2988 | <entry>y<subscript>1</subscript></entry> | ||
2989 | <entry>y<subscript>0</subscript></entry> | ||
2990 | </row> | ||
2991 | <row> | ||
2992 | <entry></entry> | ||
2993 | <entry></entry> | ||
2994 | <entry></entry> | ||
2995 | &dash-ent-20; | ||
2996 | <entry>u<subscript>11</subscript></entry> | ||
2997 | <entry>u<subscript>10</subscript></entry> | ||
2998 | <entry>u<subscript>9</subscript></entry> | ||
2999 | <entry>u<subscript>8</subscript></entry> | ||
3000 | <entry>u<subscript>7</subscript></entry> | ||
3001 | <entry>u<subscript>6</subscript></entry> | ||
3002 | <entry>u<subscript>5</subscript></entry> | ||
3003 | <entry>u<subscript>4</subscript></entry> | ||
3004 | <entry>u<subscript>3</subscript></entry> | ||
3005 | <entry>u<subscript>2</subscript></entry> | ||
3006 | <entry>u<subscript>1</subscript></entry> | ||
3007 | <entry>u<subscript>0</subscript></entry> | ||
3008 | </row> | ||
2721 | </tbody> | 3009 | </tbody> |
2722 | </tgroup> | 3010 | </tgroup> |
2723 | </table> | 3011 | </table> |
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h index 43707b2c17c1..70a732b7e47b 100644 --- a/include/uapi/linux/v4l2-mediabus.h +++ b/include/uapi/linux/v4l2-mediabus.h | |||
@@ -52,7 +52,7 @@ enum v4l2_mbus_pixelcode { | |||
52 | V4L2_MBUS_FMT_RGB888_2X12_LE = 0x100c, | 52 | V4L2_MBUS_FMT_RGB888_2X12_LE = 0x100c, |
53 | V4L2_MBUS_FMT_ARGB8888_1X32 = 0x100d, | 53 | V4L2_MBUS_FMT_ARGB8888_1X32 = 0x100d, |
54 | 54 | ||
55 | /* YUV (including grey) - next is 0x201c */ | 55 | /* YUV (including grey) - next is 0x2020 */ |
56 | V4L2_MBUS_FMT_Y8_1X8 = 0x2001, | 56 | V4L2_MBUS_FMT_Y8_1X8 = 0x2001, |
57 | V4L2_MBUS_FMT_UV8_1X8 = 0x2015, | 57 | V4L2_MBUS_FMT_UV8_1X8 = 0x2015, |
58 | V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002, | 58 | V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002, |
@@ -80,6 +80,10 @@ enum v4l2_mbus_pixelcode { | |||
80 | V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e, | 80 | V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e, |
81 | V4L2_MBUS_FMT_YUV10_1X30 = 0x2016, | 81 | V4L2_MBUS_FMT_YUV10_1X30 = 0x2016, |
82 | V4L2_MBUS_FMT_AYUV8_1X32 = 0x2017, | 82 | V4L2_MBUS_FMT_AYUV8_1X32 = 0x2017, |
83 | V4L2_MBUS_FMT_UYVY12_2X12 = 0x201c, | ||
84 | V4L2_MBUS_FMT_VYUY12_2X12 = 0x201d, | ||
85 | V4L2_MBUS_FMT_YUYV12_2X12 = 0x201e, | ||
86 | V4L2_MBUS_FMT_YVYU12_2X12 = 0x201f, | ||
83 | 87 | ||
84 | /* Bayer - next is 0x3019 */ | 88 | /* Bayer - next is 0x3019 */ |
85 | V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001, | 89 | V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001, |