]> git.sesse.net Git - ffmpeg/blobdiff - libavcodec/pixdesc.c
AAC packetiser cleanup: remove check for a condition that cannot happen
[ffmpeg] / libavcodec / pixdesc.c
index 7791fe6271fd207069c77c286a2fb2908b5c32bf..f3032c7dac2e5d502efb209157c2a32b256bc5d6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Pixel Format descriptor
+ * pixel format descriptor
  * Copyright (c) 2009 Michael Niedermayer <michaelni@gmx.at>
  *
  * This file is part of FFmpeg.
 #include "libavutil/pixfmt.h"
 #include "pixdesc.h"
 
-static const AVPixFmtDescriptor pix_fmt_desc[PIX_FMT_NB] = {
-    [PIX_FMT_YUV422P] = {
-        .nb_channels  = 3,
-        .log2_chroma_w= 1,
-        .log2_chroma_h= 0,
-        .comp = {
-            {0,0,1,0,7},
-            {1,0,1,0,7},
-            {2,0,1,0,7},
-        },
-    },
+const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     [PIX_FMT_YUV420P] = {
+        .name = "yuv420p",
         .nb_channels  = 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
         .comp = {
-            {0,0,1,0,7},
-            {1,0,1,0,7},
-            {2,0,1,0,7},
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
         },
     },
-    [PIX_FMT_YUV410P] = {
+    [PIX_FMT_YUYV422] = {
+        .name = "yuyv422",
         .nb_channels  = 3,
-        .log2_chroma_w= 2,
-        .log2_chroma_h= 2,
+        .log2_chroma_w= 1,
+        .log2_chroma_h= 0,
         .comp = {
-            {0,0,1,0,7},
-            {1,0,1,0,7},
-            {2,0,1,0,7},
+            {0,1,1,0,7},        /* Y */
+            {0,3,2,0,7},        /* U */
+            {0,3,4,0,7},        /* V */
         },
     },
-    [PIX_FMT_NV12] = {
+    [PIX_FMT_RGB24] = {
+        .name = "rgb24",
         .nb_channels  = 3,
-        .log2_chroma_w= 1,
-        .log2_chroma_h= 1,
+        .log2_chroma_w= 0,
+        .log2_chroma_h= 0,
         .comp = {
-            {0,0,1,0,7},
-            {1,1,1,0,7},
-            {1,1,2,0,7},
+            {0,2,1,0,7},        /* R */
+            {0,2,2,0,7},        /* G */
+            {0,2,3,0,7},        /* B */
         },
     },
-    [PIX_FMT_YUYV422] = {
+    [PIX_FMT_YUV422P] = {
+        .name = "yuv422p",
         .nb_channels  = 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
         .comp = {
-            {0,1,1,0,7},
-            {0,3,2,0,7},
-            {0,3,4,0,7},
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
         },
     },
-    [PIX_FMT_UYVY422] = {
+    [PIX_FMT_YUV410P] = {
+        .name = "yuv410p",
         .nb_channels  = 3,
-        .log2_chroma_w= 1,
-        .log2_chroma_h= 0,
+        .log2_chroma_w= 2,
+        .log2_chroma_h= 2,
         .comp = {
-            {0,1,2,0,7},
-            {0,3,1,0,7},
-            {0,3,3,0,7},
+            {0,0,1,0,7},        /* Y */
+            {1,0,1,0,7},        /* U */
+            {2,0,1,0,7},        /* V */
         },
     },
-    [PIX_FMT_GRAY16LE] = {
+    [PIX_FMT_MONOBLACK] = {
+        .name = "monoblack",
         .nb_channels  = 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,1,1,0,15},
+            {0,0,1,7,0},        /* Y */
         },
+        .flags = PIX_FMT_BITSTREAM,
     },
-    [PIX_FMT_GRAY16BE] = {
+    [PIX_FMT_PAL8] = {
+        .name = "pal8",
         .nb_channels  = 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,1,1,0,15},
+            {0,0,1,0,7},
         },
-        .flags = PIX_FMT_BE,
+        .flags = PIX_FMT_PAL,
     },
-    [PIX_FMT_RGB24] = {
+    [PIX_FMT_UYVY422] = {
+        .name = "uyvy422",
         .nb_channels  = 3,
-        .log2_chroma_w= 0,
+        .log2_chroma_w= 1,
         .log2_chroma_h= 0,
         .comp = {
-            {0,2,1,0,7},
-            {0,2,2,0,7},
-            {0,2,3,0,7},
+            {0,1,2,0,7},        /* Y */
+            {0,3,1,0,7},        /* U */
+            {0,3,3,0,7},        /* V */
+        },
+    },
+    [PIX_FMT_NV12] = {
+        .name = "nv12",
+        .nb_channels  = 3,
+        .log2_chroma_w= 1,
+        .log2_chroma_h= 1,
+        .comp = {
+            {0,0,1,0,7},        /* Y */
+            {1,1,1,0,7},        /* U */
+            {1,1,2,0,7},        /* V */
         },
     },
     [PIX_FMT_RGBA] = {
+        .name = "rgba",
         .nb_channels  = 4,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,3,1,0,7},
-            {0,3,2,0,7},
-            {0,3,3,0,7},
-            {0,3,4,0,7},
+            {0,3,1,0,7},        /* R */
+            {0,3,2,0,7},        /* G */
+            {0,3,3,0,7},        /* B */
+            {0,3,4,0,7},        /* A */
         },
     },
-    [PIX_FMT_RGB48LE] = {
-        .nb_channels  = 3,
+    [PIX_FMT_GRAY16BE] = {
+        .name = "gray16be",
+        .nb_channels  = 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,5,1,0,15},
-            {0,5,3,0,15},
-            {0,5,5,0,15},
+            {0,1,1,0,15},       /* Y */
         },
+        .flags = PIX_FMT_BE,
     },
-    [PIX_FMT_RGB48BE] = {
-        .nb_channels  = 3,
+    [PIX_FMT_GRAY16LE] = {
+        .name = "gray16le",
+        .nb_channels  = 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,5,1,0,15},
-            {0,5,3,0,15},
-            {0,5,5,0,15},
+            {0,1,1,0,15},       /* Y */
         },
-        .flags = PIX_FMT_BE,
     },
