aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-09-08 15:43:03 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2015-09-08 16:35:28 +0200
commit151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (patch)
tree866bd99edecd778aee4cd8eb5f34977d0c82a27d
parentf53569a93f853057d4852601b547a1d9c57613b6 (diff)
parent2268db2cd052674fde55c7d48b7a5098ce89b4ba (diff)
downloadandroid_external_ffmpeg-151aa2ebff514a9d150a2d3a7b92be1dcc46df36.tar.gz
android_external_ffmpeg-151aa2ebff514a9d150a2d3a7b92be1dcc46df36.tar.bz2
android_external_ffmpeg-151aa2ebff514a9d150a2d3a7b92be1dcc46df36.zip
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba': lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat
-rw-r--r--doc/APIchanges2
-rw-r--r--libavcodec/hevc.c2
-rw-r--r--libavcodec/hevc_refs.c2
-rw-r--r--libavcodec/libopenjpegdec.c10
-rw-r--r--libavcodec/libopenjpegenc.c4
-rw-r--r--libavcodec/libx265.c4
-rw-r--r--libavcodec/pnmenc.c2
-rw-r--r--libavfilter/vf_hqdn3d.c2
-rw-r--r--libavfilter/vf_yadif.c4
-rw-r--r--libavutil/imgutils.c4
-rw-r--r--libavutil/pixdesc.c902
-rw-r--r--libavutil/pixdesc.h24
-rw-r--r--libavutil/version.h4
-rw-r--r--libswscale/output.c4
-rw-r--r--libswscale/swscale.c6
-rw-r--r--libswscale/swscale_internal.h6
-rw-r--r--libswscale/swscale_unscaled.c10
-rw-r--r--libswscale/utils.c4
18 files changed, 510 insertions, 486 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index c91c97cc9b..958035ce77 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -19,6 +19,8 @@ API changes, most recent first:
xxxxxxx - Change type of AVPixFmtDescriptor.flags from uint8_t to uint64_t.
xxxxxxx - Change type of AVComponentDescriptor fields from uint16_t to int
and drop bit packing.
+ xxxxxxx - Add step, offset, and depth to AVComponentDescriptor to replace
+ the deprecated step_minus1, offset_plus1, and depth_minus1.
-------- 8< --------- FFmpeg 2.8 was cut here -------- 8< ---------
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index e7ac50ef59..8d4db22c8c 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -2821,7 +2821,7 @@ static int verify_md5(HEVCContext *s, AVFrame *frame)
if (!desc)
return AVERROR(EINVAL);
- pixel_shift = desc->comp[0].depth_minus1 > 7;
+ pixel_shift = desc->comp[0].depth > 8;
av_log(s->avctx, AV_LOG_DEBUG, "Verifying checksum for frame with POC %d: ",
s->poc);
diff --git a/libavcodec/hevc_refs.c b/libavcodec/hevc_refs.c
index 0c1dbb2486..e85ce89086 100644
--- a/libavcodec/hevc_refs.c
+++ b/libavcodec/hevc_refs.c
@@ -206,7 +206,7 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush)
AVFrame *dst = out;
AVFrame *src = frame->frame;
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(src->format);
- int pixel_shift = !!(desc->comp[0].depth_minus1 > 7);
+ int pixel_shift = !!(desc->comp[0].depth > 8);
ret = av_frame_ref(out, src);
if (frame->flags & HEVC_FRAME_FLAG_BUMPING)
diff --git a/libavcodec/libopenjpegdec.c b/libavcodec/libopenjpegdec.c
index 644e06c4cc..01ff48ce32 100644
--- a/libavcodec/libopenjpegdec.c
+++ b/libavcodec/libopenjpegdec.c
@@ -114,22 +114,22 @@ static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum AVP
switch (desc->nb_components) {
case 4:
match = match &&
- desc->comp[3].depth_minus1 + 1 >= image->comps[3].prec &&
+ desc->comp[3].depth >= image->comps[3].prec &&
1 == image->comps[3].dx &&
1 == image->comps[3].dy;
case 3:
match = match &&
- desc->comp[2].depth_minus1 + 1 >= image->comps[2].prec &&
+ desc->comp[2].depth >= image->comps[2].prec &&
1 << desc->log2_chroma_w == image->comps[2].dx &&
1 << desc->log2_chroma_h == image->comps[2].dy;
case 2:
match = match &&
- desc->comp[1].depth_minus1 + 1 >= image->comps[1].prec &&
+ desc->comp[1].depth >= image->comps[1].prec &&
1 << desc->log2_chroma_w == image->comps[1].dx &&
1 << desc->log2_chroma_h == image->comps[1].dy;
case 1:
match = match &&
- desc->comp[0].depth_minus1 + 1 >= image->comps[0].prec &&
+ desc->comp[0].depth >= image->comps[0].prec &&
1 == image->comps[0].dx &&
1 == image->comps[0].dy;
default:
@@ -388,7 +388,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
}
desc = av_pix_fmt_desc_get(avctx->pix_fmt);
- pixel_size = desc->comp[0].step_minus1 + 1;
+ pixel_size = desc->comp[0].step;
ispacked = libopenjpeg_ispacked(avctx->pix_fmt);
switch (pixel_size) {
diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c
index d7ba868ae7..0debd24d80 100644
--- a/libavcodec/libopenjpegenc.c
+++ b/libavcodec/libopenjpegenc.c
@@ -189,8 +189,8 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p
}
for (i = 0; i < numcomps; i++) {
- cmptparm[i].prec = desc->comp[i].depth_minus1 + 1;
- cmptparm[i].bpp = desc->comp[i].depth_minus1 + 1;
+ cmptparm[i].prec = desc->comp[i].depth;
+ cmptparm[i].bpp = desc->comp[i].depth;
cmptparm[i].sgnd = 0;
cmptparm[i].dx = sub_dx[i];
cmptparm[i].dy = sub_dy[i];
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index a15ef1a95c..a1770facb1 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -78,7 +78,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx)
{
libx265Context *ctx = avctx->priv_data;
- ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1);
+ ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth);
if (!ctx->api)
ctx->api = x265_api_get(0);
@@ -261,7 +261,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
}
x265pic.pts = pic->pts;
- x265pic.bitDepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1;
+ x265pic.bitDepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth;
x265pic.sliceType = pic->pict_type == AV_PICTURE_TYPE_I ? X265_TYPE_I :
pic->pict_type == AV_PICTURE_TYPE_P ? X265_TYPE_P :
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index 9c63dcb54b..b3eb5d90d3 100644
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -83,7 +83,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
"P%c\n%d %d\n", c, avctx->width, h1);
bytestream += strlen(bytestream);
if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) {
- int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1;
+ int maxdepth = (1 << av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth) - 1;
snprintf(bytestream, bytestream_end - bytestream,
"%d\n", maxdepth);
bytestream += strlen(bytestream);
diff --git a/libavfilter/vf_hqdn3d.c b/libavfilter/vf_hqdn3d.c
index ffc1b255f5..6c76c5c176 100644
--- a/libavfilter/vf_hqdn3d.c
+++ b/libavfilter/vf_hqdn3d.c
@@ -269,7 +269,7 @@ static int config_input(AVFilterLink *inlink)
s->hsub = desc->log2_chroma_w;
s->vsub = desc->log2_chroma_h;
- s->depth = desc->comp[0].depth_minus1+1;
+ s->depth = desc->comp[0].depth;
s->line = av_malloc_array(inlink->w, sizeof(*s->line));
if (!s->line)
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index b32f38b57a..7451832b10 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -186,7 +186,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
YADIFContext *s = ctx->priv;
ThreadData *td = arg;
int refs = s->cur->linesize[td->plane];
- int df = (s->csp->comp[td->plane].depth_minus1 + 8) / 8;
+ int df = (s->csp->comp[td->plane].depth + 7) / 8;
int pix_3 = 3 * df;
int slice_start = (td->h * jobnr ) / nb_jobs;
int slice_end = (td->h * (jobnr+1)) / nb_jobs;
@@ -486,7 +486,7 @@ static int config_props(AVFilterLink *link)
}
s->csp = av_pix_fmt_desc_get(link->format);
- if (s->csp->comp[0].depth_minus1 / 8 == 1) {
+ if (s->csp->comp[0].depth > 8) {
s->filter_line = filter_line_c_16bit;
s->filter_edges = filter_edges_16bit;
} else {
diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c
index 9c8216e827..8956ae31ec 100644
--- a/libavutil/imgutils.c
+++ b/libavutil/imgutils.c
@@ -41,8 +41,8 @@ void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
for (i = 0; i < 4; i++) {
const AVComponentDescriptor *comp = &(pixdesc->comp[i]);
- if ((comp->step_minus1+1) > max_pixsteps[comp->plane]) {
- max_pixsteps[comp->plane] = comp->step_minus1+1;
+ if (comp->step > max_pixsteps[comp->plane]) {
+ max_pixsteps[comp->plane] = comp->step;
if (max_pixstep_comps)
max_pixstep_comps[comp->plane] = i;
}
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 2ad7865691..39a28efa3d 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -39,14 +39,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 & AV_PIX_FMT_FLAG_BITSTREAM) {
- int skip = x * step + comp.offset_plus1 - 1;
+ int skip = x * step + comp.offset;
const uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);
int shift = 8 - depth - (skip & 7);
@@ -61,7 +61,7 @@ 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)
@@ -86,12 +86,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 & AV_PIX_FMT_FLAG_BITSTREAM) {
- int skip = x * step + comp.offset_plus1 - 1;
+ int skip = x * step + comp.offset;
uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);
int shift = 8 - depth - (skip & 7);
@@ -104,7 +104,7 @@ 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 & AV_PIX_FMT_FLAG_BE);
@@ -127,6 +127,9 @@ void av_write_image_line(const uint16_t *src,
}
}
+#if FF_API_PLUS1_MINUS1
+FF_DISABLE_DEPRECATION_WARNINGS
+#endif
static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_YUV420P] = {
.name = "yuv420p",
@@ -134,9 +137,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -146,9 +149,9 @@ static 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] = {
@@ -157,9 +160,9 @@ static 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 }, /* V */
- { 0, 3, 4, 0, 7 }, /* U */
+ { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
+ { 0, 4, 1, 0, 8, 3, 7, 2 }, /* V */
+ { 0, 4, 3, 0, 8, 3, 7, 4 }, /* U */
},
},
[AV_PIX_FMT_RGB24] = {
@@ -168,9 +171,9 @@ static 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 = AV_PIX_FMT_FLAG_RGB,
},
@@ -180,9 +183,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 2, 3, 0, 7 }, /* R */
- { 0, 2, 2, 0, 7 }, /* G */
- { 0, 2, 1, 0, 7 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_RGB,
},
@@ -192,9 +195,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -204,9 +207,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -216,9 +219,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -228,9 +231,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -240,9 +243,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -252,7 +255,7 @@ static 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",
@@ -263,7 +266,7 @@ static 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 = AV_PIX_FMT_FLAG_BITSTREAM,
},
@@ -273,7 +276,7 @@ static 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 = AV_PIX_FMT_FLAG_BITSTREAM,
},
@@ -283,7 +286,7 @@ static 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 = AV_PIX_FMT_FLAG_PAL,
},
@@ -293,9 +296,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -305,9 +308,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -317,9 +320,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -345,9 +348,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.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] = {
@@ -356,9 +359,9 @@ static 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] = {
@@ -367,9 +370,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 0, 1, 0, 2 }, /* R */
- { 0, 0, 1, 3, 2 }, /* G */
- { 0, 0, 1, 6, 1 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
},
@@ -379,9 +382,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 3, 4, 0, 0 }, /* R */
- { 0, 3, 2, 0, 1 }, /* G */
- { 0, 3, 1, 0, 0 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,
},
@@ -391,9 +394,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 0, 1, 0, 0 }, /* R */
- { 0, 0, 1, 1, 1 }, /* G */
- { 0, 0, 1, 3, 0 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
},
@@ -403,9 +406,9 @@ static 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 = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
},
@@ -415,9 +418,9 @@ static 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 = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,
},
@@ -427,9 +430,9 @@ static 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 = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
},
@@ -439,9 +442,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -451,9 +454,9 @@ static 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, 2, 0, 7 }, /* U */
- { 1, 1, 1, 0, 7 }, /* V */
+ { 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -463,10 +466,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 3, 2, 0, 7 }, /* R */
- { 0, 3, 3, 0, 7 }, /* G */
- { 0, 3, 4, 0, 7 }, /* B */
- { 0, 3, 1, 0, 7 }, /* A */
+ { 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 = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -476,10 +479,10 @@ static 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 = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -489,10 +492,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 3, 4, 0, 7 }, /* R */
- { 0, 3, 3, 0, 7 }, /* G */
- { 0, 3, 2, 0, 7 }, /* B */
- { 0, 3, 1, 0, 7 }, /* A */
+ { 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 = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -502,10 +505,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 3, 3, 0, 7 }, /* R */
- { 0, 3, 2, 0, 7 }, /* G */
- { 0, 3, 1, 0, 7 }, /* B */
- { 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 = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -515,9 +518,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 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 */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -527,9 +530,9 @@ static 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, 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 */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -539,9 +542,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 0, 3, 4, 0, 7 }, /* R */
- { 0, 3, 3, 0, 7 }, /* G */
- { 0, 3, 2, 0, 7 }, /* B */
+ { 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 */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -551,9 +554,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0,
.log2_chroma_h= 0,
.comp = {
- { 0, 3, 3, 0, 7 }, /* R */
- { 0, 3, 2, 0, 7 }, /* G */
- { 0, 3, 1, 0, 7 }, /* B */
+ { 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 */
},
.flags = AV_PIX_FMT_FLAG_RGB,
},
@@ -563,7 +566,7 @@ static 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 = AV_PIX_FMT_FLAG_BE,
.alias = "y16be",
@@ -574,7 +577,7 @@ static 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",
},
@@ -584,9 +587,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -596,9 +599,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -608,9 +611,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -620,9 +623,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -632,9 +635,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 1, 0, 11 }, /* Y */
- { 1, 1, 1, 0, 11 }, /* U */
- { 2, 1, 1, 0, 11 }, /* V */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -644,9 +647,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 1, 0, 11 }, /* Y */
- { 1, 1, 1, 0, 11 }, /* U */
- { 2, 1, 1, 0, 11 }, /* V */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -656,10 +659,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -669,10 +672,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -682,10 +685,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -695,10 +698,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -708,10 +711,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -721,10 +724,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -734,10 +737,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -747,10 +750,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -760,10 +763,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -773,10 +776,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -786,10 +789,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -799,10 +802,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -812,10 +815,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -825,10 +828,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -838,10 +841,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -851,10 +854,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -864,10 +867,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -877,10 +880,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -890,10 +893,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -903,10 +906,10 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -916,10 +919,10 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -967,9 +970,9 @@ static 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_FLAG_BE,
},
@@ -979,9 +982,9 @@ static 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,
},
@@ -991,10 +994,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 7, 1, 0, 15 }, /* R */
- { 0, 7, 3, 0, 15 }, /* G */
- { 0, 7, 5, 0, 15 }, /* B */
- { 0, 7, 7, 0, 15 }, /* A */
+ { 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,
},
@@ -1004,10 +1007,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 7, 1, 0, 15 }, /* R */
- { 0, 7, 3, 0, 15 }, /* G */
- { 0, 7, 5, 0, 15 }, /* B */
- { 0, 7, 7, 0, 15 }, /* A */
+ { 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_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1017,9 +1020,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1029,9 +1032,9 @@ static 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 = AV_PIX_FMT_FLAG_RGB,
},
@@ -1041,9 +1044,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1053,9 +1056,9 @@ static 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 = AV_PIX_FMT_FLAG_RGB,
},
@@ -1065,9 +1068,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1077,9 +1080,9 @@ static 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 = AV_PIX_FMT_FLAG_RGB,
},
@@ -1089,9 +1092,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 5, 5, 0, 15 }, /* R */
- { 0, 5, 3, 0, 15 }, /* G */
- { 0, 5, 1, 0, 15 }, /* B */
+ { 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_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1101,9 +1104,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 5, 5, 0, 15 }, /* R */
- { 0, 5, 3, 0, 15 }, /* G */
- { 0, 5, 1, 0, 15 }, /* B */
+ { 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,
},
@@ -1113,10 +1116,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 7, 5, 0, 15 }, /* R */
- { 0, 7, 3, 0, 15 }, /* G */
- { 0, 7, 1, 0, 15 }, /* B */
- { 0, 7, 7, 0, 15 }, /* A */
+ { 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,
},
@@ -1126,10 +1129,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 7, 5, 0, 15 }, /* R */
- { 0, 7, 3, 0, 15 }, /* G */
- { 0, 7, 1, 0, 15 }, /* B */
- { 0, 7, 7, 0, 15 }, /* A */
+ { 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_RGB | AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1139,9 +1142,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 4 }, /* R */
- { 0, 1, 1, 5, 5 }, /* G */
- { 0, 1, 0, 3, 4 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1151,9 +1154,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 4 }, /* R */
- { 0, 1, 1, 5, 5 }, /* G */
- { 0, 1, 2, 3, 4 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_RGB,
},
@@ -1163,9 +1166,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 4 }, /* R */
- { 0, 1, 1, 5, 4 }, /* G */
- { 0, 1, 0, 2, 4 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1175,9 +1178,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 4 }, /* R */
- { 0, 1, 1, 5, 4 }, /* G */
- { 0, 1, 2, 2, 4 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_RGB,
},
@@ -1187,9 +1190,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 3 }, /* R */
- { 0, 1, 1, 4, 3 }, /* G */
- { 0, 1, 0, 0, 3 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
},
@@ -1199,9 +1202,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 3 }, /* R */
- { 0, 1, 1, 4, 3 }, /* G */
- { 0, 1, 2, 0, 3 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_RGB,
},
@@ -1238,9 +1241,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1250,9 +1253,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1262,9 +1265,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1274,9 +1277,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1286,9 +1289,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 1, 0, 11 }, /* Y */
- { 1, 1, 1, 0, 11 }, /* U */
- { 2, 1, 1, 0, 11 }, /* V */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1298,9 +1301,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 1, 0, 11 }, /* Y */
- { 1, 1, 1, 0, 11 }, /* U */
- { 2, 1, 1, 0, 11 }, /* V */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1310,9 +1313,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 1, 0, 13 }, /* Y */
- { 1, 1, 1, 0, 13 }, /* U */
- { 2, 1, 1, 0, 13 }, /* V */
+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1322,9 +1325,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 1,
.comp = {
- { 0, 1, 1, 0, 13 }, /* Y */
- { 1, 1, 1, 0, 13 }, /* U */
- { 2, 1, 1, 0, 13 }, /* V */
+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1334,9 +1337,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1346,9 +1349,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1358,9 +1361,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1370,9 +1373,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1382,9 +1385,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1394,9 +1397,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1406,9 +1409,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 11 }, /* Y */
- { 1, 1, 1, 0, 11 }, /* U */
- { 2, 1, 1, 0, 11 }, /* V */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1418,9 +1421,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 11 }, /* Y */
- { 1, 1, 1, 0, 11 }, /* U */
- { 2, 1, 1, 0, 11 }, /* V */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1430,9 +1433,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 13 }, /* Y */
- { 1, 1, 1, 0, 13 }, /* U */
- { 2, 1, 1, 0, 13 }, /* V */
+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1442,9 +1445,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 1,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 13 }, /* Y */
- { 1, 1, 1, 0, 13 }, /* U */
- { 2, 1, 1, 0, 13 }, /* V */
+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1454,9 +1457,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1466,9 +1469,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1478,9 +1481,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1490,9 +1493,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1502,9 +1505,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1514,9 +1517,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1526,9 +1529,9 @@ static 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1538,9 +1541,9 @@ static 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1550,9 +1553,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 11 }, /* Y */
- { 1, 1, 1, 0, 11 }, /* U */
- { 2, 1, 1, 0, 11 }, /* V */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1562,9 +1565,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 11 }, /* Y */
- { 1, 1, 1, 0, 11 }, /* U */
- { 2, 1, 1, 0, 11 }, /* V */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1574,9 +1577,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 13 }, /* Y */
- { 1, 1, 1, 0, 13 }, /* U */
- { 2, 1, 1, 0, 13 }, /* V */
+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1586,9 +1589,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 1, 1, 0, 13 }, /* Y */
- { 1, 1, 1, 0, 13 }, /* U */
- { 2, 1, 1, 0, 13 }, /* V */
+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1614,8 +1617,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.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 = AV_PIX_FMT_FLAG_ALPHA,
.alias = "gray8a",
@@ -1624,8 +1627,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.name = "ya16le",
.nb_components = 2,
.comp = {
- { 0, 3, 1, 0, 15 }, /* Y */
- { 0, 3, 3, 0, 15 }, /* A */
+ { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
+ { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1633,8 +1636,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.name = "ya16be",
.nb_components = 2,
.comp = {
- { 0, 3, 1, 0, 15 }, /* Y */
- { 0, 3, 3, 0, 15 }, /* A */
+ { 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,
},
@@ -1648,9 +1651,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 0, 1, 0, 7 }, /* R */
- { 0, 0, 1, 0, 7 }, /* G */
- { 1, 0, 1, 0, 7 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1660,9 +1663,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 8 }, /* R */
- { 0, 1, 1, 0, 8 }, /* G */
- { 1, 1, 1, 0, 8 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1672,9 +1675,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 8 }, /* R */
- { 0, 1, 1, 0, 8 }, /* G */
- { 1, 1, 1, 0, 8 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1684,9 +1687,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 9 }, /* R */
- { 0, 1, 1, 0, 9 }, /* G */
- { 1, 1, 1, 0, 9 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1696,9 +1699,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 9 }, /* R */
- { 0, 1, 1, 0, 9 }, /* G */
- { 1, 1, 1, 0, 9 }, /* B */
+ { 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 = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1708,9 +1711,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 11 }, /* R */
- { 0, 1, 1, 0, 11 }, /* G */
- { 1, 1, 1, 0, 11 }, /* B */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1720,9 +1723,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 11 }, /* R */
- { 0, 1, 1, 0, 11 }, /* G */
- { 1, 1, 1, 0, 11 }, /* B */
+ { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
+ { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
+ { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1732,9 +1735,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 13 }, /* R */
- { 0, 1, 1, 0, 13 }, /* G */
- { 1, 1, 1, 0, 13 }, /* B */
+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */
+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */
+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1744,9 +1747,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 13 }, /* R */
- { 0, 1, 1, 0, 13 }, /* G */
- { 1, 1, 1, 0, 13 }, /* B */
+ { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */
+ { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */
+ { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1756,9 +1759,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 15 }, /* R */
- { 0, 1, 1, 0, 15 }, /* G */
- { 1, 1, 1, 0, 15 }, /* B */
+ { 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_PLANAR | AV_PIX_FMT_FLAG_RGB,
},
@@ -1768,9 +1771,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 15 }, /* R */
- { 0, 1, 1, 0, 15 }, /* G */
- { 1, 1, 1, 0, 15 }, /* B */
+ { 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,
},
@@ -1780,10 +1783,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 0, 1, 0, 7 }, /* R */
- { 0, 0, 1, 0, 7 }, /* G */
- { 1, 0, 1, 0, 7 }, /* B */
- { 3, 0, 1, 0, 7 }, /* A */
+ { 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 = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
AV_PIX_FMT_FLAG_ALPHA,
@@ -1794,10 +1797,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 15 }, /* R */
- { 0, 1, 1, 0, 15 }, /* G */
- { 1, 1, 1, 0, 15 }, /* B */
- { 3, 1, 1, 0, 15 }, /* A */
+ { 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,
@@ -1808,10 +1811,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 2, 1, 1, 0, 15 }, /* R */
- { 0, 1, 1, 0, 15 }, /* G */
- { 1, 1, 1, 0, 15 }, /* B */
- { 3, 1, 1, 0, 15 }, /* A */
+ { 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,
@@ -1828,9 +1831,9 @@ static 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*/
},
@@ -1840,9 +1843,9 @@ static 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 = AV_PIX_FMT_FLAG_BE,
},
@@ -1852,9 +1855,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0, \
.log2_chroma_h= 0, \
.comp = { \
- {0,0,0,0,1}, \
- {0,0,0,0,3}, \
- {0,0,0,0,1}, \
+ {0,1,0,0,2,0,1,1},\
+ {0,1,0,0,4,0,3,1},\
+ {0,1,0,0,2,0,1,1},\
}, \
#define BAYER16_DESC_COMMON \
@@ -1862,9 +1865,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w= 0, \
.log2_chroma_h= 0, \
.comp = { \
- {0,1,0,0, 3}, \
- {0,1,0,0, 7}, \
- {0,1,0,0, 3}, \
+ {0,2,0,0,4,1,3,1},\
+ {0,2,0,0,8,1,7,1},\
+ {0,2,0,0,4,1,3,1},\
}, \
[AV_PIX_FMT_BAYER_BGGR8] = {
@@ -1933,9 +1936,9 @@ static 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, 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 = AV_PIX_FMT_FLAG_PLANAR,
},
@@ -1945,9 +1948,9 @@ static 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, 3, 1, 0, 9 }, /* U */
- { 1, 3, 3, 0, 9 }, /* V */
+ { 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,
},
@@ -1957,9 +1960,9 @@ static 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, 3, 1, 0, 9 }, /* U */
- { 1, 3, 3, 0, 9 }, /* V */
+ { 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,
},
@@ -1981,10 +1984,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 7, 3, 0, 15 }, /* Y */
- { 0, 7, 5, 0, 15 }, /* U */
- { 0, 7, 7, 0, 15 }, /* V */
- { 0, 7, 1, 0, 15 }, /* A */
+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */
+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */
+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */
+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_ALPHA,
},
@@ -1994,14 +1997,17 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
.log2_chroma_w = 0,
.log2_chroma_h = 0,
.comp = {
- { 0, 7, 3, 0, 15 }, /* Y */
- { 0, 7, 5, 0, 15 }, /* U */
- { 0, 7, 7, 0, 15 }, /* V */
- { 0, 7, 1, 0, 15 }, /* A */
+ { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */
+ { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */
+ { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */
+ { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */
},
.flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA,
},
};
+#if FF_API_PLUS1_MINUS1
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
static const char *color_range_names[AVCOL_RANGE_NB] = {
"unknown", "tv", "pc",
@@ -2082,7 +2088,7 @@ 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;
diff --git a/libavutil/pixdesc.h b/libavutil/pixdesc.h
index b92aa443c1..d9999058e4 100644
--- a/libavutil/pixdesc.h
+++ b/libavutil/pixdesc.h
@@ -26,6 +26,7 @@
#include "attributes.h"
#include "pixfmt.h"
+#include "version.h"
typedef struct AVComponentDescriptor {
/**
@@ -34,16 +35,16 @@ typedef struct AVComponentDescriptor {
int plane;
/**
- * Number of elements between 2 horizontally consecutive pixels minus 1.
+ * Number of elements between 2 horizontally consecutive pixels.
* Elements are bits for bitstream formats, bytes otherwise.
*/
- int step_minus1;
+ int step;
/**
- * Number of elements before the component of the first pixel plus 1.
+ * Number of elements before the component of the first pixel.
* Elements are bits for bitstream formats, bytes otherwise.
*/
- int offset_plus1;
+ int offset;
/**
* Number of least significant bits that must be shifted away
@@ -52,9 +53,20 @@ typedef struct AVComponentDescriptor {
int shift;
/**
- * Number of bits in the component minus 1.
+ * Number of bits in the component.
*/
- int depth_minus1;
+ int depth;
+
+#if FF_API_PLUS1_MINUS1
+ /** deprecated, use step instead */
+ attribute_deprecated int step_minus1;
+
+ /** deprecated, use depth instead */
+ attribute_deprecated int depth_minus1;
+
+ /** deprecated, use offset instead */
+ attribute_deprecated int offset_plus1;
+#endif
} AVComponentDescriptor;
/**
diff --git a/libavutil/version.h b/libavutil/version.h
index fac4a5dc95..ccb571edc0 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -105,6 +105,10 @@
#ifndef FF_API_FRAME_QP
#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
+#ifndef FF_API_PLUS1_MINUS1
+#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
+#endif
+
/**
* @}
diff --git a/libswscale/output.c b/libswscale/output.c
index 31e10237d8..16cfd75c5a 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -1845,7 +1845,7 @@ yuv2gbrp_full_X_c(SwsContext *c, const int16_t *lumFilter,
int i;
int hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpSrc;
uint16_t **dest16 = (uint16_t**)dest;
- int SH = 22 + 7 - desc->comp[0].depth_minus1;
+ int SH = 22 + 8 - desc->comp[0].depth;
int A = 0; // init to silence warning
for (i = 0; i < dstW; i++) {
@@ -2073,7 +2073,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c,
*yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c;
*yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c;
} else if (is9_OR_10BPS(dstFormat)) {
- if (desc->comp[0].depth_minus1 == 8) {
+ if (desc->comp[0].depth == 9) {
*yuv2planeX = isBE(dstFormat) ? yuv2planeX_9BE_c : yuv2planeX_9LE_c;
*yuv2plane1 = isBE(dstFormat) ? yuv2plane1_9BE_c : yuv2plane1_9LE_c;
} else if (desc->comp[0].depth_minus1 == 9) {
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index e9e4f622f5..b7d3d6a3a2 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -87,7 +87,7 @@ static void hScale16To19_c(SwsContext *c, int16_t *_dst, int dstW,
int i;
int32_t *dst = (int32_t *) _dst;
const uint16_t *src = (const uint16_t *) _src;
- int bits = desc->comp[0].depth_minus1;
+ int bits = desc->comp[0].depth - 1;
int sh = bits - 4;
if((isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8) && desc->comp[0].depth_minus1<15)
@@ -113,7 +113,7 @@ static void hScale16To15_c(SwsContext *c, int16_t *dst, int dstW,
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);
int i;
const uint16_t *src = (const uint16_t *) _src;
- int sh = desc->comp[0].depth_minus1;
+ int sh = desc->comp[0].depth - 1;
if(sh<15)
sh= isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8 ? 13 : desc->comp[0].depth_minus1;
@@ -796,7 +796,7 @@ static int swscale(SwsContext *c, const uint8_t *src[],
if (is16BPS(dstFormat) || isNBPS(dstFormat)) {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat);
fillPlane16(dst[3], dstStride[3], length, height, lastDstY,
- 1, desc->comp[3].depth_minus1,
+ 1, desc->comp[3].depth,
isBE(dstFormat));
} else
fillPlane(dst[3], dstStride[3], length, height, lastDstY, 255);
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index 608cc3e6e9..9676d463d1 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -651,14 +651,14 @@ static av_always_inline int is16BPS(enum AVPixelFormat pix_fmt)
{
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
av_assert0(desc);
- return desc->comp[0].depth_minus1 == 15;
+ return desc->comp[0].depth == 16;
}
static av_always_inline int is9_OR_10BPS(enum AVPixelFormat pix_fmt)
{
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
av_assert0(desc);
- return desc->comp[0].depth_minus1 >= 8 && desc->comp[0].depth_minus1 <= 13;
+ return desc->comp[0].depth >= 9 && desc->comp[0].depth <= 14;
}
#define isNBPS(x) is9_OR_10BPS(x)
@@ -928,7 +928,7 @@ static inline void fillPlane16(uint8_t *plane, int stride, int width, int height
{
int i, j;
uint8_t *ptr = plane + stride * y;
- int v = alpha ? 0xFFFF>>(15-bits) : (1<<bits);
+ int v = alpha ? 0xFFFF>>(16-bits) : (1<<(bits-1));
for (i = 0; i < height; i++) {
#define FILL(wfunc) \
for (j = 0; j < width; j++) {\
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 18baaead35..8f57b2a3d2 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -1417,7 +1417,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],
if (!src[plane] || (plane == 1 && !src[2])) {
if (is16BPS(c->dstFormat) || isNBPS(c->dstFormat)) {
fillPlane16(dst[plane], dstStride[plane], length, height, y,
- plane == 3, desc_dst->comp[plane].depth_minus1,
+ plane == 3, desc_dst->comp[plane].depth,
isBE(c->dstFormat));
} else {
fillPlane(dst[plane], dstStride[plane], length, height, y,
@@ -1427,8 +1427,8 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],
if(isNBPS(c->srcFormat) || isNBPS(c->dstFormat)
|| (is16BPS(c->srcFormat) != is16BPS(c->dstFormat))
) {
- const int src_depth = desc_src->comp[plane].depth_minus1 + 1;
- const int dst_depth = desc_dst->comp[plane].depth_minus1 + 1;
+ const int src_depth = desc_src->comp[plane].depth;
+ const int dst_depth = desc_dst->comp[plane].depth;
const uint16_t *srcPtr2 = (const uint16_t *) srcPtr;
uint16_t *dstPtr2 = (uint16_t*)dstPtr;
@@ -1543,7 +1543,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[],
} else {
if (is16BPS(c->srcFormat) && is16BPS(c->dstFormat))
length *= 2;
- else if (!desc_src->comp[0].depth_minus1)
+ else if (desc_src->comp[0].depth == 1)
length >>= 3; // monowhite/black
for (i = 0; i < height; i++) {
memcpy(dstPtr, srcPtr, length);
@@ -1648,7 +1648,7 @@ void ff_get_unscaled_swscale(SwsContext *c)
dstFormat == AV_PIX_FMT_BGRA64LE || dstFormat == AV_PIX_FMT_BGRA64BE))
c->swscale = planarRgb16ToRgb16Wrapper;
- if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth_minus1 == 7 &&
+ if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth == 8 &&
isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP)
c->swscale = rgbToPlanarRgbWrapper;
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 0c4b4d7977..b2ce49601b 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -1335,10 +1335,10 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter,
FF_ALLOCZ_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail);
- c->srcBpc = 1 + desc_src->comp[0].depth_minus1;
+ c->srcBpc = desc_src->comp[0].depth;
if (c->srcBpc < 8)
c->srcBpc = 8;
- c->dstBpc = 1 + desc_dst->comp[0].depth_minus1;
+ c->dstBpc = desc_dst->comp[0].depth;
if (c->dstBpc < 8)
c->dstBpc = 8;
if (isAnyRGB(srcFormat) || srcFormat == AV_PIX_FMT_PAL8)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 03:00:03 +0000