Add missing pixel format descriptor definitions.

Originally committed as revision 18682 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 314 insertions, 0 deletions

diff --git a/libavcodec/pixdesc.c b/libavcodec/pixdesc.c
index f3032c7dac..f2d1dd196c 100644
--- a/libavcodec/pixdesc.c
+++ b/libavcodec/pixdesc.c
@@ -56,6 +56,17 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
             {0,2,3,0,7},        /* B */
         },
     },
+    [PIX_FMT_BGR24] = {
+        .name = "bgr24",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,2,1,0,7},        /* B */
+            {0,2,2,0,7},        /* G */
+            {0,2,3,0,7},        /* R */
+        },
+    },
     [PIX_FMT_YUV422P] = {
         .name = "yuv422p",
         .nb_channels  = 3,
@@ -67,6 +78,17 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
             {2,0,1,0,7},        /* V */
         },
     },
+    [PIX_FMT_YUV444P] = {
+        .name = "yuv444p",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+        },
+    },
     [PIX_FMT_YUV410P] = {
         .name = "yuv410p",
         .nb_channels  = 3,
@@ -78,6 +100,36 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
             {2,0,1,0,7},        /* V */
         },
     },
+    [PIX_FMT_YUV411P] = {
+        .name = "yuv411p",
+        .nb_channels  = 3,
+        .log2_chroma_w= 2,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+        },
+    },
+    [PIX_FMT_GRAY8] = {
+        .name = "gray8",
+        .nb_channels  = 1,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+        },
+    },
+    [PIX_FMT_MONOWHITE] = {
+        .name = "monowhite",
+        .nb_channels  = 1,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,0,0},        /* Y */
+        },
+        .flags = PIX_FMT_BITSTREAM,
+    },
     [PIX_FMT_MONOBLACK] = {
         .name = "monoblack",
         .nb_channels  = 1,
@@ -98,6 +150,39 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
         },
         .flags = PIX_FMT_PAL,
     },
+    [PIX_FMT_YUVJ420P] = {
+        .name = "yuvj420p",
+        .nb_channels  = 3,
+        .log2_chroma_w= 1,
+        .log2_chroma_h= 1,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+        },
+    },
+    [PIX_FMT_YUVJ422P] = {
+        .name = "yuvj422p",
+        .nb_channels  = 3,
+        .log2_chroma_w= 1,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+        },
+    },
+    [PIX_FMT_YUVJ444P] = {
+        .name = "yuvj444p",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+        },
+    },
     [PIX_FMT_UYVY422] = {
         .name = "uyvy422",
         .nb_channels  = 3,
@@ -109,6 +194,85 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
             {0,3,3,0,7},        /* V */
         },
     },
+    [PIX_FMT_UYYVYY411] = {
+        .name = "uyyvyy411",
+        .nb_channels  = 3,
+        .log2_chroma_w= 2,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,3,2,0,7},        /* Y */
+            {0,5,1,0,7},        /* U */
+            {0,5,4,0,7},        /* V */
+        },
+    },
+    [PIX_FMT_BGR8] = {
+        .name = "bgr8",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,6,1},        /* B */
+            {0,0,1,3,2},        /* G */
+            {0,0,1,0,2},        /* R */
+        },
+    },
+    [PIX_FMT_BGR4] = {
+        .name = "bgr4",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,3,1,0,0},        /* B */
+            {0,3,2,0,1},        /* G */
+            {0,3,4,0,0},        /* R */
+        },
+        .flags = PIX_FMT_BITSTREAM,
+    },
+    [PIX_FMT_BGR4_BYTE] = {
+        .name = "bgr4_byte",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,3,0},        /* B */
+            {0,0,1,1,1},        /* G */
+            {0,0,1,0,0},        /* R */
+        },
+    },
+    [PIX_FMT_RGB8] = {
+        .name = "rgb8",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,6,1},        /* R */
+            {0,0,1,3,2},        /* G */
+            {0,0,1,0,2},        /* B */
+        },
+    },
+    [PIX_FMT_RGB4] = {
+        .name = "rgb4",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,3,1,0,0},       /* R */
+            {0,3,2,0,1},       /* G */
+            {0,3,4,0,0},       /* B */
+        },
+        .flags = PIX_FMT_BITSTREAM,
+    },
+    [PIX_FMT_RGB4_BYTE] = {
+        .name = "rgb4_byte",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,0,1,3,0},        /* R */
+            {0,0,1,1,1},        /* G */
+            {0,0,1,0,0},        /* B */
+        },
+    },
     [PIX_FMT_NV12] = {
         .name = "nv12",
         .nb_channels  = 3,
@@ -120,6 +284,29 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
             {1,1,2,0,7},        /* V */
         },
     },
+    [PIX_FMT_NV21] = {
+        .name = "nv21",
+        .nb_channels  = 3,
+        .log2_chroma_w= 1,
+        .log2_chroma_h= 1,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,1,1,0,7},        /* V */
+            {1,1,2,0,7},        /* U */
+        },
+    },
+    [PIX_FMT_ARGB] = {
+        .name = "argb",
+        .nb_channels  = 4,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,3,1,0,7},        /* A */
+            {0,3,2,0,7},        /* R */
+            {0,3,3,0,7},        /* G */
+            {0,3,4,0,7},        /* B */
+        },
+    },
     [PIX_FMT_RGBA] = {
         .name = "rgba",
         .nb_channels  = 4,
@@ -132,6 +319,30 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
             {0,3,4,0,7},        /* A */
         },
     },
+    [PIX_FMT_ABGR] = {
+        .name = "abgr",
+        .nb_channels  = 4,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,3,1,0,7},        /* A */
+            {0,3,2,0,7},        /* B */
+            {0,3,3,0,7},        /* G */
+            {0,3,4,0,7},        /* R */
+        },
+    },
+    [PIX_FMT_BGRA] = {
+        .name = "bgra",
+        .nb_channels  = 4,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,3,1,0,7},        /* B */
+            {0,3,2,0,7},        /* G */
+            {0,3,3,0,7},        /* R */
+            {0,3,4,0,7},        /* A */
+        },
+    },
     [PIX_FMT_GRAY16BE] = {
         .name = "gray16be",
         .nb_channels  = 1,
@@ -151,6 +362,40 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
             {0,1,1,0,15},       /* Y */
         },
     },
+    [PIX_FMT_YUV440P] = {
+        .name = "yuv440p",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 1,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+        },
+    },
+    [PIX_FMT_YUVJ440P] = {
+        .name = "yuvj440p",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 1,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+        },
+    },
+    [PIX_FMT_YUVA420P] = {
+        .name = "yuva420p",
+        .nb_channels  = 4,
+        .log2_chroma_w= 1,
+        .log2_chroma_h= 1,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
+            {3,0,1,0,7},        /* A */
+        },
+    },
     [PIX_FMT_RGB48BE] = {
         .name = "rgb48be",
         .nb_channels  = 3,
@@ -197,4 +442,73 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
             {0,1,1,0,4},        /* B */
         },
     },
+    [PIX_FMT_RGB555BE] = {
+        .name = "rgb555be",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,1,0,2,4},        /* R */
+            {0,1,1,5,4},        /* G */
+            {0,1,1,0,4},        /* B */
+        },
+        .flags = PIX_FMT_BE,
+    },
+    [PIX_FMT_RGB555LE] = {
+        .name = "rgb555le",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,1,2,2,4},        /* R */
+            {0,1,1,5,4},        /* G */
+            {0,1,1,0,4},        /* B */
+        },
+    },
+    [PIX_FMT_BGR565BE] = {
+        .name = "bgr565be",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,1,0,3,4},        /* B */
+            {0,1,1,5,5},        /* G */
+            {0,1,1,0,4},        /* R */
+        },
+        .flags = PIX_FMT_BE,
+    },
+    [PIX_FMT_BGR565LE] = {
+        .name = "bgr565le",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,1,2,3,4},        /* B */
+            {0,1,1,5,5},        /* G */
+            {0,1,1,0,4},        /* R */
+        },
+    },
+    [PIX_FMT_BGR555BE] = {
+        .name = "bgr555be",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,1,0,2,4},       /* B */
+            {0,1,1,5,4},       /* G */
+            {0,1,1,0,4},       /* R */
+        },
+        .flags = PIX_FMT_BE,
+     },
+    [PIX_FMT_BGR555LE] = {
+        .name = "bgr555le",
+        .nb_channels  = 3,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
+        .comp = {
+            {0,1,2,2,4},        /* B */
+            {0,1,1,5,4},        /* G */
+            {0,1,1,0,4},        /* R */
+        },
+    },
 };