-//FIXME chaneg pix fmt defines so that we have a LE & BE instead of a Native endian
-#if 0
-    [PIX_FMT_RGB565_LE] = {
+    [PIX_FMT_RGB48BE] = {
+        .name = "rgb48be",
         .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,1,1,0,4},
-            {0,1,1,5,5},
-            {0,1,2,3,4},
+            {0,5,1,0,15},       /* R */
+            {0,5,3,0,15},       /* G */
+            {0,5,5,0,15},       /* B */
         },
+        .flags = PIX_FMT_BE,
     },
-    [PIX_FMT_RGB565_BE] = {
+    [PIX_FMT_RGB48LE] = {
+        .name = "rgb48le",
         .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,1,1, 0,4},
-            {0,1,1, 5,5},
-            {0,1,0, 3,4},
+            {0,5,1,0,15},       /* R */
+            {0,5,3,0,15},       /* G */
+            {0,5,5,0,15},       /* B */
         },
-        .flags = PIX_FMT_BE,
     },
-#endif
-    [PIX_FMT_MONOBLACK] = {
-        .nb_channels  = 1,
+    [PIX_FMT_RGB565BE] = {
+        .name = "rgb565be",
+        .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,0,1,7,0},
+            {0,1,0,3,4},        /* R */
+            {0,1,1,5,5},        /* G */
+            {0,1,1,0,4},        /* B */
         },
-        .flags = PIX_FMT_BITSTREAM,
+        .flags = PIX_FMT_BE,
     },
-    [PIX_FMT_PAL8] = {
-        .nb_channels  = 1,
+    [PIX_FMT_RGB565LE] = {
+        .name = "rgb565le",
+        .nb_channels  = 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
-            {0,0,1,0,7},
+            {0,1,2,3,4},        /* R */
+            {0,1,1,5,5},        /* G */
+            {0,1,1,0,4},        /* B */
         },
-        .flags = PIX_FMT_PAL,
     },
 };