Move read_line() and write_line() definition from pixdesc.h to
[libav.git] / libavutil / pixdesc.c
index a462b07..e4ced8e 100644 (file)
 #include "pixfmt.h"
 #include "pixdesc.h"
 
+#include "intreadwrite.h"
+
+void read_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4],
+               const AVPixFmtDescriptor *desc, int x, int y, int c, int w, int read_pal_component)
+{
+    AVComponentDescriptor comp= desc->comp[c];
+    int plane= comp.plane;
+    int depth= comp.depth_minus1+1;
+    int mask = (1<<depth)-1;
+    int shift= comp.shift;
+    int step = comp.step_minus1+1;
+    int flags= desc->flags;
+
+    if (flags & PIX_FMT_BITSTREAM){
+        int skip = x*step + comp.offset_plus1-1;
+        const uint8_t *p = data[plane] + y*linesize[plane] + (skip>>3);
+        int shift = 8 - depth - (skip&7);
+
+        while(w--){
+            int val = (*p >> shift) & mask;
+            if(read_pal_component)
+                val= data[1][4*val + c];
+            shift -= step;
+            p -= shift>>3;
+            shift &= 7;
+            *dst++= val;
+        }
+    } else {
+        const uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1;
+
+        while(w--){
+            int val;
+            if(flags & PIX_FMT_BE) val= AV_RB16(p);
+            else                   val= AV_RL16(p);
+            val = (val>>shift) & mask;
+            if(read_pal_component)
+                val= data[1][4*val + c];
+            p+= step;
+            *dst++= val;
+        }
+    }
+}
+
+void write_line(const uint16_t *src, uint8_t *data[4], const int linesize[4],
+                const AVPixFmtDescriptor *desc, int x, int y, int c, int w)
+{
+    AVComponentDescriptor comp = desc->comp[c];
+    int plane = comp.plane;
+    int depth = comp.depth_minus1+1;
+    int step  = comp.step_minus1+1;
+    int flags = desc->flags;
+
+    if (flags & PIX_FMT_BITSTREAM) {
+        int skip = x*step + comp.offset_plus1-1;
+        uint8_t *p = data[plane] + y*linesize[plane] + (skip>>3);
+        int shift = 8 - depth - (skip&7);
+
+        while (w--) {
+            *p |= *src++ << shift;
+            shift -= step;
+            p -= shift>>3;
+            shift &= 7;
+        }
+    } else {
+        int shift = comp.shift;
+        uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1;
+
+        while (w--) {
+            if (flags & PIX_FMT_BE) {
+                uint16_t val = AV_RB16(p) | (*src++<<shift);
+                AV_WB16(p, val);
+            } else {
+                uint16_t val = AV_RL16(p) | (*src++<<shift);
+                AV_WL16(p, val);
+            }
+            p+= step;
+        }
+    }
+}
+
 const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     [PIX_FMT_YUV420P] = {
         .name = "yuv420p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
         .comp = {
@@ -36,7 +116,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUYV422] = {
         .name = "yuyv422",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
         .comp = {
@@ -47,7 +127,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB24] = {
         .name = "rgb24",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -58,7 +138,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_BGR24] = {
         .name = "bgr24",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -69,7 +149,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV422P] = {
         .name = "yuv422p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
         .comp = {
@@ -80,7 +160,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV444P] = {
         .name = "yuv444p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -91,7 +171,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV410P] = {
         .name = "yuv410p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 2,
         .log2_chroma_h= 2,
         .comp = {
@@ -102,7 +182,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV411P] = {
         .name = "yuv411p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 2,
         .log2_chroma_h= 0,
         .comp = {
@@ -112,8 +192,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_GRAY8] = {
-        .name = "gray8",
-        .nb_channels  = 1,
+        .name = "gray",
+        .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -121,8 +201,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_MONOWHITE] = {
-        .name = "monowhite",
-        .nb_channels  = 1,
+        .name = "monow",
+        .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -131,8 +211,8 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
         .flags = PIX_FMT_BITSTREAM,
     },
     [PIX_FMT_MONOBLACK] = {
-        .name = "monoblack",
-        .nb_channels  = 1,
+        .name = "monob",
+        .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -142,7 +222,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_PAL8] = {
         .name = "pal8",
-        .nb_channels  = 1,
+        .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -152,7 +232,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUVJ420P] = {
         .name = "yuvj420p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
         .comp = {
@@ -163,7 +243,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUVJ422P] = {
         .name = "yuvj422p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
         .comp = {
@@ -174,7 +254,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUVJ444P] = {
         .name = "yuvj444p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -184,16 +264,16 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
         },
     },
     [PIX_FMT_XVMC_MPEG2_MC] = {
-        .name = "xvmc_mpeg2_mc",
+        .name = "xvmcmc",
         .flags = PIX_FMT_HWACCEL,
     },
     [PIX_FMT_XVMC_MPEG2_IDCT] = {
-        .name = "xvmc_mpeg2_idct",
+        .name = "xvmcidct",
         .flags = PIX_FMT_HWACCEL,
     },
     [PIX_FMT_UYVY422] = {
         .name = "uyvy422",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
         .comp = {
@@ -204,7 +284,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_UYYVYY411] = {
         .name = "uyyvyy411",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 2,
         .log2_chroma_h= 0,
         .comp = {
@@ -215,7 +295,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_BGR8] = {
         .name = "bgr8",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -227,7 +307,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_BGR4] = {
         .name = "bgr4",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -239,7 +319,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_BGR4_BYTE] = {
         .name = "bgr4_byte",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -251,7 +331,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB8] = {
         .name = "rgb8",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -263,7 +343,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB4] = {
         .name = "rgb4",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -275,7 +355,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB4_BYTE] = {
         .name = "rgb4_byte",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -287,7 +367,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_NV12] = {
         .name = "nv12",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
         .comp = {
@@ -298,7 +378,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_NV21] = {
         .name = "nv21",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
         .comp = {
@@ -309,7 +389,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_ARGB] = {
         .name = "argb",
-        .nb_channels  = 4,
+        .nb_components= 4,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -321,7 +401,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGBA] = {
         .name = "rgba",
-        .nb_channels  = 4,
+        .nb_components= 4,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -333,7 +413,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_ABGR] = {
         .name = "abgr",
-        .nb_channels  = 4,
+        .nb_components= 4,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -345,7 +425,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_BGRA] = {
         .name = "bgra",
-        .nb_channels  = 4,
+        .nb_components= 4,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -357,7 +437,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_GRAY16BE] = {
         .name = "gray16be",
-        .nb_channels  = 1,
+        .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -367,7 +447,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_GRAY16LE] = {
         .name = "gray16le",
-        .nb_channels  = 1,
+        .nb_components= 1,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -376,7 +456,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV440P] = {
         .name = "yuv440p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 1,
         .comp = {
@@ -387,7 +467,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUVJ440P] = {
         .name = "yuvj440p",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 1,
         .comp = {
@@ -398,7 +478,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUVA420P] = {
         .name = "yuva420p",
-        .nb_channels  = 4,
+        .nb_components= 4,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
         .comp = {
@@ -438,9 +518,15 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
         .log2_chroma_h = 1,
         .flags = PIX_FMT_HWACCEL,
     },
+    [PIX_FMT_VDPAU_MPEG4] = {
+        .name = "vdpau_mpeg4",
+        .log2_chroma_w = 1,
+        .log2_chroma_h = 1,
+        .flags = PIX_FMT_HWACCEL,
+    },
     [PIX_FMT_RGB48BE] = {
         .name = "rgb48be",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -452,7 +538,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB48LE] = {
         .name = "rgb48le",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -463,7 +549,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB565BE] = {
         .name = "rgb565be",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -475,7 +561,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB565LE] = {
         .name = "rgb565le",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -486,7 +572,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB555BE] = {
         .name = "rgb555be",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -498,7 +584,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_RGB555LE] = {
         .name = "rgb555le",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -509,7 +595,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_BGR565BE] = {
         .name = "bgr565be",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -521,7 +607,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_BGR565LE] = {
         .name = "bgr565le",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -532,7 +618,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_BGR555BE] = {
         .name = "bgr555be",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -544,7 +630,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
      },
     [PIX_FMT_BGR555LE] = {
         .name = "bgr555le",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -573,7 +659,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV420P16LE] = {
         .name = "yuv420p16le",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
         .comp = {
@@ -584,7 +670,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV420P16BE] = {
         .name = "yuv420p16be",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 1,
         .comp = {
@@ -596,7 +682,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV422P16LE] = {
         .name = "yuv422p16le",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
         .comp = {
@@ -607,7 +693,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV422P16BE] = {
         .name = "yuv422p16be",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 1,
         .log2_chroma_h= 0,
         .comp = {
@@ -619,7 +705,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV444P16LE] = {
         .name = "yuv444p16le",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -630,7 +716,7 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
     },
     [PIX_FMT_YUV444P16BE] = {
         .name = "yuv444p16be",
-        .nb_channels  = 3,
+        .nb_components= 3,
         .log2_chroma_w= 0,
         .log2_chroma_h= 0,
         .comp = {
@@ -640,14 +726,57 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
         },
         .flags = PIX_FMT_BE,
     },
+    [PIX_FMT_DXVA2_VLD] = {
+        .name = "dxva2_vld",
+        .log2_chroma_w = 1,
+        .log2_chroma_h = 1,
+        .flags = PIX_FMT_HWACCEL,
+    },
 };
 
+static enum PixelFormat get_pix_fmt_internal(const char *name)
+{
+    enum PixelFormat pix_fmt;
+
+    for (pix_fmt = 0; pix_fmt < PIX_FMT_NB; pix_fmt++)
+        if (av_pix_fmt_descriptors[pix_fmt].name &&
+            !strcmp(av_pix_fmt_descriptors[pix_fmt].name, name))
+            return pix_fmt;
+
+    return PIX_FMT_NONE;
+}
+
+#if HAVE_BIGENDIAN
+#   define X_NE(be, le) be
+#else
+#   define X_NE(be, le) le
+#endif
+
+enum PixelFormat av_get_pix_fmt(const char *name)
+{
+    enum PixelFormat pix_fmt;
+
+    if (!strcmp(name, "rgb32"))
+        name = X_NE("argb", "bgra");
+    else if (!strcmp(name, "bgr32"))
+        name = X_NE("abgr", "rgba");
+
+    pix_fmt = get_pix_fmt_internal(name);
+    if (pix_fmt == PIX_FMT_NONE) {
+        char name2[32];
+
+        snprintf(name2, sizeof(name2), "%s%s", name, X_NE("be", "le"));
+        pix_fmt = get_pix_fmt_internal(name2);
+    }
+    return pix_fmt;
+}
+
 int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc)
 {
     int c, bits = 0;
     int log2_pixels = pixdesc->log2_chroma_w + pixdesc->log2_chroma_h;
 
-    for (c = 0; c < pixdesc->nb_channels; c++) {
+    for (c = 0; c < pixdesc->nb_components; c++) {
         int s = c==1 || c==2 ? 0 : log2_pixels;
         bits += (pixdesc->comp[c].depth_minus1+1) << s;
     }