X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavutil%2Fpixdesc.c;h=9e7d8bd0998a8ad15f6047825653c2a3a040d12c;hb=1aa24df74c052a73175c43e57d35b4835e537ec8;hp=67f9c435d0d9c3f5e4041b17ab7da907d4b39f0f;hpb=8c65264595d5a82c56ae5043320e4b875a414229;p=ffmpeg diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 67f9c435d0d..9e7d8bd0998 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -22,11 +22,13 @@ #include #include +#include "avstring.h" #include "common.h" #include "pixfmt.h" #include "pixdesc.h" - +#include "internal.h" #include "intreadwrite.h" +#include "version.h" void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], @@ -36,14 +38,14 @@ void av_read_image_line(uint16_t *dst, { AVComponentDescriptor comp = desc->comp[c]; int plane = comp.plane; - int depth = comp.depth_minus1 + 1; + int depth = comp.depth; int mask = (1 << depth) - 1; int shift = comp.shift; - int step = comp.step_minus1 + 1; + int step = comp.step; int flags = desc->flags; - if (flags & PIX_FMT_BITSTREAM) { - int skip = x * step + comp.offset_plus1 - 1; + if (flags & AV_PIX_FMT_FLAG_BITSTREAM) { + int skip = x * step + comp.offset; const uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3); int shift = 8 - depth - (skip & 7); @@ -58,15 +60,15 @@ void av_read_image_line(uint16_t *dst, } } else { const uint8_t *p = data[plane] + y * linesize[plane] + - x * step + comp.offset_plus1 - 1; + x * step + comp.offset; int is_8bit = shift + depth <= 8; if (is_8bit) - p += !!(flags & PIX_FMT_BE); + p += !!(flags & AV_PIX_FMT_FLAG_BE); while (w--) { int val = is_8bit ? *p : - flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p); + flags & AV_PIX_FMT_FLAG_BE ? AV_RB16(p) : AV_RL16(p); val = (val >> shift) & mask; if (read_pal_component) val = data[1][4 * val + c]; @@ -83,12 +85,12 @@ void av_write_image_line(const uint16_t *src, { AVComponentDescriptor comp = desc->comp[c]; int plane = comp.plane; - int depth = comp.depth_minus1 + 1; - int step = comp.step_minus1 + 1; + int depth = comp.depth; + int step = comp.step; int flags = desc->flags; - if (flags & PIX_FMT_BITSTREAM) { - int skip = x * step + comp.offset_plus1 - 1; + if (flags & AV_PIX_FMT_FLAG_BITSTREAM) { + int skip = x * step + comp.offset; uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3); int shift = 8 - depth - (skip & 7); @@ -101,17 +103,17 @@ void av_write_image_line(const uint16_t *src, } else { int shift = comp.shift; uint8_t *p = data[plane] + y * linesize[plane] + - x * step + comp.offset_plus1 - 1; + x * step + comp.offset; if (shift + depth <= 8) { - p += !!(flags & PIX_FMT_BE); + p += !!(flags & AV_PIX_FMT_FLAG_BE); while (w--) { *p |= (*src++ << shift); p += step; } } else { while (w--) { - if (flags & PIX_FMT_BE) { + if (flags & AV_PIX_FMT_FLAG_BE) { uint16_t val = AV_RB16(p) | (*src++ << shift); AV_WB16(p, val); } else { @@ -124,21 +126,21 @@ void av_write_image_line(const uint16_t *src, } } -#if !FF_API_PIX_FMT_DESC -static +#if FF_API_PLUS1_MINUS1 +FF_DISABLE_DEPRECATION_WARNINGS #endif -const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { +static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { [AV_PIX_FMT_YUV420P] = { .name = "yuv420p", .nb_components = 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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUYV422] = { .name = "yuyv422", @@ -146,9 +148,20 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 7 }, /* Y */ - { 0, 3, 2, 0, 7 }, /* U */ - { 0, 3, 4, 0, 7 }, /* V */ + { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */ + { 0, 4, 1, 0, 8, 3, 7, 2 }, /* U */ + { 0, 4, 3, 0, 8, 3, 7, 4 }, /* V */ + }, + }, + [AV_PIX_FMT_YVYU422] = { + .name = "yvyu422", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */ + { 0, 4, 3, 0, 8, 3, 7, 4 }, /* U */ + { 0, 4, 1, 0, 8, 3, 7, 2 }, /* V */ }, }, [AV_PIX_FMT_RGB24] = { @@ -157,11 +170,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 2, 1, 0, 7 }, /* R */ - { 0, 2, 2, 0, 7 }, /* G */ - { 0, 2, 3, 0, 7 }, /* B */ + { 0, 3, 0, 0, 8, 2, 7, 1 }, /* R */ + { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */ + { 0, 3, 2, 0, 8, 2, 7, 3 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR24] = { .name = "bgr24", @@ -169,11 +182,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 3, 2, 0, 8, 2, 7, 3 }, /* R */ + { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */ + { 0, 3, 0, 0, 8, 2, 7, 1 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_YUV422P] = { .name = "yuv422p", @@ -181,11 +194,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P] = { .name = "yuv444p", @@ -193,11 +206,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV410P] = { .name = "yuv410p", @@ -205,11 +218,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 2, .log2_chroma_h = 2, .comp = { - { 0, 0, 1, 0, 7 }, /* Y */ - { 1, 0, 1, 0, 7 }, /* U */ - { 2, 0, 1, 0, 7 }, /* V */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV411P] = { .name = "yuv411p", @@ -217,11 +230,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_GRAY8] = { .name = "gray", @@ -229,8 +242,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 0, 1, 0, 7 }, /* Y */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ }, + .flags = AV_PIX_FMT_FLAG_PSEUDOPAL, + .alias = "gray8,y8", }, [AV_PIX_FMT_MONOWHITE] = { .name = "monow", @@ -238,9 +253,9 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 0, 1, 0, 0 }, /* Y */ + { 0, 1, 0, 0, 1, 0, 0, 1 }, /* Y */ }, - .flags = PIX_FMT_BITSTREAM, + .flags = AV_PIX_FMT_FLAG_BITSTREAM, }, [AV_PIX_FMT_MONOBLACK] = { .name = "monob", @@ -248,9 +263,9 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 0, 1, 7, 0 }, /* Y */ + { 0, 1, 0, 7, 1, 0, 0, 1 }, /* Y */ }, - .flags = PIX_FMT_BITSTREAM, + .flags = AV_PIX_FMT_FLAG_BITSTREAM, }, [AV_PIX_FMT_PAL8] = { .name = "pal8", @@ -258,9 +273,9 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 0, 1, 0, 7 }, + { 0, 1, 0, 0, 8, 0, 7, 1 }, }, - .flags = PIX_FMT_PAL, + .flags = AV_PIX_FMT_FLAG_PAL, }, [AV_PIX_FMT_YUVJ420P] = { .name = "yuvj420p", @@ -268,11 +283,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVJ422P] = { .name = "yuvj422p", @@ -280,11 +295,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVJ444P] = { .name = "yuvj444p", @@ -292,29 +307,31 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, +#if FF_API_XVMC [AV_PIX_FMT_XVMC_MPEG2_MC] = { .name = "xvmcmc", - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_XVMC_MPEG2_IDCT] = { .name = "xvmcidct", - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, +#endif /* FF_API_XVMC */ [AV_PIX_FMT_UYVY422] = { .name = "uyvy422", .nb_components = 3, .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 2, 0, 7 }, /* Y */ - { 0, 3, 1, 0, 7 }, /* U */ - { 0, 3, 3, 0, 7 }, /* V */ + { 0, 2, 1, 0, 8, 1, 7, 2 }, /* Y */ + { 0, 4, 0, 0, 8, 3, 7, 1 }, /* U */ + { 0, 4, 2, 0, 8, 3, 7, 3 }, /* V */ }, }, [AV_PIX_FMT_UYYVYY411] = { @@ -323,9 +340,9 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 4, 1, 0, 8, 3, 7, 2 }, /* Y */ + { 0, 6, 0, 0, 8, 5, 7, 1 }, /* U */ + { 0, 6, 3, 0, 8, 5, 7, 4 }, /* V */ }, }, [AV_PIX_FMT_BGR8] = { @@ -334,11 +351,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 3, 0, 2, 1 }, /* R */ + { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */ + { 0, 1, 0, 6, 2, 0, 1, 1 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_BGR4] = { .name = "bgr4", @@ -346,11 +363,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 4, 3, 0, 1, 3, 0, 4 }, /* R */ + { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */ + { 0, 4, 0, 0, 1, 3, 0, 1 }, /* B */ }, - .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR4_BYTE] = { .name = "bgr4_byte", @@ -358,11 +375,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 1, 0, 0, 1 }, /* R */ + { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */ + { 0, 1, 0, 3, 1, 0, 0, 1 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_RGB8] = { .name = "rgb8", @@ -370,11 +387,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 6, 2, 0, 1, 1 }, /* R */ + { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */ + { 0, 1, 0, 0, 3, 0, 2, 1 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_RGB4] = { .name = "rgb4", @@ -382,11 +399,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 4, 0, 0, 1, 3, 0, 1 }, /* R */ + { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */ + { 0, 4, 3, 0, 1, 3, 0, 4 }, /* B */ }, - .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB4_BYTE] = { .name = "rgb4_byte", @@ -394,11 +411,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 3, 1, 0, 0, 1 }, /* R */ + { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */ + { 0, 1, 0, 0, 1, 0, 0, 1 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_PSEUDOPAL, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL, }, [AV_PIX_FMT_NV12] = { .name = "nv12", @@ -406,11 +423,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */ + { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_NV21] = { .name = "nv21", @@ -418,11 +435,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 2, 1, 0, 8, 1, 7, 2 }, /* U */ + { 1, 2, 0, 0, 8, 1, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_ARGB] = { .name = "argb", @@ -430,12 +447,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */ + { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */ + { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */ + { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */ }, - .flags = PIX_FMT_RGB | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_RGBA] = { .name = "rgba", @@ -443,12 +460,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 3, 1, 0, 7 }, /* R */ - { 0, 3, 2, 0, 7 }, /* G */ - { 0, 3, 3, 0, 7 }, /* B */ - { 0, 3, 4, 0, 7 }, /* A */ + { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */ + { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */ + { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */ + { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */ }, - .flags = PIX_FMT_RGB | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_ABGR] = { .name = "abgr", @@ -456,12 +473,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */ + { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */ + { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */ + { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */ }, - .flags = PIX_FMT_RGB | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_BGRA] = { .name = "bgra", @@ -469,12 +486,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */ + { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */ + { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */ + { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */ }, - .flags = PIX_FMT_RGB | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_GRAY16BE] = { .name = "gray16be", @@ -482,9 +499,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ }, - .flags = PIX_FMT_BE, + .flags = AV_PIX_FMT_FLAG_BE, + .alias = "y16be", }, [AV_PIX_FMT_GRAY16LE] = { .name = "gray16le", @@ -492,8 +510,9 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ }, + .alias = "y16le", }, [AV_PIX_FMT_YUV440P] = { .name = "yuv440p", @@ -501,11 +520,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVJ440P] = { .name = "yuvj440p", @@ -513,11 +532,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUVA420P] = { .name = "yuva420p", @@ -525,12 +544,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P] = { .name = "yuva422p", @@ -538,12 +557,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ - { 3, 0, 1, 0, 7 }, /* A */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P] = { .name = "yuva444p", @@ -551,12 +570,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ - { 3, 0, 1, 0, 7 }, /* A */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */ + { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P9BE] = { .name = "yuva420p9be", @@ -564,12 +583,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ - { 3, 1, 1, 0, 8 }, /* A */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P9LE] = { .name = "yuva420p9le", @@ -577,12 +596,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ - { 3, 1, 1, 0, 8 }, /* A */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P9BE] = { .name = "yuva422p9be", @@ -590,12 +609,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ - { 3, 1, 1, 0, 8 }, /* A */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P9LE] = { .name = "yuva422p9le", @@ -603,12 +622,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ - { 3, 1, 1, 0, 8 }, /* A */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P9BE] = { .name = "yuva444p9be", @@ -616,12 +635,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ - { 3, 1, 1, 0, 8 }, /* A */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P9LE] = { .name = "yuva444p9le", @@ -629,12 +648,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ - { 3, 1, 1, 0, 8 }, /* A */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ + { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P10BE] = { .name = "yuva420p10be", @@ -642,12 +661,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ - { 3, 1, 1, 0, 9 }, /* A */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P10LE] = { .name = "yuva420p10le", @@ -655,12 +674,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ - { 3, 1, 1, 0, 9 }, /* A */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P10BE] = { .name = "yuva422p10be", @@ -668,12 +687,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ - { 3, 1, 1, 0, 9 }, /* A */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P10LE] = { .name = "yuva422p10le", @@ -681,12 +700,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ - { 3, 1, 1, 0, 9 }, /* A */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P10BE] = { .name = "yuva444p10be", @@ -694,12 +713,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ - { 3, 1, 1, 0, 9 }, /* A */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P10LE] = { .name = "yuva444p10le", @@ -707,12 +726,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ - { 3, 1, 1, 0, 9 }, /* A */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ + { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P16BE] = { .name = "yuva420p16be", @@ -720,12 +739,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA420P16LE] = { .name = "yuva420p16le", @@ -733,12 +752,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P16BE] = { .name = "yuva422p16be", @@ -746,12 +765,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA422P16LE] = { .name = "yuva422p16le", @@ -759,12 +778,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P16BE] = { .name = "yuva444p16be", @@ -772,12 +791,12 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_YUVA444P16LE] = { .name = "yuva444p16le", @@ -785,60 +804,62 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ + { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA, }, +#if FF_API_VDPAU [AV_PIX_FMT_VDPAU_H264] = { .name = "vdpau_h264", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_MPEG1] = { .name = "vdpau_mpeg1", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_MPEG2] = { .name = "vdpau_mpeg2", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_WMV3] = { .name = "vdpau_wmv3", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_VC1] = { .name = "vdpau_vc1", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDPAU_MPEG4] = { .name = "vdpau_mpeg4", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, +#endif [AV_PIX_FMT_RGB48BE] = { .name = "rgb48be", .nb_components = 3, .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 5, 1, 0, 15 }, /* R */ - { 0, 5, 3, 0, 15 }, /* G */ - { 0, 5, 5, 0, 15 }, /* B */ + { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */ + { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */ + { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */ }, - .flags = PIX_FMT_RGB | PIX_FMT_BE, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE, }, [AV_PIX_FMT_RGB48LE] = { .name = "rgb48le", @@ -846,11 +867,37 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 5, 1, 0, 15 }, /* R */ - { 0, 5, 3, 0, 15 }, /* G */ - { 0, 5, 5, 0, 15 }, /* B */ + { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */ + { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */ + { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */ + }, + .flags = AV_PIX_FMT_FLAG_RGB, + }, + [AV_PIX_FMT_RGBA64BE] = { + .name = "rgba64be", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */ + { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */ + { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */ + { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, + }, + [AV_PIX_FMT_RGBA64LE] = { + .name = "rgba64le", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */ + { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */ + { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */ + { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_RGB565BE] = { .name = "rgb565be", @@ -858,11 +905,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 3, 4 }, /* R */ - { 0, 1, 1, 5, 5 }, /* G */ - { 0, 1, 1, 0, 4 }, /* B */ + { 0, 2, -1, 3, 5, 1, 4, 0 }, /* R */ + { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */ + { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB565LE] = { .name = "rgb565le", @@ -870,11 +917,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 2, 3, 4 }, /* R */ - { 0, 1, 1, 5, 5 }, /* G */ - { 0, 1, 1, 0, 4 }, /* B */ + { 0, 2, 1, 3, 5, 1, 4, 2 }, /* R */ + { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */ + { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB555BE] = { .name = "rgb555be", @@ -882,11 +929,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 2, -1, 2, 5, 1, 4, 0 }, /* R */ + { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */ + { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB555LE] = { .name = "rgb555le", @@ -894,11 +941,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 2, 1, 2, 5, 1, 4, 2 }, /* R */ + { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */ + { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB444BE] = { .name = "rgb444be", @@ -906,11 +953,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 3 }, /* R */ - { 0, 1, 1, 4, 3 }, /* G */ - { 0, 1, 1, 0, 3 }, /* B */ + { 0, 2, -1, 0, 4, 1, 3, 0 }, /* R */ + { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */ + { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_RGB444LE] = { .name = "rgb444le", @@ -918,11 +965,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 2, 0, 3 }, /* R */ - { 0, 1, 1, 4, 3 }, /* G */ - { 0, 1, 1, 0, 3 }, /* B */ + { 0, 2, 1, 0, 4, 1, 3, 2 }, /* R */ + { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */ + { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR48BE] = { .name = "bgr48be", @@ -930,11 +977,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 5, 1, 0, 15 }, /* B */ - { 0, 5, 3, 0, 15 }, /* G */ - { 0, 5, 5, 0, 15 }, /* R */ + { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */ + { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */ + { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR48LE] = { .name = "bgr48le", @@ -942,11 +989,37 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 5, 1, 0, 15 }, /* B */ - { 0, 5, 3, 0, 15 }, /* G */ - { 0, 5, 5, 0, 15 }, /* R */ + { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */ + { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */ + { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */ + }, + .flags = AV_PIX_FMT_FLAG_RGB, + }, + [AV_PIX_FMT_BGRA64BE] = { + .name = "bgra64be", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */ + { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */ + { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */ + { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, + }, + [AV_PIX_FMT_BGRA64LE] = { + .name = "bgra64le", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */ + { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */ + { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */ + { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_BGR565BE] = { .name = "bgr565be", @@ -954,11 +1027,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */ + { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */ + { 0, 2, -1, 3, 5, 1, 4, 0 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR565LE] = { .name = "bgr565le", @@ -966,11 +1039,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */ + { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */ + { 0, 2, 1, 3, 5, 1, 4, 2 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR555BE] = { .name = "bgr555be", @@ -978,11 +1051,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */ + { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */ + { 0, 2, -1, 2, 5, 1, 4, 0 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR555LE] = { .name = "bgr555le", @@ -990,11 +1063,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .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 */ + { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */ + { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */ + { 0, 2, 1, 2, 5, 1, 4, 2 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR444BE] = { .name = "bgr444be", @@ -1002,11 +1075,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 0, 0, 3 }, /* B */ - { 0, 1, 1, 4, 3 }, /* G */ - { 0, 1, 1, 0, 3 }, /* R */ + { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */ + { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */ + { 0, 2, -1, 0, 4, 1, 3, 0 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_BGR444LE] = { .name = "bgr444le", @@ -1014,35 +1087,35 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 2, 0, 3 }, /* B */ - { 0, 1, 1, 4, 3 }, /* G */ - { 0, 1, 1, 0, 3 }, /* R */ + { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */ + { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */ + { 0, 2, 1, 0, 4, 1, 3, 2 }, /* B */ }, - .flags = PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_VAAPI_MOCO] = { .name = "vaapi_moco", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VAAPI_IDCT] = { .name = "vaapi_idct", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VAAPI_VLD] = { .name = "vaapi_vld", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_VDA_VLD] = { .name = "vda_vld", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_YUV420P9LE] = { .name = "yuv420p9le", @@ -1050,11 +1123,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P9BE] = { .name = "yuv420p9be", @@ -1062,11 +1135,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P10LE] = { .name = "yuv420p10le", @@ -1074,11 +1147,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P10BE] = { .name = "yuv420p10be", @@ -1086,11 +1159,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P16LE] = { .name = "yuv420p16le", @@ -1098,11 +1171,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV420P16BE] = { .name = "yuv420p16be", @@ -1110,11 +1183,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P9LE] = { .name = "yuv422p9le", @@ -1122,11 +1195,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P9BE] = { .name = "yuv422p9be", @@ -1134,11 +1207,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P10LE] = { .name = "yuv422p10le", @@ -1146,11 +1219,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P10BE] = { .name = "yuv422p10be", @@ -1158,11 +1231,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P16LE] = { .name = "yuv422p16le", @@ -1170,11 +1243,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV422P16BE] = { .name = "yuv422p16be", @@ -1182,11 +1255,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P16LE] = { .name = "yuv444p16le", @@ -1194,11 +1267,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P16BE] = { .name = "yuv444p16be", @@ -1206,11 +1279,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P10LE] = { .name = "yuv444p10le", @@ -1218,11 +1291,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P10BE] = { .name = "yuv444p10be", @@ -1230,11 +1303,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* Y */ - { 1, 1, 1, 0, 9 }, /* U */ - { 2, 1, 1, 0, 9 }, /* V */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P9LE] = { .name = "yuv444p9le", @@ -1242,11 +1315,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ }, - .flags = PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_PLANAR, }, [AV_PIX_FMT_YUV444P9BE] = { .name = "yuv444p9be", @@ -1254,26 +1327,51 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* Y */ - { 1, 1, 1, 0, 8 }, /* U */ - { 2, 1, 1, 0, 8 }, /* V */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR, + }, + [AV_PIX_FMT_D3D11VA_VLD] = { + .name = "d3d11va_vld", + .log2_chroma_w = 1, + .log2_chroma_h = 1, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_DXVA2_VLD] = { .name = "dxva2_vld", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, - [AV_PIX_FMT_Y400A] = { - .name = "y400a", + [AV_PIX_FMT_YA8] = { + .name = "ya8", .nb_components = 2, .comp = { - { 0, 1, 1, 0, 7 }, /* Y */ - { 0, 1, 2, 0, 7 }, /* A */ + { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */ + { 0, 2, 1, 0, 8, 1, 7, 2 }, /* A */ }, - .flags = PIX_FMT_ALPHA, + .flags = AV_PIX_FMT_FLAG_ALPHA, + .alias = "gray8a", + }, + [AV_PIX_FMT_YA16LE] = { + .name = "ya16le", + .nb_components = 2, + .comp = { + { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */ + { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_ALPHA, + }, + [AV_PIX_FMT_YA16BE] = { + .name = "ya16be", + .nb_components = 2, + .comp = { + { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */ + { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_GBRP] = { .name = "gbrp", @@ -1281,11 +1379,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 0, 1, 0, 7 }, /* G */ - { 1, 0, 1, 0, 7 }, /* B */ - { 2, 0, 1, 0, 7 }, /* R */ + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP9LE] = { .name = "gbrp9le", @@ -1293,11 +1391,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* G */ - { 1, 1, 1, 0, 8 }, /* B */ - { 2, 1, 1, 0, 8 }, /* R */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP9BE] = { .name = "gbrp9be", @@ -1305,11 +1403,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 8 }, /* G */ - { 1, 1, 1, 0, 8 }, /* B */ - { 2, 1, 1, 0, 8 }, /* R */ + { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */ + { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */ + { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP10LE] = { .name = "gbrp10le", @@ -1317,11 +1415,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* G */ - { 1, 1, 1, 0, 9 }, /* B */ - { 2, 1, 1, 0, 9 }, /* R */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP10BE] = { .name = "gbrp10be", @@ -1329,11 +1427,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 9 }, /* G */ - { 1, 1, 1, 0, 9 }, /* B */ - { 2, 1, 1, 0, 9 }, /* R */ + { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */ + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */ + { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP16LE] = { .name = "gbrp16le", @@ -1341,11 +1439,11 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* G */ - { 1, 1, 1, 0, 15 }, /* B */ - { 2, 1, 1, 0, 15 }, /* R */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */ }, - .flags = PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, }, [AV_PIX_FMT_GBRP16BE] = { .name = "gbrp16be", @@ -1353,17 +1451,59 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* G */ - { 1, 1, 1, 0, 15 }, /* B */ - { 2, 1, 1, 0, 15 }, /* R */ + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */ + }, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB, + }, + [AV_PIX_FMT_GBRAP] = { + .name = "gbrap", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */ + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */ + { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */ + { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */ }, - .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | + AV_PIX_FMT_FLAG_ALPHA, + }, + [AV_PIX_FMT_GBRAP16LE] = { + .name = "gbrap16le", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */ + { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB | + AV_PIX_FMT_FLAG_ALPHA, + }, + [AV_PIX_FMT_GBRAP16BE] = { + .name = "gbrap16be", + .nb_components = 4, + .log2_chroma_w = 0, + .log2_chroma_h = 0, + .comp = { + { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */ + { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */ + { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */ + { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */ + }, + .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | + AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA, }, [AV_PIX_FMT_VDPAU] = { .name = "vdpau", .log2_chroma_w = 1, .log2_chroma_h = 1, - .flags = PIX_FMT_HWACCEL, + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, [AV_PIX_FMT_XYZ12LE] = { .name = "xyz12le", @@ -1371,9 +1511,9 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 5, 1, 4, 11 }, /* X */ - { 0, 5, 3, 4, 11 }, /* Y */ - { 0, 5, 5, 4, 11 }, /* Z */ + { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */ + { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */ + { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */ }, /*.flags = -- not used*/ }, @@ -1383,21 +1523,102 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 5, 1, 4, 11 }, /* X */ - { 0, 5, 3, 4, 11 }, /* Y */ - { 0, 5, 5, 4, 11 }, /* Z */ + { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */ + { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */ + { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */ }, - .flags = PIX_FMT_BE, + .flags = AV_PIX_FMT_FLAG_BE, + }, + [AV_PIX_FMT_NV16] = { + .name = "nv16", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */ + { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */ + { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR, + }, + [AV_PIX_FMT_NV20LE] = { + .name = "nv20le", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */ + { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR, + }, + [AV_PIX_FMT_NV20BE] = { + .name = "nv20be", + .nb_components = 3, + .log2_chroma_w = 1, + .log2_chroma_h = 0, + .comp = { + { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */ + { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */ + { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */ + }, + .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE, + }, + [AV_PIX_FMT_VDA] = { + .name = "vda", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, + [AV_PIX_FMT_QSV] = { + .name = "qsv", + .flags = AV_PIX_FMT_FLAG_HWACCEL, + }, + [AV_PIX_FMT_MMAL] = { + .name = "mmal", + .flags = AV_PIX_FMT_FLAG_HWACCEL, }, }; +#if FF_API_PLUS1_MINUS1 +FF_ENABLE_DEPRECATION_WARNINGS +#endif +static const char *color_range_names[AVCOL_RANGE_NB] = { + "unknown", "tv", "pc", +}; + +static const char *color_primaries_names[AVCOL_PRI_NB] = { + "reserved", "bt709", "unknown", "reserved", "bt470m", + "bt470bg", "smpte170m", "smpte240m", "film", "bt2020", + "smptest428-1", +}; + +static const char *color_transfer_names[AVCOL_TRC_NB] = { + "reserved", "bt709", "unknown", "reserved", "bt470m", + "bt470bg", "smpte170m", "smpte240m", "linear", "log100", + "log316", "iec61966-2-4", "bt1361e", "iec61966-2-1", + "bt2020-10", "bt2020-20", "smptest2084", "smptest428-1", +}; + +static const char *color_space_names[AVCOL_SPC_NB] = { + "gbr", "bt709", "unknown", "reserved", "fcc", + "bt470bg", "smpte170m", "smpte240m", "ycgco", + "bt2020nc", "bt2020c", +}; + +static const char *chroma_location_names[AVCHROMA_LOC_NB] = { + "unspecified", "left", "center", "topleft", + "top", "bottomleft", "bottom", +}; + +FF_DISABLE_DEPRECATION_WARNINGS static enum AVPixelFormat get_pix_fmt_internal(const char *name) { enum AVPixelFormat pix_fmt; for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) if (av_pix_fmt_descriptors[pix_fmt].name && - !strcmp(av_pix_fmt_descriptors[pix_fmt].name, name)) + (!strcmp(av_pix_fmt_descriptors[pix_fmt].name, name) || + av_match_name(name, av_pix_fmt_descriptors[pix_fmt].alias))) return pix_fmt; return AV_PIX_FMT_NONE; @@ -1441,13 +1662,14 @@ int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc) 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; + bits += pixdesc->comp[c].depth << s; } return bits >> log2_pixels; } -char *av_get_pix_fmt_string (char *buf, int buf_size, enum AVPixelFormat pix_fmt) +char *av_get_pix_fmt_string(char *buf, int buf_size, + enum AVPixelFormat pix_fmt) { /* print header */ if (pix_fmt < 0) { @@ -1485,6 +1707,7 @@ enum AVPixelFormat av_pix_fmt_desc_get_id(const AVPixFmtDescriptor *desc) return desc - av_pix_fmt_descriptors; } +FF_ENABLE_DEPRECATION_WARNINGS int av_pix_fmt_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) @@ -1512,3 +1735,86 @@ int av_pix_fmt_count_planes(enum AVPixelFormat pix_fmt) ret += planes[i]; return ret; } + + +enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt) +{ +#define PIX_FMT_SWAP_ENDIANNESS(fmt) \ + case AV_PIX_FMT_ ## fmt ## BE: return AV_PIX_FMT_ ## fmt ## LE; \ + case AV_PIX_FMT_ ## fmt ## LE: return AV_PIX_FMT_ ## fmt ## BE + + switch (pix_fmt) { + PIX_FMT_SWAP_ENDIANNESS(GRAY16); + PIX_FMT_SWAP_ENDIANNESS(YA16); + PIX_FMT_SWAP_ENDIANNESS(RGB48); + PIX_FMT_SWAP_ENDIANNESS(RGB565); + PIX_FMT_SWAP_ENDIANNESS(RGB555); + PIX_FMT_SWAP_ENDIANNESS(RGB444); + PIX_FMT_SWAP_ENDIANNESS(BGR48); + PIX_FMT_SWAP_ENDIANNESS(BGR565); + PIX_FMT_SWAP_ENDIANNESS(BGR555); + PIX_FMT_SWAP_ENDIANNESS(BGR444); + + PIX_FMT_SWAP_ENDIANNESS(YUV420P9); + PIX_FMT_SWAP_ENDIANNESS(YUV422P9); + PIX_FMT_SWAP_ENDIANNESS(YUV444P9); + PIX_FMT_SWAP_ENDIANNESS(YUV420P10); + PIX_FMT_SWAP_ENDIANNESS(YUV422P10); + PIX_FMT_SWAP_ENDIANNESS(YUV444P10); + PIX_FMT_SWAP_ENDIANNESS(YUV420P16); + PIX_FMT_SWAP_ENDIANNESS(YUV422P16); + PIX_FMT_SWAP_ENDIANNESS(YUV444P16); + + PIX_FMT_SWAP_ENDIANNESS(GBRP9); + PIX_FMT_SWAP_ENDIANNESS(GBRP10); + PIX_FMT_SWAP_ENDIANNESS(GBRP16); + PIX_FMT_SWAP_ENDIANNESS(YUVA420P9); + PIX_FMT_SWAP_ENDIANNESS(YUVA422P9); + PIX_FMT_SWAP_ENDIANNESS(YUVA444P9); + PIX_FMT_SWAP_ENDIANNESS(YUVA420P10); + PIX_FMT_SWAP_ENDIANNESS(YUVA422P10); + PIX_FMT_SWAP_ENDIANNESS(YUVA444P10); + PIX_FMT_SWAP_ENDIANNESS(YUVA420P16); + PIX_FMT_SWAP_ENDIANNESS(YUVA422P16); + PIX_FMT_SWAP_ENDIANNESS(YUVA444P16); + + PIX_FMT_SWAP_ENDIANNESS(XYZ12); + PIX_FMT_SWAP_ENDIANNESS(NV20); + PIX_FMT_SWAP_ENDIANNESS(RGBA64); + PIX_FMT_SWAP_ENDIANNESS(BGRA64); + default: + return AV_PIX_FMT_NONE; + } +#undef PIX_FMT_SWAP_ENDIANNESS +} + +const char *av_color_range_name(enum AVColorRange range) +{ + return (unsigned) range < AVCOL_RANGE_NB ? + color_range_names[range] : NULL; +} + +const char *av_color_primaries_name(enum AVColorPrimaries primaries) +{ + return (unsigned) primaries < AVCOL_PRI_NB ? + color_primaries_names[primaries] : NULL; +} + +const char *av_color_transfer_name(enum AVColorTransferCharacteristic transfer) +{ + return (unsigned) transfer < AVCOL_TRC_NB ? + color_transfer_names[transfer] : NULL; +} + +const char *av_color_space_name(enum AVColorSpace space) +{ + return (unsigned) space < AVCOL_SPC_NB ? + color_space_names[space] : NULL; +} + +const char *av_chroma_location_name(enum AVChromaLocation location) +{ + return (unsigned) location < AVCHROMA_LOC_NB ? + chroma_location_names[location] : NULL; +} +