Skip to content

F
ffmpeg.wasm-core
Commit 4a59eca9 authored by Tsvetelina Borisova's avatar Tsvetelina Borisova Committed by Ronald S. Bultje
Browse files
Options

Cleaned pixdesc.c file in libavutil 

Signed-off-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
parent 8f8c785f
Show whitespace changes
Inline Side-by-side
Showing with 484 additions and 483 deletions
libavutil/pixdesc.c
View file @ 4a59eca9
...@@ -27,45 +27,46 @@ ...@@ -27,45 +27,46 @@
#include "intreadwrite.h" #include "intreadwrite.h"
void av_read_image_line(uint16_t *dst, const uint8_t *data[4], const int linesize[4], void av_read_image_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) const AVPixFmtDescriptor *desc, int x, int y, int c, int w,
int read_pal_component)
{ {
AVComponentDescriptor comp= desc->comp[c]; AVComponentDescriptor comp = desc->comp[c];
int plane= comp.plane; int plane = comp.plane;
int depth= comp.depth_minus1+1; int depth = comp.depth_minus1 + 1;
int mask = (1<<depth)-1; int mask = (1 << depth) - 1;
int shift= comp.shift; int shift = comp.shift;
int step = comp.step_minus1+1; int step = comp.step_minus1 + 1;
int flags= desc->flags; int flags = desc->flags;
if (flags & PIX_FMT_BITSTREAM){ if (flags & PIX_FMT_BITSTREAM) {
int skip = x*step + comp.offset_plus1-1; int skip = x * step + comp.offset_plus1 - 1;
const uint8_t *p = data[plane] + y*linesize[plane] + (skip>>3); const uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);
int shift = 8 - depth - (skip&7); int shift = 8 - depth - (skip & 7);
while(w--){ while (w--) {
int val = (*p >> shift) & mask; int val = (*p >> shift) & mask;
if(read_pal_component) if (read_pal_component)
val= data[1][4*val + c]; val = data[1][4*val + c];
shift -= step; shift -= step;
p -= shift>>3; p -= shift >> 3;
shift &= 7; shift &= 7;
*dst++= val; *dst++ = val;
} }
} else { } else {
const uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1; const uint8_t *p = data[plane] + y * linesize[plane] + x * step + comp.offset_plus1 - 1;
int is_8bit = shift + depth <= 8; int is_8bit = shift + depth <= 8;
if (is_8bit) if (is_8bit)
p += !!(flags & PIX_FMT_BE); p += !!(flags & PIX_FMT_BE);
while(w--){ while (w--) {
int val = is_8bit ? *p : int val = is_8bit ? *p :
flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p); flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
val = (val>>shift) & mask; val = (val >> shift) & mask;
if(read_pal_component) if (read_pal_component)
val= data[1][4*val + c]; val = data[1][4 * val + c];
p+= step; p += step;
*dst++= val; *dst++ = val;
} }
} }
} }
...@@ -75,41 +76,41 @@ void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesi ...@@ -75,41 +76,41 @@ void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesi
{ {
AVComponentDescriptor comp = desc->comp[c]; AVComponentDescriptor comp = desc->comp[c];
int plane = comp.plane; int plane = comp.plane;
int depth = comp.depth_minus1+1; int depth = comp.depth_minus1 + 1;
int step = comp.step_minus1+1; int step = comp.step_minus1 + 1;
int flags = desc->flags; int flags = desc->flags;
if (flags & PIX_FMT_BITSTREAM) { if (flags & PIX_FMT_BITSTREAM) {
int skip = x*step + comp.offset_plus1-1; int skip = x * step + comp.offset_plus1 - 1;
uint8_t *p = data[plane] + y*linesize[plane] + (skip>>3); uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);
int shift = 8 - depth - (skip&7); int shift = 8 - depth - (skip & 7);
while (w--) { while (w--) {
*p |= *src++ << shift; *p |= *src++ << shift;
shift -= step; shift -= step;
p -= shift>>3; p -= shift >> 3;
shift &= 7; shift &= 7;
} }
} else { } else {
int shift = comp.shift; int shift = comp.shift;
uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1; uint8_t *p = data[plane] + y * linesize[plane] + x * step + comp.offset_plus1 - 1;
if (shift + depth <= 8) { if (shift + depth <= 8) {
p += !!(flags & PIX_FMT_BE); p += !!(flags & PIX_FMT_BE);
while (w--) { while (w--) {
*p |= (*src++<<shift); *p |= (*src++ << shift);
p += step; p += step;
} }
} else { } else {
while (w--) { while (w--) {
if (flags & PIX_FMT_BE) { if (flags & PIX_FMT_BE) {
uint16_t val = AV_RB16(p) | (*src++<<shift); uint16_t val = AV_RB16(p) | (*src++ << shift);
AV_WB16(p, val); AV_WB16(p, val);
} else { } else {
uint16_t val = AV_RL16(p) | (*src++<<shift); uint16_t val = AV_RL16(p) | (*src++ << shift);
AV_WL16(p, val); AV_WL16(p, val);
} }
p+= step; p += step;
} }
} }
} }
...@@ -118,171 +119,171 @@ void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesi ...@@ -118,171 +119,171 @@ void av_write_image_line(const uint16_t *src, uint8_t *data[4], const int linesi
const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
[PIX_FMT_YUV420P] = { [PIX_FMT_YUV420P] = {
.name = "yuv420p", .name = "yuv420p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUYV422] = { [PIX_FMT_YUYV422] = {
.name = "yuyv422", .name = "yuyv422",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,7}, /* Y */ { 0, 1, 1, 0, 7 }, /* Y */
{0,3,2,0,7}, /* U */ { 0, 3, 2, 0, 7 }, /* U */
{0,3,4,0,7}, /* V */ { 0, 3, 4, 0, 7 }, /* V */
}, },
}, },
[PIX_FMT_RGB24] = { [PIX_FMT_RGB24] = {
.name = "rgb24", .name = "rgb24",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,2,1,0,7}, /* R */ { 0, 2, 1, 0, 7 }, /* R */
{0,2,2,0,7}, /* G */ { 0, 2, 2, 0, 7 }, /* G */
{0,2,3,0,7}, /* B */ { 0, 2, 3, 0, 7 }, /* B */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_BGR24] = { [PIX_FMT_BGR24] = {
.name = "bgr24", .name = "bgr24",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,2,1,0,7}, /* B */ { 0, 2, 1, 0, 7 }, /* B */
{0,2,2,0,7}, /* G */ { 0, 2, 2, 0, 7 }, /* G */
{0,2,3,0,7}, /* R */ { 0, 2, 3, 0, 7 }, /* R */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_YUV422P] = { [PIX_FMT_YUV422P] = {
.name = "yuv422p", .name = "yuv422p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV444P] = { [PIX_FMT_YUV444P] = {
.name = "yuv444p", .name = "yuv444p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV410P] = { [PIX_FMT_YUV410P] = {
.name = "yuv410p", .name = "yuv410p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 2, .log2_chroma_w = 2,
.log2_chroma_h= 2, .log2_chroma_h = 2,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV411P] = { [PIX_FMT_YUV411P] = {
.name = "yuv411p", .name = "yuv411p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 2, .log2_chroma_w = 2,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_GRAY8] = { [PIX_FMT_GRAY8] = {
.name = "gray", .name = "gray",
.nb_components= 1, .nb_components = 1,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
}, },
}, },
[PIX_FMT_MONOWHITE] = { [PIX_FMT_MONOWHITE] = {
.name = "monow", .name = "monow",
.nb_components= 1, .nb_components = 1,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,0}, /* Y */ { 0, 0, 1, 0, 0 }, /* Y */
}, },
.flags = PIX_FMT_BITSTREAM, .flags = PIX_FMT_BITSTREAM,
}, },
[PIX_FMT_MONOBLACK] = { [PIX_FMT_MONOBLACK] = {
.name = "monob", .name = "monob",
.nb_components= 1, .nb_components = 1,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,7,0}, /* Y */ { 0, 0, 1, 7, 0 }, /* Y */
}, },
.flags = PIX_FMT_BITSTREAM, .flags = PIX_FMT_BITSTREAM,
}, },
[PIX_FMT_PAL8] = { [PIX_FMT_PAL8] = {
.name = "pal8", .name = "pal8",
.nb_components= 1, .nb_components = 1,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,7}, { 0, 0, 1, 0, 7 },
}, },
.flags = PIX_FMT_PAL, .flags = PIX_FMT_PAL,
}, },
[PIX_FMT_YUVJ420P] = { [PIX_FMT_YUVJ420P] = {
.name = "yuvj420p", .name = "yuvj420p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUVJ422P] = { [PIX_FMT_YUVJ422P] = {
.name = "yuvj422p", .name = "yuvj422p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUVJ444P] = { [PIX_FMT_YUVJ444P] = {
.name = "yuvj444p", .name = "yuvj444p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ {0, 0, 1, 0, 7}, /* Y */
{1,0,1,0,7}, /* U */ {1, 0, 1, 0, 7}, /* U */
{2,0,1,0,7}, /* V */ {2, 0, 1, 0, 7}, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
...@@ -296,227 +297,227 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -296,227 +297,227 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
}, },
[PIX_FMT_UYVY422] = { [PIX_FMT_UYVY422] = {
.name = "uyvy422", .name = "uyvy422",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,2,0,7}, /* Y */ { 0, 1, 2, 0, 7 }, /* Y */
{0,3,1,0,7}, /* U */ { 0, 3, 1, 0, 7 }, /* U */
{0,3,3,0,7}, /* V */ { 0, 3, 3, 0, 7 }, /* V */
}, },
}, },
[PIX_FMT_UYYVYY411] = { [PIX_FMT_UYYVYY411] = {
.name = "uyyvyy411", .name = "uyyvyy411",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 2, .log2_chroma_w = 2,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,3,2,0,7}, /* Y */ { 0, 3, 2, 0, 7 }, /* Y */
{0,5,1,0,7}, /* U */ { 0, 5, 1, 0, 7 }, /* U */
{0,5,4,0,7}, /* V */ { 0, 5, 4, 0, 7 }, /* V */
}, },
}, },
[PIX_FMT_BGR8] = { [PIX_FMT_BGR8] = {
.name = "bgr8", .name = "bgr8",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,6,1}, /* B */ { 0, 0, 1, 6, 1 }, /* B */
{0,0,1,3,2}, /* G */ { 0, 0, 1, 3, 2 }, /* G */
{0,0,1,0,2}, /* R */ { 0, 0, 1, 0, 2 }, /* R */
}, },
.flags = PIX_FMT_PAL | PIX_FMT_RGB, .flags = PIX_FMT_PAL | PIX_FMT_RGB,
}, },
[PIX_FMT_BGR4] = { [PIX_FMT_BGR4] = {
.name = "bgr4", .name = "bgr4",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,3,1,0,0}, /* B */ { 0, 3, 1, 0, 0 }, /* B */
{0,3,2,0,1}, /* G */ { 0, 3, 2, 0, 1 }, /* G */
{0,3,4,0,0}, /* R */ { 0, 3, 4, 0, 0 }, /* R */
}, },
.flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB, .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB,
}, },
[PIX_FMT_BGR4_BYTE] = { [PIX_FMT_BGR4_BYTE] = {
.name = "bgr4_byte", .name = "bgr4_byte",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,3,0}, /* B */ { 0, 0, 1, 3, 0 }, /* B */
{0,0,1,1,1}, /* G */ { 0, 0, 1, 1, 1 }, /* G */
{0,0,1,0,0}, /* R */ { 0, 0, 1, 0, 0 }, /* R */
}, },
.flags = PIX_FMT_PAL | PIX_FMT_RGB, .flags = PIX_FMT_PAL | PIX_FMT_RGB,
}, },
[PIX_FMT_RGB8] = { [PIX_FMT_RGB8] = {
.name = "rgb8", .name = "rgb8",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,6,1}, /* R */ { 0, 0, 1, 6, 1 }, /* R */
{0,0,1,3,2}, /* G */ { 0, 0, 1, 3, 2 }, /* G */
{0,0,1,0,2}, /* B */ { 0, 0, 1, 0, 2 }, /* B */
}, },
.flags = PIX_FMT_PAL | PIX_FMT_RGB, .flags = PIX_FMT_PAL | PIX_FMT_RGB,
}, },
[PIX_FMT_RGB4] = { [PIX_FMT_RGB4] = {
.name = "rgb4", .name = "rgb4",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,3,1,0,0}, /* R */ { 0, 3, 1, 0, 0 }, /* R */
{0,3,2,0,1}, /* G */ { 0, 3, 2, 0, 1 }, /* G */
{0,3,4,0,0}, /* B */ { 0, 3, 4, 0, 0 }, /* B */
}, },
.flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB, .flags = PIX_FMT_BITSTREAM | PIX_FMT_RGB,
}, },
[PIX_FMT_RGB4_BYTE] = { [PIX_FMT_RGB4_BYTE] = {
.name = "rgb4_byte", .name = "rgb4_byte",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,3,0}, /* R */ { 0, 0, 1, 3, 0 }, /* R */
{0,0,1,1,1}, /* G */ { 0, 0, 1, 1, 1 }, /* G */
{0,0,1,0,0}, /* B */ { 0, 0, 1, 0, 0 }, /* B */
}, },
.flags = PIX_FMT_PAL | PIX_FMT_RGB, .flags = PIX_FMT_PAL | PIX_FMT_RGB,
}, },
[PIX_FMT_NV12] = { [PIX_FMT_NV12] = {
.name = "nv12", .name = "nv12",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0,0,1,0,7 }, /* Y */
{1,1,1,0,7}, /* U */ { 1,1,1,0,7 }, /* U */
{1,1,2,0,7}, /* V */ { 1,1,2,0,7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_NV21] = { [PIX_FMT_NV21] = {
.name = "nv21", .name = "nv21",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,1,1,0,7}, /* V */ { 1, 1, 1, 0, 7 }, /* V */
{1,1,2,0,7}, /* U */ { 1, 1, 2, 0, 7 }, /* U */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_ARGB] = { [PIX_FMT_ARGB] = {
.name = "argb", .name = "argb",
.nb_components= 4, .nb_components = 4,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,3,1,0,7}, /* A */ { 0, 3, 1, 0, 7 }, /* A */
{0,3,2,0,7}, /* R */ { 0, 3, 2, 0, 7 }, /* R */
{0,3,3,0,7}, /* G */ { 0, 3, 3, 0, 7 }, /* G */
{0,3,4,0,7}, /* B */ { 0, 3, 4, 0, 7 }, /* B */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_RGBA] = { [PIX_FMT_RGBA] = {
.name = "rgba", .name = "rgba",
.nb_components= 4, .nb_components = 4,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,3,1,0,7}, /* R */ { 0, 3, 1, 0, 7 }, /* R */
{0,3,2,0,7}, /* G */ { 0, 3, 2, 0, 7 }, /* G */
{0,3,3,0,7}, /* B */ { 0, 3, 3, 0, 7 }, /* B */
{0,3,4,0,7}, /* A */ { 0, 3, 4, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_ABGR] = { [PIX_FMT_ABGR] = {
.name = "abgr", .name = "abgr",
.nb_components= 4, .nb_components = 4,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,3,1,0,7}, /* A */ { 0, 3, 1, 0, 7 }, /* A */
{0,3,2,0,7}, /* B */ { 0, 3, 2, 0, 7 }, /* B */
{0,3,3,0,7}, /* G */ { 0, 3, 3, 0, 7 }, /* G */
{0,3,4,0,7}, /* R */ { 0, 3, 4, 0, 7 }, /* R */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_BGRA] = { [PIX_FMT_BGRA] = {
.name = "bgra", .name = "bgra",
.nb_components= 4, .nb_components = 4,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,3,1,0,7}, /* B */ { 0, 3, 1, 0, 7 }, /* B */
{0,3,2,0,7}, /* G */ { 0, 3, 2, 0, 7 }, /* G */
{0,3,3,0,7}, /* R */ { 0, 3, 3, 0, 7 }, /* R */
{0,3,4,0,7}, /* A */ { 0, 3, 4, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_GRAY16BE] = { [PIX_FMT_GRAY16BE] = {
.name = "gray16be", .name = "gray16be",
.nb_components= 1, .nb_components = 1,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,15}, /* Y */ { 0, 1, 1, 0, 15 }, /* Y */
}, },
.flags = PIX_FMT_BE, .flags = PIX_FMT_BE,
}, },
[PIX_FMT_GRAY16LE] = { [PIX_FMT_GRAY16LE] = {
.name = "gray16le", .name = "gray16le",
.nb_components= 1, .nb_components = 1,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,15}, /* Y */ { 0, 1, 1, 0, 15 }, /* Y */
}, },
}, },
[PIX_FMT_YUV440P] = { [PIX_FMT_YUV440P] = {
.name = "yuv440p", .name = "yuv440p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUVJ440P] = { [PIX_FMT_YUVJ440P] = {
.name = "yuvj440p", .name = "yuvj440p",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUVA420P] = { [PIX_FMT_YUVA420P] = {
.name = "yuva420p", .name = "yuva420p",
.nb_components= 4, .nb_components = 4,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,0,1,0,7}, /* Y */ { 0, 0, 1, 0, 7 }, /* Y */
{1,0,1,0,7}, /* U */ { 1, 0, 1, 0, 7 }, /* U */
{2,0,1,0,7}, /* V */ { 2, 0, 1, 0, 7 }, /* V */
{3,0,1,0,7}, /* A */ { 3, 0, 1, 0, 7 }, /* A */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
...@@ -558,193 +559,193 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -558,193 +559,193 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
}, },
[PIX_FMT_RGB48BE] = { [PIX_FMT_RGB48BE] = {
.name = "rgb48be", .name = "rgb48be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,5,1,0,15}, /* R */ { 0, 5, 1, 0, 15 }, /* R */
{0,5,3,0,15}, /* G */ { 0, 5, 3, 0, 15 }, /* G */
{0,5,5,0,15}, /* B */ { 0, 5, 5, 0, 15 }, /* B */
}, },
.flags = PIX_FMT_RGB | PIX_FMT_BE, .flags = PIX_FMT_RGB | PIX_FMT_BE,
}, },
[PIX_FMT_RGB48LE] = { [PIX_FMT_RGB48LE] = {
.name = "rgb48le", .name = "rgb48le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,5,1,0,15}, /* R */ { 0, 5, 1, 0, 15 }, /* R */
{0,5,3,0,15}, /* G */ { 0, 5, 3, 0, 15 }, /* G */
{0,5,5,0,15}, /* B */ { 0, 5, 5, 0, 15 }, /* B */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_RGB565BE] = { [PIX_FMT_RGB565BE] = {
.name = "rgb565be", .name = "rgb565be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,0,3,4}, /* R */ { 0, 1, 0, 3, 4 }, /* R */
{0,1,1,5,5}, /* G */ { 0, 1, 1, 5, 5 }, /* G */
{0,1,1,0,4}, /* B */ { 0, 1, 1, 0, 4 }, /* B */
}, },
.flags = PIX_FMT_BE | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_RGB,
}, },
[PIX_FMT_RGB565LE] = { [PIX_FMT_RGB565LE] = {
.name = "rgb565le", .name = "rgb565le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,2,3,4}, /* R */ { 0, 1, 2, 3, 4 }, /* R */
{0,1,1,5,5}, /* G */ { 0, 1, 1, 5, 5 }, /* G */
{0,1,1,0,4}, /* B */ { 0, 1, 1, 0, 4 }, /* B */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_RGB555BE] = { [PIX_FMT_RGB555BE] = {
.name = "rgb555be", .name = "rgb555be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,0,2,4}, /* R */ { 0, 1, 0, 2, 4 }, /* R */
{0,1,1,5,4}, /* G */ { 0, 1, 1, 5, 4 }, /* G */
{0,1,1,0,4}, /* B */ { 0, 1, 1, 0, 4 }, /* B */
}, },
.flags = PIX_FMT_BE | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_RGB,
}, },
[PIX_FMT_RGB555LE] = { [PIX_FMT_RGB555LE] = {
.name = "rgb555le", .name = "rgb555le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,2,2,4}, /* R */ { 0, 1, 2, 2, 4 }, /* R */
{0,1,1,5,4}, /* G */ { 0, 1, 1, 5, 4 }, /* G */
{0,1,1,0,4}, /* B */ { 0, 1, 1, 0, 4 }, /* B */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_RGB444BE] = { [PIX_FMT_RGB444BE] = {
.name = "rgb444be", .name = "rgb444be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,0,0,3}, /* R */ { 0, 1, 0, 0, 3 }, /* R */
{0,1,1,4,3}, /* G */ { 0, 1, 1, 4, 3 }, /* G */
{0,1,1,0,3}, /* B */ { 0, 1, 1, 0, 3 }, /* B */
}, },
.flags = PIX_FMT_BE | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_RGB,
}, },
[PIX_FMT_RGB444LE] = { [PIX_FMT_RGB444LE] = {
.name = "rgb444le", .name = "rgb444le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,2,0,3}, /* R */ { 0, 1, 2, 0, 3 }, /* R */
{0,1,1,4,3}, /* G */ { 0, 1, 1, 4, 3 }, /* G */
{0,1,1,0,3}, /* B */ { 0, 1, 1, 0, 3 }, /* B */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_BGR48BE] = { [PIX_FMT_BGR48BE] = {
.name = "bgr48be", .name = "bgr48be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,5,1,0,15}, /* B */ { 0, 5, 1, 0, 15 }, /* B */
{0,5,3,0,15}, /* G */ { 0, 5, 3, 0, 15 }, /* G */
{0,5,5,0,15}, /* R */ { 0, 5, 5, 0, 15 }, /* R */
}, },
.flags = PIX_FMT_BE | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_RGB,
}, },
[PIX_FMT_BGR48LE] = { [PIX_FMT_BGR48LE] = {
.name = "bgr48le", .name = "bgr48le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,5,1,0,15}, /* B */ { 0, 5, 1, 0, 15 }, /* B */
{0,5,3,0,15}, /* G */ { 0, 5, 3, 0, 15 }, /* G */
{0,5,5,0,15}, /* R */ { 0, 5, 5, 0, 15 }, /* R */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_BGR565BE] = { [PIX_FMT_BGR565BE] = {
.name = "bgr565be", .name = "bgr565be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,0,3,4}, /* B */ { 0, 1, 0, 3, 4 }, /* B */
{0,1,1,5,5}, /* G */ { 0, 1, 1, 5, 5 }, /* G */
{0,1,1,0,4}, /* R */ { 0, 1, 1, 0, 4 }, /* R */
}, },
.flags = PIX_FMT_BE | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_RGB,
}, },
[PIX_FMT_BGR565LE] = { [PIX_FMT_BGR565LE] = {
.name = "bgr565le", .name = "bgr565le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,2,3,4}, /* B */ { 0, 1, 2, 3, 4 }, /* B */
{0,1,1,5,5}, /* G */ { 0, 1, 1, 5, 5 }, /* G */
{0,1,1,0,4}, /* R */ { 0, 1, 1, 0, 4 }, /* R */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_BGR555BE] = { [PIX_FMT_BGR555BE] = {
.name = "bgr555be", .name = "bgr555be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,0,2,4}, /* B */ { 0, 1, 0, 2, 4 }, /* B */
{0,1,1,5,4}, /* G */ { 0, 1, 1, 5, 4 }, /* G */
{0,1,1,0,4}, /* R */ { 0, 1, 1, 0, 4 }, /* R */
}, },
.flags = PIX_FMT_BE | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_RGB,
}, },
[PIX_FMT_BGR555LE] = { [PIX_FMT_BGR555LE] = {
.name = "bgr555le", .name = "bgr555le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,2,2,4}, /* B */ { 0, 1, 2, 2, 4 }, /* B */
{0,1,1,5,4}, /* G */ { 0, 1, 1, 5, 4 }, /* G */
{0,1,1,0,4}, /* R */ { 0, 1, 1, 0, 4 }, /* R */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
[PIX_FMT_BGR444BE] = { [PIX_FMT_BGR444BE] = {
.name = "bgr444be", .name = "bgr444be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,0,0,3}, /* B */ { 0, 1, 0, 0, 3 }, /* B */
{0,1,1,4,3}, /* G */ { 0, 1, 1, 4, 3 }, /* G */
{0,1,1,0,3}, /* R */ { 0, 1, 1, 0, 3 }, /* R */
}, },
.flags = PIX_FMT_BE | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_RGB,
}, },
[PIX_FMT_BGR444LE] = { [PIX_FMT_BGR444LE] = {
.name = "bgr444le", .name = "bgr444le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,2,0,3}, /* B */ { 0, 1, 2, 0, 3 }, /* B */
{0,1,1,4,3}, /* G */ { 0, 1, 1, 4, 3 }, /* G */
{0,1,1,0,3}, /* R */ { 0, 1, 1, 0, 3 }, /* R */
}, },
.flags = PIX_FMT_RGB, .flags = PIX_FMT_RGB,
}, },
...@@ -774,93 +775,93 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -774,93 +775,93 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
}, },
[PIX_FMT_YUV420P9LE] = { [PIX_FMT_YUV420P9LE] = {
.name = "yuv420p9le", .name = "yuv420p9le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,1,1,0,8}, /* Y */ { 0, 1, 1, 0, 8 }, /* Y */
{1,1,1,0,8}, /* U */ { 1, 1, 1, 0, 8 }, /* U */
{2,1,1,0,8}, /* V */ { 2, 1, 1, 0, 8 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV420P9BE] = { [PIX_FMT_YUV420P9BE] = {
.name = "yuv420p9be", .name = "yuv420p9be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,1,1,0,8}, /* Y */ { 0, 1, 1, 0, 8 }, /* Y */
{1,1,1,0,8}, /* U */ { 1, 1, 1, 0, 8 }, /* U */
{2,1,1,0,8}, /* V */ { 2, 1, 1, 0, 8 }, /* V */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV420P10LE] = { [PIX_FMT_YUV420P10LE] = {
.name = "yuv420p10le", .name = "yuv420p10le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,1,1,0,9}, /* Y */ { 0, 1, 1, 0, 9 }, /* Y */
{1,1,1,0,9}, /* U */ { 1, 1, 1, 0, 9 }, /* U */
{2,1,1,0,9}, /* V */ { 2, 1, 1, 0, 9 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV420P10BE] = { [PIX_FMT_YUV420P10BE] = {
.name = "yuv420p10be", .name = "yuv420p10be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,1,1,0,9}, /* Y */ { 0, 1, 1, 0, 9 }, /* Y */
{1,1,1,0,9}, /* U */ { 1, 1, 1, 0, 9 }, /* U */
{2,1,1,0,9}, /* V */ { 2, 1, 1, 0, 9 }, /* V */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV420P16LE] = { [PIX_FMT_YUV420P16LE] = {
.name = "yuv420p16le", .name = "yuv420p16le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,1,1,0,15}, /* Y */ { 0, 1, 1, 0, 15 }, /* Y */
{1,1,1,0,15}, /* U */ { 1, 1, 1, 0, 15 }, /* U */
{2,1,1,0,15}, /* V */ { 2, 1, 1, 0, 15 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV420P16BE] = { [PIX_FMT_YUV420P16BE] = {
.name = "yuv420p16be", .name = "yuv420p16be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 1, .log2_chroma_h = 1,
.comp = { .comp = {
{0,1,1,0,15}, /* Y */ { 0, 1, 1, 0, 15 }, /* Y */
{1,1,1,0,15}, /* U */ { 1, 1, 1, 0, 15 }, /* U */
{2,1,1,0,15}, /* V */ { 2, 1, 1, 0, 15 }, /* V */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV422P9LE] = { [PIX_FMT_YUV422P9LE] = {
.name = "yuv422p9le", .name = "yuv422p9le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,8}, /* Y */ { 0, 1, 1, 0, 8 }, /* Y */
{1,1,1,0,8}, /* U */ { 1, 1, 1, 0, 8 }, /* U */
{2,1,1,0,8}, /* V */ { 2, 1, 1, 0, 8 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV422P9BE] = { [PIX_FMT_YUV422P9BE] = {
.name = "yuv422p9be", .name = "yuv422p9be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,8}, /* Y */ {0,1,1,0,8}, /* Y */
{1,1,1,0,8}, /* U */ {1,1,1,0,8}, /* U */
...@@ -870,121 +871,121 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -870,121 +871,121 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
}, },
[PIX_FMT_YUV422P10LE] = { [PIX_FMT_YUV422P10LE] = {
.name = "yuv422p10le", .name = "yuv422p10le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,9}, /* Y */ { 0, 1, 1, 0, 9 }, /* Y */
{1,1,1,0,9}, /* U */ { 1, 1, 1, 0, 9 }, /* U */
{2,1,1,0,9}, /* V */ { 2, 1, 1, 0, 9 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV422P10BE] = { [PIX_FMT_YUV422P10BE] = {
.name = "yuv422p10be", .name = "yuv422p10be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,9}, /* Y */ { 0, 1, 1, 0, 9 }, /* Y */
{1,1,1,0,9}, /* U */ { 1, 1, 1, 0, 9 }, /* U */
{2,1,1,0,9}, /* V */ { 2, 1, 1, 0, 9 }, /* V */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV422P16LE] = { [PIX_FMT_YUV422P16LE] = {
.name = "yuv422p16le", .name = "yuv422p16le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,15}, /* Y */ { 0, 1, 1, 0, 15 }, /* Y */
{1,1,1,0,15}, /* U */ { 1, 1, 1, 0, 15 }, /* U */
{2,1,1,0,15}, /* V */ { 2, 1, 1, 0, 15 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV422P16BE] = { [PIX_FMT_YUV422P16BE] = {
.name = "yuv422p16be", .name = "yuv422p16be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 1, .log2_chroma_w = 1,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,15}, /* Y */ { 0, 1, 1, 0, 15 }, /* Y */
{1,1,1,0,15}, /* U */ { 1, 1, 1, 0, 15 }, /* U */
{2,1,1,0,15}, /* V */ { 2, 1, 1, 0, 15 }, /* V */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV444P16LE] = { [PIX_FMT_YUV444P16LE] = {
.name = "yuv444p16le", .name = "yuv444p16le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,15}, /* Y */ { 0, 1, 1, 0, 15 }, /* Y */
{1,1,1,0,15}, /* U */ { 1, 1, 1, 0, 15 }, /* U */
{2,1,1,0,15}, /* V */ { 2, 1, 1, 0, 15 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV444P16BE] = { [PIX_FMT_YUV444P16BE] = {
.name = "yuv444p16be", .name = "yuv444p16be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,15}, /* Y */ { 0, 1, 1, 0, 15 }, /* Y */
{1,1,1,0,15}, /* U */ { 1, 1, 1, 0, 15 }, /* U */
{2,1,1,0,15}, /* V */ { 2, 1, 1, 0, 15 }, /* V */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV444P10LE] = { [PIX_FMT_YUV444P10LE] = {
.name = "yuv444p10le", .name = "yuv444p10le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,9}, /* Y */ { 0, 1, 1, 0, 9 }, /* Y */
{1,1,1,0,9}, /* U */ { 1, 1, 1, 0, 9 }, /* U */
{2,1,1,0,9}, /* V */ { 2, 1, 1, 0, 9 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV444P10BE] = { [PIX_FMT_YUV444P10BE] = {
.name = "yuv444p10be", .name = "yuv444p10be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,9}, /* Y */ { 0, 1, 1, 0, 9 }, /* Y */
{1,1,1,0,9}, /* U */ { 1, 1, 1, 0, 9 }, /* U */
{2,1,1,0,9}, /* V */ { 2, 1, 1, 0, 9 }, /* V */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV444P9LE] = { [PIX_FMT_YUV444P9LE] = {
.name = "yuv444p9le", .name = "yuv444p9le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,8}, /* Y */ { 0, 1, 1, 0, 8 }, /* Y */
{1,1,1,0,8}, /* U */ { 1, 1, 1, 0, 8 }, /* U */
{2,1,1,0,8}, /* V */ { 2, 1, 1, 0, 8 }, /* V */
}, },
.flags = PIX_FMT_PLANAR, .flags = PIX_FMT_PLANAR,
}, },
[PIX_FMT_YUV444P9BE] = { [PIX_FMT_YUV444P9BE] = {
.name = "yuv444p9be", .name = "yuv444p9be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,8}, /* Y */ { 0, 1, 1, 0, 8 }, /* Y */
{1,1,1,0,8}, /* U */ { 1, 1, 1, 0, 8 }, /* U */
{2,1,1,0,8}, /* V */ { 2, 1, 1, 0, 8 }, /* V */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR, .flags = PIX_FMT_BE | PIX_FMT_PLANAR,
}, },
...@@ -996,93 +997,93 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { ...@@ -996,93 +997,93 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = {
}, },
[PIX_FMT_Y400A] = { [PIX_FMT_Y400A] = {
.name = "y400a", .name = "y400a",
.nb_components= 2, .nb_components = 2,
.comp = { .comp = {
{0,1,1,0,7}, /* Y */ { 0, 1, 1, 0, 7 }, /* Y */
{0,1,2,0,7}, /* A */ { 0, 1, 2, 0, 7 }, /* A */
}, },
}, },
[PIX_FMT_GBRP] = { [PIX_FMT_GBRP] = {
.name = "gbrp", .name = "gbrp",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,0,1,0,7}, /* G */ { 0, 0, 1, 0, 7 }, /* G */
{1,0,1,0,7}, /* B */ { 1, 0, 1, 0, 7 }, /* B */
{2,0,1,0,7}, /* R */ { 2, 0, 1, 0, 7 }, /* R */
}, },
.flags = PIX_FMT_PLANAR | PIX_FMT_RGB, .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
}, },
[PIX_FMT_GBRP9LE] = { [PIX_FMT_GBRP9LE] = {
.name = "gbrp9le", .name = "gbrp9le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,8}, /* G */ { 0, 1, 1, 0, 8 }, /* G */
{1,1,1,0,8}, /* B */ { 1, 1, 1, 0, 8 }, /* B */
{2,1,1,0,8}, /* R */ { 2, 1, 1, 0, 8 }, /* R */
}, },
.flags = PIX_FMT_PLANAR | PIX_FMT_RGB, .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
}, },
[PIX_FMT_GBRP9BE] = { [PIX_FMT_GBRP9BE] = {
.name = "gbrp9be", .name = "gbrp9be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,8}, /* G */ { 0, 1, 1, 0, 8 }, /* G */
{1,1,1,0,8}, /* B */ { 1, 1, 1, 0, 8 }, /* B */
{2,1,1,0,8}, /* R */ { 2, 1, 1, 0, 8 }, /* R */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB,
}, },
[PIX_FMT_GBRP10LE] = { [PIX_FMT_GBRP10LE] = {
.name = "gbrp10le", .name = "gbrp10le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,9}, /* G */ { 0, 1, 1, 0, 9 }, /* G */
{1,1,1,0,9}, /* B */ { 1, 1, 1, 0, 9 }, /* B */
{2,1,1,0,9}, /* R */ { 2, 1, 1, 0, 9 }, /* R */
}, },
.flags = PIX_FMT_PLANAR | PIX_FMT_RGB, .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
}, },
[PIX_FMT_GBRP10BE] = { [PIX_FMT_GBRP10BE] = {
.name = "gbrp10be", .name = "gbrp10be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,9}, /* G */ { 0, 1, 1, 0, 9 }, /* G */
{1,1,1,0,9}, /* B */ { 1, 1, 1, 0, 9 }, /* B */
{2,1,1,0,9}, /* R */ { 2, 1, 1, 0, 9 }, /* R */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB,
}, },
[PIX_FMT_GBRP16LE] = { [PIX_FMT_GBRP16LE] = {
.name = "gbrp16le", .name = "gbrp16le",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,15}, /* G */ { 0, 1, 1, 0, 15 }, /* G */
{1,1,1,0,15}, /* B */ { 1, 1, 1, 0, 15 }, /* B */
{2,1,1,0,15}, /* R */ { 2, 1, 1, 0, 15 }, /* R */
}, },
.flags = PIX_FMT_PLANAR | PIX_FMT_RGB, .flags = PIX_FMT_PLANAR | PIX_FMT_RGB,
}, },
[PIX_FMT_GBRP16BE] = { [PIX_FMT_GBRP16BE] = {
.name = "gbrp16be", .name = "gbrp16be",
.nb_components= 3, .nb_components = 3,
.log2_chroma_w= 0, .log2_chroma_w = 0,
.log2_chroma_h= 0, .log2_chroma_h = 0,
.comp = { .comp = {
{0,1,1,0,15}, /* G */ { 0, 1, 1, 0, 15 }, /* G */
{1,1,1,0,15}, /* B */ { 1, 1, 1, 0, 15 }, /* B */
{2,1,1,0,15}, /* R */ { 2, 1, 1, 0, 15 }, /* R */
}, },
.flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_RGB,
}, },
...@@ -1137,8 +1138,8 @@ int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc) ...@@ -1137,8 +1138,8 @@ int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc)
int log2_pixels = pixdesc->log2_chroma_w + pixdesc->log2_chroma_h; int log2_pixels = pixdesc->log2_chroma_w + pixdesc->log2_chroma_h;
for (c = 0; c < pixdesc->nb_components; c++) { for (c = 0; c < pixdesc->nb_components; c++) {
int s = c==1 || c==2 ? 0 : log2_pixels; int s = c == 1 || c == 2 ? 0 : log2_pixels;
bits += (pixdesc->comp[c].depth_minus1+1) << s; bits += (pixdesc->comp[c].depth_minus1 + 1) << s;
} }
return bits >> log2_pixels; return bits >> log2_pixels;
...@@ -1148,11 +1149,11 @@ char *av_get_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt) ...@@ -1148,11 +1149,11 @@ char *av_get_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt)
{ {
/* print header */ /* print header */
if (pix_fmt < 0) { if (pix_fmt < 0) {
snprintf (buf, buf_size, "name " " nb_components" " nb_bits"); snprintf (buf, buf_size, "name" " nb_components" " nb_bits");
} else { } else {
const AVPixFmtDescriptor *pixdesc = &av_pix_fmt_descriptors[pix_fmt]; const AVPixFmtDescriptor *pixdesc = &av_pix_fmt_descriptors[pix_fmt];
snprintf(buf, buf_size, "%-11s %7d %10d", snprintf(buf, buf_size, "%-11s %7d %10d", pixdesc->name,
pixdesc->name, pixdesc->nb_components, av_get_bits_per_pixel(pixdesc)); pixdesc->nb_components, av_get_bits_per_pixel(pixdesc));
} }
return buf; return buf;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment