History

Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'

* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba': lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields

Hendrik Leppkes committed 11 years ago

Commit 151aa2e2 parents f53569a 2268db218 files · +510 −486Browse files

Unified · Split

18 files
  1. doc/APIchanges +2 −0
  2. libavcodec/hevc.c +1 −1
  3. libavcodec/hevc_refs.c +1 −1
  4. libavcodec/libopenjpegdec.c +5 −5
  5. libavcodec/libopenjpegenc.c +2 −2
  6. libavcodec/libx265.c +2 −2
  7. libavcodec/pnmenc.c +1 −1
  8. libavfilter/vf_hqdn3d.c +1 −1
  9. libavfilter/vf_yadif.c +2 −2
  10. libavutil/imgutils.c +2 −2
  11. libavutil/pixdesc.c +454 −448
  12. libavutil/pixdesc.h +18 −6
  13. libavutil/version.h +4 −0
  14. libswscale/output.c +2 −2
  15. libswscale/swscale.c +3 −3
  16. libswscale/swscale_internal.h +3 −3
  17. libswscale/swscale_unscaled.c +5 −5
  18. libswscale/utils.c +2 −2
doc/APIchanges+2−0
@@ -19,6 +19,8 @@ API changes, most recent first: · 18 unmodified lines
19 xxxxxxx - Change type of AVPixFmtDescriptor.flags from uint8_t to uint64_t.19 xxxxxxx - Change type of AVPixFmtDescriptor.flags from uint8_t to uint64_t.
20 xxxxxxx - Change type of AVComponentDescriptor fields from uint16_t to int20 xxxxxxx - Change type of AVComponentDescriptor fields from uint16_t to int
21 and drop bit packing.21 and drop bit packing.
22 xxxxxxx - Add step, offset, and depth to AVComponentDescriptor to replace
23 the deprecated step_minus1, offset_plus1, and depth_minus1.
22 24
23-------- 8< --------- FFmpeg 2.8 was cut here -------- 8< ---------25-------- 8< --------- FFmpeg 2.8 was cut here -------- 8< ---------
24 26
libavcodec/hevc.c+1−1
@@ -2821,7 +2821,7 @@ static int verify_md5(HEVCContext *s, AVFrame *frame) · 2820 unmodified lines
2821 if (!desc)2821 if (!desc)
2822 return AVERROR(EINVAL);2822 return AVERROR(EINVAL);
2823 2823
2824 pixel_shift = desc->comp[0].depth_minus1 > 7;2824 pixel_shift = desc->comp[0].depth > 8;
2825 2825
2826 av_log(s->avctx, AV_LOG_DEBUG, "Verifying checksum for frame with POC %d: ",2826 av_log(s->avctx, AV_LOG_DEBUG, "Verifying checksum for frame with POC %d: ",
2827 s->poc);2827 s->poc);
libavcodec/hevc_refs.c+1−1
@@ -206,7 +206,7 @@ int ff_hevc_output_frame(HEVCContext *s, AVFrame *out, int flush) · 205 unmodified lines
206 AVFrame *dst = out;206 AVFrame *dst = out;
207 AVFrame *src = frame->frame;207 AVFrame *src = frame->frame;
208 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(src->format);208 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(src->format);
209 int pixel_shift = !!(desc->comp[0].depth_minus1 > 7);209 int pixel_shift = !!(desc->comp[0].depth > 8);
210 210
211 ret = av_frame_ref(out, src);211 ret = av_frame_ref(out, src);
212 if (frame->flags & HEVC_FRAME_FLAG_BUMPING)212 if (frame->flags & HEVC_FRAME_FLAG_BUMPING)
libavcodec/libopenjpegdec.c+5−5
@@ -114,22 +114,22 @@ static inline int libopenjpeg_matches_pix_fmt(const opj_image_t *image, enum AVP · 113 unmodified lines
114 switch (desc->nb_components) {114 switch (desc->nb_components) {
115 case 4:115 case 4:
116 match = match &&116 match = match &&
117 desc->comp[3].depth_minus1 + 1 >= image->comps[3].prec &&117 desc->comp[3].depth >= image->comps[3].prec &&
118 1 == image->comps[3].dx &&118 1 == image->comps[3].dx &&
119 1 == image->comps[3].dy;119 1 == image->comps[3].dy;
120 case 3:120 case 3:
121 match = match &&121 match = match &&
122 desc->comp[2].depth_minus1 + 1 >= image->comps[2].prec &&122 desc->comp[2].depth >= image->comps[2].prec &&
123 1 << desc->log2_chroma_w == image->comps[2].dx &&123 1 << desc->log2_chroma_w == image->comps[2].dx &&
124 1 << desc->log2_chroma_h == image->comps[2].dy;124 1 << desc->log2_chroma_h == image->comps[2].dy;
125 case 2:125 case 2:
126 match = match &&126 match = match &&
127 desc->comp[1].depth_minus1 + 1 >= image->comps[1].prec &&127 desc->comp[1].depth >= image->comps[1].prec &&
128 1 << desc->log2_chroma_w == image->comps[1].dx &&128 1 << desc->log2_chroma_w == image->comps[1].dx &&
129 1 << desc->log2_chroma_h == image->comps[1].dy;129 1 << desc->log2_chroma_h == image->comps[1].dy;
130 case 1:130 case 1:
131 match = match &&131 match = match &&
132 desc->comp[0].depth_minus1 + 1 >= image->comps[0].prec &&132 desc->comp[0].depth >= image->comps[0].prec &&
133 1 == image->comps[0].dx &&133 1 == image->comps[0].dx &&
134 1 == image->comps[0].dy;134 1 == image->comps[0].dy;
135 default:135 default:
@@ -388,7 +388,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx, · 252 unmodified lines
388 }388 }
389 389
390 desc = av_pix_fmt_desc_get(avctx->pix_fmt);390 desc = av_pix_fmt_desc_get(avctx->pix_fmt);
391 pixel_size = desc->comp[0].step_minus1 + 1;391 pixel_size = desc->comp[0].step;
392 ispacked = libopenjpeg_ispacked(avctx->pix_fmt);392 ispacked = libopenjpeg_ispacked(avctx->pix_fmt);
393 393
394 switch (pixel_size) {394 switch (pixel_size) {
libavcodec/libopenjpegenc.c+2−2
@@ -189,8 +189,8 @@ static opj_image_t *mj2_create_image(AVCodecContext *avctx, opj_cparameters_t *p · 188 unmodified lines
189 }189 }
190 190
191 for (i = 0; i < numcomps; i++) {191 for (i = 0; i < numcomps; i++) {
192 cmptparm[i].prec = desc->comp[i].depth_minus1 + 1;192 cmptparm[i].prec = desc->comp[i].depth;
193 cmptparm[i].bpp = desc->comp[i].depth_minus1 + 1;193 cmptparm[i].bpp = desc->comp[i].depth;
194 cmptparm[i].sgnd = 0;194 cmptparm[i].sgnd = 0;
195 cmptparm[i].dx = sub_dx[i];195 cmptparm[i].dx = sub_dx[i];
196 cmptparm[i].dy = sub_dy[i];196 cmptparm[i].dy = sub_dy[i];
libavcodec/libx265.c+2−2
@@ -78,7 +78,7 @@ static av_cold int libx265_encode_init(AVCodecContext *avctx) · 77 unmodified lines
78{78{
79 libx265Context *ctx = avctx->priv_data;79 libx265Context *ctx = avctx->priv_data;
80 80
81 ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1);81 ctx->api = x265_api_get(av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth);
82 if (!ctx->api)82 if (!ctx->api)
83 ctx->api = x265_api_get(0);83 ctx->api = x265_api_get(0);
84 84
@@ -261,7 +261,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 176 unmodified lines
261 }261 }
262 262
263 x265pic.pts = pic->pts;263 x265pic.pts = pic->pts;
264 x265pic.bitDepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1;264 x265pic.bitDepth = av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth;
265 265
266 x265pic.sliceType = pic->pict_type == AV_PICTURE_TYPE_I ? X265_TYPE_I :266 x265pic.sliceType = pic->pict_type == AV_PICTURE_TYPE_I ? X265_TYPE_I :
267 pic->pict_type == AV_PICTURE_TYPE_P ? X265_TYPE_P :267 pic->pict_type == AV_PICTURE_TYPE_P ? X265_TYPE_P :
libavcodec/pnmenc.c+1−1
@@ -83,7 +83,7 @@ static int pnm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, · 82 unmodified lines
83 "P%c\n%d %d\n", c, avctx->width, h1);83 "P%c\n%d %d\n", c, avctx->width, h1);
84 bytestream += strlen(bytestream);84 bytestream += strlen(bytestream);
85 if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) {85 if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) {
86 int maxdepth = (1 << (av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth_minus1 + 1)) - 1;86 int maxdepth = (1 << av_pix_fmt_desc_get(avctx->pix_fmt)->comp[0].depth) - 1;
87 snprintf(bytestream, bytestream_end - bytestream,87 snprintf(bytestream, bytestream_end - bytestream,
88 "%d\n", maxdepth);88 "%d\n", maxdepth);
89 bytestream += strlen(bytestream);89 bytestream += strlen(bytestream);
libavfilter/vf_hqdn3d.c+1−1
@@ -269,7 +269,7 @@ static int config_input(AVFilterLink *inlink) · 268 unmodified lines
269 269
270 s->hsub = desc->log2_chroma_w;270 s->hsub = desc->log2_chroma_w;
271 s->vsub = desc->log2_chroma_h;271 s->vsub = desc->log2_chroma_h;
272 s->depth = desc->comp[0].depth_minus1+1;272 s->depth = desc->comp[0].depth;
273 273
274 s->line = av_malloc_array(inlink->w, sizeof(*s->line));274 s->line = av_malloc_array(inlink->w, sizeof(*s->line));
275 if (!s->line)275 if (!s->line)
libavfilter/vf_yadif.c+2−2
@@ -186,7 +186,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) · 185 unmodified lines
186 YADIFContext *s = ctx->priv;186 YADIFContext *s = ctx->priv;
187 ThreadData *td = arg;187 ThreadData *td = arg;
188 int refs = s->cur->linesize[td->plane];188 int refs = s->cur->linesize[td->plane];
189 int df = (s->csp->comp[td->plane].depth_minus1 + 8) / 8;189 int df = (s->csp->comp[td->plane].depth + 7) / 8;
190 int pix_3 = 3 * df;190 int pix_3 = 3 * df;
191 int slice_start = (td->h * jobnr ) / nb_jobs;191 int slice_start = (td->h * jobnr ) / nb_jobs;
192 int slice_end = (td->h * (jobnr+1)) / nb_jobs;192 int slice_end = (td->h * (jobnr+1)) / nb_jobs;
@@ -486,7 +486,7 @@ static int config_props(AVFilterLink *link) · 293 unmodified lines
486 }486 }
487 487
488 s->csp = av_pix_fmt_desc_get(link->format);488 s->csp = av_pix_fmt_desc_get(link->format);
489 if (s->csp->comp[0].depth_minus1 / 8 == 1) {489 if (s->csp->comp[0].depth > 8) {
490 s->filter_line = filter_line_c_16bit;490 s->filter_line = filter_line_c_16bit;
491 s->filter_edges = filter_edges_16bit;491 s->filter_edges = filter_edges_16bit;
492 } else {492 } else {
libavutil/imgutils.c+2−2
@@ -41,8 +41,8 @@ void av_image_fill_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4], · 40 unmodified lines
41 41
42 for (i = 0; i < 4; i++) {42 for (i = 0; i < 4; i++) {
43 const AVComponentDescriptor *comp = &(pixdesc->comp[i]);43 const AVComponentDescriptor *comp = &(pixdesc->comp[i]);
44 if ((comp->step_minus1+1) > max_pixsteps[comp->plane]) {44 if (comp->step > max_pixsteps[comp->plane]) {
45 max_pixsteps[comp->plane] = comp->step_minus1+1;45 max_pixsteps[comp->plane] = comp->step;
46 if (max_pixstep_comps)46 if (max_pixstep_comps)
47 max_pixstep_comps[comp->plane] = i;47 max_pixstep_comps[comp->plane] = i;
48 }48 }
libavutil/pixdesc.c+454−448
@@ -39,14 +39,14 @@ void av_read_image_line(uint16_t *dst, · 38 unmodified lines
39{39{
40 AVComponentDescriptor comp = desc->comp[c];40 AVComponentDescriptor comp = desc->comp[c];
41 int plane = comp.plane;41 int plane = comp.plane;
42 int depth = comp.depth_minus1 + 1;42 int depth = comp.depth;
43 int mask = (1 << depth) - 1;43 int mask = (1 << depth) - 1;
44 int shift = comp.shift;44 int shift = comp.shift;
45 int step = comp.step_minus1 + 1;45 int step = comp.step;
46 int flags = desc->flags;46 int flags = desc->flags;
47 47
48 if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {48 if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
49 int skip = x * step + comp.offset_plus1 - 1;49 int skip = x * step + comp.offset;
50 const uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);50 const uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);
51 int shift = 8 - depth - (skip & 7);51 int shift = 8 - depth - (skip & 7);
52 52
@@ -61,7 +61,7 @@ void av_read_image_line(uint16_t *dst, · 8 unmodified lines
61 }61 }
62 } else {62 } else {
63 const uint8_t *p = data[plane] + y * linesize[plane] +63 const uint8_t *p = data[plane] + y * linesize[plane] +
64 x * step + comp.offset_plus1 - 1;64 x * step + comp.offset;
65 int is_8bit = shift + depth <= 8;65 int is_8bit = shift + depth <= 8;
66 66
67 if (is_8bit)67 if (is_8bit)
@@ -86,12 +86,12 @@ void av_write_image_line(const uint16_t *src, · 18 unmodified lines
86{86{
87 AVComponentDescriptor comp = desc->comp[c];87 AVComponentDescriptor comp = desc->comp[c];
88 int plane = comp.plane;88 int plane = comp.plane;
89 int depth = comp.depth_minus1 + 1;89 int depth = comp.depth;
90 int step = comp.step_minus1 + 1;90 int step = comp.step;
91 int flags = desc->flags;91 int flags = desc->flags;
92 92
93 if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {93 if (flags & AV_PIX_FMT_FLAG_BITSTREAM) {
94 int skip = x * step + comp.offset_plus1 - 1;94 int skip = x * step + comp.offset;
95 uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);95 uint8_t *p = data[plane] + y * linesize[plane] + (skip >> 3);
96 int shift = 8 - depth - (skip & 7);96 int shift = 8 - depth - (skip & 7);
97 97
@@ -104,7 +104,7 @@ void av_write_image_line(const uint16_t *src, · 6 unmodified lines
104 } else {104 } else {
105 int shift = comp.shift;105 int shift = comp.shift;
106 uint8_t *p = data[plane] + y * linesize[plane] +106 uint8_t *p = data[plane] + y * linesize[plane] +
107 x * step + comp.offset_plus1 - 1;107 x * step + comp.offset;
108 108
109 if (shift + depth <= 8) {109 if (shift + depth <= 8) {
110 p += !!(flags & AV_PIX_FMT_FLAG_BE);110 p += !!(flags & AV_PIX_FMT_FLAG_BE);
@@ -127,6 +127,9 @@ void av_write_image_line(const uint16_t *src, · 16 unmodified lines
127 }127 }
128}128}
129 129
130#if FF_API_PLUS1_MINUS1
131FF_DISABLE_DEPRECATION_WARNINGS
132#endif
130static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {133static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = {
131 [AV_PIX_FMT_YUV420P] = {134 [AV_PIX_FMT_YUV420P] = {
132 .name = "yuv420p",135 .name = "yuv420p",
@@ -134,9 +137,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1 unmodified line
134 .log2_chroma_w = 1,137 .log2_chroma_w = 1,
135 .log2_chroma_h = 1,138 .log2_chroma_h = 1,
136 .comp = {139 .comp = {
137 { 0, 0, 1, 0, 7 }, /* Y */140 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
138 { 1, 0, 1, 0, 7 }, /* U */141 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
139 { 2, 0, 1, 0, 7 }, /* V */142 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
140 },143 },
141 .flags = AV_PIX_FMT_FLAG_PLANAR,144 .flags = AV_PIX_FMT_FLAG_PLANAR,
142 },145 },
@@ -146,9 +149,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
146 .log2_chroma_w = 1,149 .log2_chroma_w = 1,
147 .log2_chroma_h = 0,150 .log2_chroma_h = 0,
148 .comp = {151 .comp = {
149 { 0, 1, 1, 0, 7 }, /* Y */152 { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
150 { 0, 3, 2, 0, 7 }, /* U */153 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* U */
151 { 0, 3, 4, 0, 7 }, /* V */154 { 0, 4, 3, 0, 8, 3, 7, 4 }, /* V */
152 },155 },
153 },156 },
154 [AV_PIX_FMT_YVYU422] = {157 [AV_PIX_FMT_YVYU422] = {
@@ -157,9 +160,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
157 .log2_chroma_w = 1,160 .log2_chroma_w = 1,
158 .log2_chroma_h = 0,161 .log2_chroma_h = 0,
159 .comp = {162 .comp = {
160 { 0, 1, 1, 0, 7 }, /* Y */163 { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
161 { 0, 3, 2, 0, 7 }, /* V */164 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* V */
162 { 0, 3, 4, 0, 7 }, /* U */165 { 0, 4, 3, 0, 8, 3, 7, 4 }, /* U */
163 },166 },
164 },167 },
165 [AV_PIX_FMT_RGB24] = {168 [AV_PIX_FMT_RGB24] = {
@@ -168,9 +171,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
168 .log2_chroma_w = 0,171 .log2_chroma_w = 0,
169 .log2_chroma_h = 0,172 .log2_chroma_h = 0,
170 .comp = {173 .comp = {
171 { 0, 2, 1, 0, 7 }, /* R */174 { 0, 3, 0, 0, 8, 2, 7, 1 }, /* R */
172 { 0, 2, 2, 0, 7 }, /* G */175 { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */
173 { 0, 2, 3, 0, 7 }, /* B */176 { 0, 3, 2, 0, 8, 2, 7, 3 }, /* B */
174 },177 },
175 .flags = AV_PIX_FMT_FLAG_RGB,178 .flags = AV_PIX_FMT_FLAG_RGB,
176 },179 },
@@ -180,9 +183,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
180 .log2_chroma_w = 0,183 .log2_chroma_w = 0,
181 .log2_chroma_h = 0,184 .log2_chroma_h = 0,
182 .comp = {185 .comp = {
183 { 0, 2, 3, 0, 7 }, /* R */186 { 0, 3, 2, 0, 8, 2, 7, 3 }, /* R */
184 { 0, 2, 2, 0, 7 }, /* G */187 { 0, 3, 1, 0, 8, 2, 7, 2 }, /* G */
185 { 0, 2, 1, 0, 7 }, /* B */188 { 0, 3, 0, 0, 8, 2, 7, 1 }, /* B */
186 },189 },
187 .flags = AV_PIX_FMT_FLAG_RGB,190 .flags = AV_PIX_FMT_FLAG_RGB,
188 },191 },
@@ -192,9 +195,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
192 .log2_chroma_w = 1,195 .log2_chroma_w = 1,
193 .log2_chroma_h = 0,196 .log2_chroma_h = 0,
194 .comp = {197 .comp = {
195 { 0, 0, 1, 0, 7 }, /* Y */198 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
196 { 1, 0, 1, 0, 7 }, /* U */199 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
197 { 2, 0, 1, 0, 7 }, /* V */200 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
198 },201 },
199 .flags = AV_PIX_FMT_FLAG_PLANAR,202 .flags = AV_PIX_FMT_FLAG_PLANAR,
200 },203 },
@@ -204,9 +207,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
204 .log2_chroma_w = 0,207 .log2_chroma_w = 0,
205 .log2_chroma_h = 0,208 .log2_chroma_h = 0,
206 .comp = {209 .comp = {
207 { 0, 0, 1, 0, 7 }, /* Y */210 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
208 { 1, 0, 1, 0, 7 }, /* U */211 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
209 { 2, 0, 1, 0, 7 }, /* V */212 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
210 },213 },
211 .flags = AV_PIX_FMT_FLAG_PLANAR,214 .flags = AV_PIX_FMT_FLAG_PLANAR,
212 },215 },
@@ -216,9 +219,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
216 .log2_chroma_w = 2,219 .log2_chroma_w = 2,
217 .log2_chroma_h = 2,220 .log2_chroma_h = 2,
218 .comp = {221 .comp = {
219 { 0, 0, 1, 0, 7 }, /* Y */222 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
220 { 1, 0, 1, 0, 7 }, /* U */223 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
221 { 2, 0, 1, 0, 7 }, /* V */224 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
222 },225 },
223 .flags = AV_PIX_FMT_FLAG_PLANAR,226 .flags = AV_PIX_FMT_FLAG_PLANAR,
224 },227 },
@@ -228,9 +231,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
228 .log2_chroma_w = 2,231 .log2_chroma_w = 2,
229 .log2_chroma_h = 0,232 .log2_chroma_h = 0,
230 .comp = {233 .comp = {
231 { 0, 0, 1, 0, 7 }, /* Y */234 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
232 { 1, 0, 1, 0, 7 }, /* U */235 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
233 { 2, 0, 1, 0, 7 }, /* V */236 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
234 },237 },
235 .flags = AV_PIX_FMT_FLAG_PLANAR,238 .flags = AV_PIX_FMT_FLAG_PLANAR,
236 },239 },
@@ -240,9 +243,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
240 .log2_chroma_w = 2,243 .log2_chroma_w = 2,
241 .log2_chroma_h = 0,244 .log2_chroma_h = 0,
242 .comp = {245 .comp = {
243 { 0, 0, 1, 0, 7 }, /* Y */246 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
244 { 1, 0, 1, 0, 7 }, /* U */247 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
245 { 2, 0, 1, 0, 7 }, /* V */248 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
246 },249 },
247 .flags = AV_PIX_FMT_FLAG_PLANAR,250 .flags = AV_PIX_FMT_FLAG_PLANAR,
248 },251 },
@@ -252,7 +255,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
252 .log2_chroma_w = 0,255 .log2_chroma_w = 0,
253 .log2_chroma_h = 0,256 .log2_chroma_h = 0,
254 .comp = {257 .comp = {
255 { 0, 0, 1, 0, 7 }, /* Y */258 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
256 },259 },
257 .flags = AV_PIX_FMT_FLAG_PSEUDOPAL,260 .flags = AV_PIX_FMT_FLAG_PSEUDOPAL,
258 .alias = "gray8,y8",261 .alias = "gray8,y8",
@@ -263,7 +266,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
263 .log2_chroma_w = 0,266 .log2_chroma_w = 0,
264 .log2_chroma_h = 0,267 .log2_chroma_h = 0,
265 .comp = {268 .comp = {
266 { 0, 0, 1, 0, 0 }, /* Y */269 { 0, 1, 0, 0, 1, 0, 0, 1 }, /* Y */
267 },270 },
268 .flags = AV_PIX_FMT_FLAG_BITSTREAM,271 .flags = AV_PIX_FMT_FLAG_BITSTREAM,
269 },272 },
@@ -273,7 +276,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
273 .log2_chroma_w = 0,276 .log2_chroma_w = 0,
274 .log2_chroma_h = 0,277 .log2_chroma_h = 0,
275 .comp = {278 .comp = {
276 { 0, 0, 1, 7, 0 }, /* Y */279 { 0, 1, 0, 7, 1, 0, 0, 1 }, /* Y */
277 },280 },
278 .flags = AV_PIX_FMT_FLAG_BITSTREAM,281 .flags = AV_PIX_FMT_FLAG_BITSTREAM,
279 },282 },
@@ -283,7 +286,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
283 .log2_chroma_w = 0,286 .log2_chroma_w = 0,
284 .log2_chroma_h = 0,287 .log2_chroma_h = 0,
285 .comp = {288 .comp = {
286 { 0, 0, 1, 0, 7 },289 { 0, 1, 0, 0, 8, 0, 7, 1 },
287 },290 },
288 .flags = AV_PIX_FMT_FLAG_PAL,291 .flags = AV_PIX_FMT_FLAG_PAL,
289 },292 },
@@ -293,9 +296,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
293 .log2_chroma_w = 1,296 .log2_chroma_w = 1,
294 .log2_chroma_h = 1,297 .log2_chroma_h = 1,
295 .comp = {298 .comp = {
296 { 0, 0, 1, 0, 7 }, /* Y */299 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
297 { 1, 0, 1, 0, 7 }, /* U */300 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
298 { 2, 0, 1, 0, 7 }, /* V */301 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
299 },302 },
300 .flags = AV_PIX_FMT_FLAG_PLANAR,303 .flags = AV_PIX_FMT_FLAG_PLANAR,
301 },304 },
@@ -305,9 +308,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
305 .log2_chroma_w = 1,308 .log2_chroma_w = 1,
306 .log2_chroma_h = 0,309 .log2_chroma_h = 0,
307 .comp = {310 .comp = {
308 { 0, 0, 1, 0, 7 }, /* Y */311 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
309 { 1, 0, 1, 0, 7 }, /* U */312 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
310 { 2, 0, 1, 0, 7 }, /* V */313 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
311 },314 },
312 .flags = AV_PIX_FMT_FLAG_PLANAR,315 .flags = AV_PIX_FMT_FLAG_PLANAR,
313 },316 },
@@ -317,9 +320,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
317 .log2_chroma_w = 0,320 .log2_chroma_w = 0,
318 .log2_chroma_h = 0,321 .log2_chroma_h = 0,
319 .comp = {322 .comp = {
320 { 0, 0, 1, 0, 7 }, /* Y */323 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
321 { 1, 0, 1, 0, 7 }, /* U */324 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
322 { 2, 0, 1, 0, 7 }, /* V */325 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
323 },326 },
324 .flags = AV_PIX_FMT_FLAG_PLANAR,327 .flags = AV_PIX_FMT_FLAG_PLANAR,
325 },328 },
@@ -345,9 +348,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 19 unmodified lines
345 .log2_chroma_w = 1,348 .log2_chroma_w = 1,
346 .log2_chroma_h = 0,349 .log2_chroma_h = 0,
347 .comp = {350 .comp = {
348 { 0, 1, 2, 0, 7 }, /* Y */351 { 0, 2, 1, 0, 8, 1, 7, 2 }, /* Y */
349 { 0, 3, 1, 0, 7 }, /* U */352 { 0, 4, 0, 0, 8, 3, 7, 1 }, /* U */
350 { 0, 3, 3, 0, 7 }, /* V */353 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* V */
351 },354 },
352 },355 },
353 [AV_PIX_FMT_UYYVYY411] = {356 [AV_PIX_FMT_UYYVYY411] = {
@@ -356,9 +359,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
356 .log2_chroma_w = 2,359 .log2_chroma_w = 2,
357 .log2_chroma_h = 0,360 .log2_chroma_h = 0,
358 .comp = {361 .comp = {
359 { 0, 3, 2, 0, 7 }, /* Y */362 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* Y */
360 { 0, 5, 1, 0, 7 }, /* U */363 { 0, 6, 0, 0, 8, 5, 7, 1 }, /* U */
361 { 0, 5, 4, 0, 7 }, /* V */364 { 0, 6, 3, 0, 8, 5, 7, 4 }, /* V */
362 },365 },
363 },366 },
364 [AV_PIX_FMT_BGR8] = {367 [AV_PIX_FMT_BGR8] = {
@@ -367,9 +370,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
367 .log2_chroma_w = 0,370 .log2_chroma_w = 0,
368 .log2_chroma_h = 0,371 .log2_chroma_h = 0,
369 .comp = {372 .comp = {
370 { 0, 0, 1, 0, 2 }, /* R */373 { 0, 1, 0, 0, 3, 0, 2, 1 }, /* R */
371 { 0, 0, 1, 3, 2 }, /* G */374 { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */
372 { 0, 0, 1, 6, 1 }, /* B */375 { 0, 1, 0, 6, 2, 0, 1, 1 }, /* B */
373 },376 },
374 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,377 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
375 },378 },
@@ -379,9 +382,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
379 .log2_chroma_w = 0,382 .log2_chroma_w = 0,
380 .log2_chroma_h = 0,383 .log2_chroma_h = 0,
381 .comp = {384 .comp = {
382 { 0, 3, 4, 0, 0 }, /* R */385 { 0, 4, 3, 0, 1, 3, 0, 4 }, /* R */
383 { 0, 3, 2, 0, 1 }, /* G */386 { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */
384 { 0, 3, 1, 0, 0 }, /* B */387 { 0, 4, 0, 0, 1, 3, 0, 1 }, /* B */
385 },388 },
386 .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,389 .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,
387 },390 },
@@ -391,9 +394,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
391 .log2_chroma_w = 0,394 .log2_chroma_w = 0,
392 .log2_chroma_h = 0,395 .log2_chroma_h = 0,
393 .comp = {396 .comp = {
394 { 0, 0, 1, 0, 0 }, /* R */397 { 0, 1, 0, 0, 1, 0, 0, 1 }, /* R */
395 { 0, 0, 1, 1, 1 }, /* G */398 { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */
396 { 0, 0, 1, 3, 0 }, /* B */399 { 0, 1, 0, 3, 1, 0, 0, 1 }, /* B */
397 },400 },
398 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,401 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
399 },402 },
@@ -403,9 +406,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
403 .log2_chroma_w = 0,406 .log2_chroma_w = 0,
404 .log2_chroma_h = 0,407 .log2_chroma_h = 0,
405 .comp = {408 .comp = {
406 { 0, 0, 1, 6, 1 }, /* R */409 { 0, 1, 0, 6, 2, 0, 1, 1 }, /* R */
407 { 0, 0, 1, 3, 2 }, /* G */410 { 0, 1, 0, 3, 3, 0, 2, 1 }, /* G */
408 { 0, 0, 1, 0, 2 }, /* B */411 { 0, 1, 0, 0, 3, 0, 2, 1 }, /* B */
409 },412 },
410 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,413 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
411 },414 },
@@ -415,9 +418,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
415 .log2_chroma_w = 0,418 .log2_chroma_w = 0,
416 .log2_chroma_h = 0,419 .log2_chroma_h = 0,
417 .comp = {420 .comp = {
418 { 0, 3, 1, 0, 0 }, /* R */421 { 0, 4, 0, 0, 1, 3, 0, 1 }, /* R */
419 { 0, 3, 2, 0, 1 }, /* G */422 { 0, 4, 1, 0, 2, 3, 1, 2 }, /* G */
420 { 0, 3, 4, 0, 0 }, /* B */423 { 0, 4, 3, 0, 1, 3, 0, 4 }, /* B */
421 },424 },
422 .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,425 .flags = AV_PIX_FMT_FLAG_BITSTREAM | AV_PIX_FMT_FLAG_RGB,
423 },426 },
@@ -427,9 +430,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
427 .log2_chroma_w = 0,430 .log2_chroma_w = 0,
428 .log2_chroma_h = 0,431 .log2_chroma_h = 0,
429 .comp = {432 .comp = {
430 { 0, 0, 1, 3, 0 }, /* R */433 { 0, 1, 0, 3, 1, 0, 0, 1 }, /* R */
431 { 0, 0, 1, 1, 1 }, /* G */434 { 0, 1, 0, 1, 2, 0, 1, 1 }, /* G */
432 { 0, 0, 1, 0, 0 }, /* B */435 { 0, 1, 0, 0, 1, 0, 0, 1 }, /* B */
433 },436 },
434 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,437 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_PSEUDOPAL,
435 },438 },
@@ -439,9 +442,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
439 .log2_chroma_w = 1,442 .log2_chroma_w = 1,
440 .log2_chroma_h = 1,443 .log2_chroma_h = 1,
441 .comp = {444 .comp = {
442 { 0, 0, 1, 0, 7 }, /* Y */445 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
443 { 1, 1, 1, 0, 7 }, /* U */446 { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
444 { 1, 1, 2, 0, 7 }, /* V */447 { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
445 },448 },
446 .flags = AV_PIX_FMT_FLAG_PLANAR,449 .flags = AV_PIX_FMT_FLAG_PLANAR,
447 },450 },
@@ -451,9 +454,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
451 .log2_chroma_w = 1,454 .log2_chroma_w = 1,
452 .log2_chroma_h = 1,455 .log2_chroma_h = 1,
453 .comp = {456 .comp = {
454 { 0, 0, 1, 0, 7 }, /* Y */457 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
455 { 1, 1, 2, 0, 7 }, /* U */458 { 1, 2, 1, 0, 8, 1, 7, 2 }, /* U */
456 { 1, 1, 1, 0, 7 }, /* V */459 { 1, 2, 0, 0, 8, 1, 7, 1 }, /* V */
457 },460 },
458 .flags = AV_PIX_FMT_FLAG_PLANAR,461 .flags = AV_PIX_FMT_FLAG_PLANAR,
459 },462 },
@@ -463,10 +466,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
463 .log2_chroma_w = 0,466 .log2_chroma_w = 0,
464 .log2_chroma_h = 0,467 .log2_chroma_h = 0,
465 .comp = {468 .comp = {
466 { 0, 3, 2, 0, 7 }, /* R */469 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */
467 { 0, 3, 3, 0, 7 }, /* G */470 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
468 { 0, 3, 4, 0, 7 }, /* B */471 { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */
469 { 0, 3, 1, 0, 7 }, /* A */472 { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
470 },473 },
471 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,474 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
472 },475 },
@@ -476,10 +479,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
476 .log2_chroma_w = 0,479 .log2_chroma_w = 0,
477 .log2_chroma_h = 0,480 .log2_chroma_h = 0,
478 .comp = {481 .comp = {
479 { 0, 3, 1, 0, 7 }, /* R */482 { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */
480 { 0, 3, 2, 0, 7 }, /* G */483 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
481 { 0, 3, 3, 0, 7 }, /* B */484 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */
482 { 0, 3, 4, 0, 7 }, /* A */485 { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */
483 },486 },
484 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,487 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
485 },488 },
@@ -489,10 +492,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
489 .log2_chroma_w = 0,492 .log2_chroma_w = 0,
490 .log2_chroma_h = 0,493 .log2_chroma_h = 0,
491 .comp = {494 .comp = {
492 { 0, 3, 4, 0, 7 }, /* R */495 { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */
493 { 0, 3, 3, 0, 7 }, /* G */496 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
494 { 0, 3, 2, 0, 7 }, /* B */497 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */
495 { 0, 3, 1, 0, 7 }, /* A */498 { 0, 4, 0, 0, 8, 3, 7, 1 }, /* A */
496 },499 },
497 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,500 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
498 },501 },
@@ -502,10 +505,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
502 .log2_chroma_w = 0,505 .log2_chroma_w = 0,
503 .log2_chroma_h = 0,506 .log2_chroma_h = 0,
504 .comp = {507 .comp = {
505 { 0, 3, 3, 0, 7 }, /* R */508 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */
506 { 0, 3, 2, 0, 7 }, /* G */509 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
507 { 0, 3, 1, 0, 7 }, /* B */510 { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */
508 { 0, 3, 4, 0, 7 }, /* A */511 { 0, 4, 3, 0, 8, 3, 7, 4 }, /* A */
509 },512 },
510 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,513 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
511 },514 },
@@ -515,9 +518,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
515 .log2_chroma_w= 0,518 .log2_chroma_w= 0,
516 .log2_chroma_h= 0,519 .log2_chroma_h= 0,
517 .comp = {520 .comp = {
518 { 0, 3, 2, 0, 7 }, /* R */521 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* R */
519 { 0, 3, 3, 0, 7 }, /* G */522 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
520 { 0, 3, 4, 0, 7 }, /* B */523 { 0, 4, 3, 0, 8, 3, 7, 4 }, /* B */
521 },524 },
522 .flags = AV_PIX_FMT_FLAG_RGB,525 .flags = AV_PIX_FMT_FLAG_RGB,
523 },526 },
@@ -527,9 +530,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
527 .log2_chroma_w= 0,530 .log2_chroma_w= 0,
528 .log2_chroma_h= 0,531 .log2_chroma_h= 0,
529 .comp = {532 .comp = {
530 { 0, 3, 1, 0, 7 }, /* R */533 { 0, 4, 0, 0, 8, 3, 7, 1 }, /* R */
531 { 0, 3, 2, 0, 7 }, /* G */534 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
532 { 0, 3, 3, 0, 7 }, /* B */535 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* B */
533 },536 },
534 .flags = AV_PIX_FMT_FLAG_RGB,537 .flags = AV_PIX_FMT_FLAG_RGB,
535 },538 },
@@ -539,9 +542,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
539 .log2_chroma_w= 0,542 .log2_chroma_w= 0,
540 .log2_chroma_h= 0,543 .log2_chroma_h= 0,
541 .comp = {544 .comp = {
542 { 0, 3, 4, 0, 7 }, /* R */545 { 0, 4, 3, 0, 8, 3, 7, 4 }, /* R */
543 { 0, 3, 3, 0, 7 }, /* G */546 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* G */
544 { 0, 3, 2, 0, 7 }, /* B */547 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* B */
545 },548 },
546 .flags = AV_PIX_FMT_FLAG_RGB,549 .flags = AV_PIX_FMT_FLAG_RGB,
547 },550 },
@@ -551,9 +554,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
551 .log2_chroma_w= 0,554 .log2_chroma_w= 0,
552 .log2_chroma_h= 0,555 .log2_chroma_h= 0,
553 .comp = {556 .comp = {
554 { 0, 3, 3, 0, 7 }, /* R */557 { 0, 4, 2, 0, 8, 3, 7, 3 }, /* R */
555 { 0, 3, 2, 0, 7 }, /* G */558 { 0, 4, 1, 0, 8, 3, 7, 2 }, /* G */
556 { 0, 3, 1, 0, 7 }, /* B */559 { 0, 4, 0, 0, 8, 3, 7, 1 }, /* B */
557 },560 },
558 .flags = AV_PIX_FMT_FLAG_RGB,561 .flags = AV_PIX_FMT_FLAG_RGB,
559 },562 },
@@ -563,7 +566,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
563 .log2_chroma_w = 0,566 .log2_chroma_w = 0,
564 .log2_chroma_h = 0,567 .log2_chroma_h = 0,
565 .comp = {568 .comp = {
566 { 0, 1, 1, 0, 15 }, /* Y */569 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
567 },570 },
568 .flags = AV_PIX_FMT_FLAG_BE,571 .flags = AV_PIX_FMT_FLAG_BE,
569 .alias = "y16be",572 .alias = "y16be",
@@ -574,7 +577,7 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
574 .log2_chroma_w = 0,577 .log2_chroma_w = 0,
575 .log2_chroma_h = 0,578 .log2_chroma_h = 0,
576 .comp = {579 .comp = {
577 { 0, 1, 1, 0, 15 }, /* Y */580 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
578 },581 },
579 .alias = "y16le",582 .alias = "y16le",
580 },583 },
@@ -584,9 +587,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
584 .log2_chroma_w = 0,587 .log2_chroma_w = 0,
585 .log2_chroma_h = 1,588 .log2_chroma_h = 1,
586 .comp = {589 .comp = {
587 { 0, 0, 1, 0, 7 }, /* Y */590 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
588 { 1, 0, 1, 0, 7 }, /* U */591 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
589 { 2, 0, 1, 0, 7 }, /* V */592 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
590 },593 },
591 .flags = AV_PIX_FMT_FLAG_PLANAR,594 .flags = AV_PIX_FMT_FLAG_PLANAR,
592 },595 },
@@ -596,9 +599,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
596 .log2_chroma_w = 0,599 .log2_chroma_w = 0,
597 .log2_chroma_h = 1,600 .log2_chroma_h = 1,
598 .comp = {601 .comp = {
599 { 0, 0, 1, 0, 7 }, /* Y */602 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
600 { 1, 0, 1, 0, 7 }, /* U */603 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
601 { 2, 0, 1, 0, 7 }, /* V */604 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
602 },605 },
603 .flags = AV_PIX_FMT_FLAG_PLANAR,606 .flags = AV_PIX_FMT_FLAG_PLANAR,
604 },607 },
@@ -608,9 +611,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
608 .log2_chroma_w = 0,611 .log2_chroma_w = 0,
609 .log2_chroma_h = 1,612 .log2_chroma_h = 1,
610 .comp = {613 .comp = {
611 { 0, 1, 1, 0, 9 }, /* Y */614 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
612 { 1, 1, 1, 0, 9 }, /* U */615 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
613 { 2, 1, 1, 0, 9 }, /* V */616 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
614 },617 },
615 .flags = AV_PIX_FMT_FLAG_PLANAR,618 .flags = AV_PIX_FMT_FLAG_PLANAR,
616 },619 },
@@ -620,9 +623,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
620 .log2_chroma_w = 0,623 .log2_chroma_w = 0,
621 .log2_chroma_h = 1,624 .log2_chroma_h = 1,
622 .comp = {625 .comp = {
623 { 0, 1, 1, 0, 9 }, /* Y */626 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
624 { 1, 1, 1, 0, 9 }, /* U */627 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
625 { 2, 1, 1, 0, 9 }, /* V */628 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
626 },629 },
627 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,630 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
628 },631 },
@@ -632,9 +635,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
632 .log2_chroma_w = 0,635 .log2_chroma_w = 0,
633 .log2_chroma_h = 1,636 .log2_chroma_h = 1,
634 .comp = {637 .comp = {
635 { 0, 1, 1, 0, 11 }, /* Y */638 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
636 { 1, 1, 1, 0, 11 }, /* U */639 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
637 { 2, 1, 1, 0, 11 }, /* V */640 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
638 },641 },
639 .flags = AV_PIX_FMT_FLAG_PLANAR,642 .flags = AV_PIX_FMT_FLAG_PLANAR,
640 },643 },
@@ -644,9 +647,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
644 .log2_chroma_w = 0,647 .log2_chroma_w = 0,
645 .log2_chroma_h = 1,648 .log2_chroma_h = 1,
646 .comp = {649 .comp = {
647 { 0, 1, 1, 0, 11 }, /* Y */650 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
648 { 1, 1, 1, 0, 11 }, /* U */651 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
649 { 2, 1, 1, 0, 11 }, /* V */652 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
650 },653 },
651 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,654 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
652 },655 },
@@ -656,10 +659,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
656 .log2_chroma_w = 1,659 .log2_chroma_w = 1,
657 .log2_chroma_h = 1,660 .log2_chroma_h = 1,
658 .comp = {661 .comp = {
659 { 0, 0, 1, 0, 7 }, /* Y */662 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
660 { 1, 0, 1, 0, 7 }, /* U */663 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
661 { 2, 0, 1, 0, 7 }, /* V */664 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
662 { 3, 0, 1, 0, 7 }, /* A */665 { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
663 },666 },
664 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,667 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
665 },668 },
@@ -669,10 +672,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
669 .log2_chroma_w = 1,672 .log2_chroma_w = 1,
670 .log2_chroma_h = 0,673 .log2_chroma_h = 0,
671 .comp = {674 .comp = {
672 { 0, 0, 1, 0, 7 }, /* Y */675 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
673 { 1, 0, 1, 0, 7 }, /* U */676 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
674 { 2, 0, 1, 0, 7 }, /* V */677 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
675 { 3, 0, 1, 0, 7 }, /* A */678 { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
676 },679 },
677 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,680 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
678 },681 },
@@ -682,10 +685,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
682 .log2_chroma_w = 0,685 .log2_chroma_w = 0,
683 .log2_chroma_h = 0,686 .log2_chroma_h = 0,
684 .comp = {687 .comp = {
685 { 0, 0, 1, 0, 7 }, /* Y */688 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
686 { 1, 0, 1, 0, 7 }, /* U */689 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* U */
687 { 2, 0, 1, 0, 7 }, /* V */690 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* V */
688 { 3, 0, 1, 0, 7 }, /* A */691 { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
689 },692 },
690 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,693 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
691 },694 },
@@ -695,10 +698,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
695 .log2_chroma_w = 1,698 .log2_chroma_w = 1,
696 .log2_chroma_h = 1,699 .log2_chroma_h = 1,
697 .comp = {700 .comp = {
698 { 0, 1, 1, 0, 8 }, /* Y */701 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
699 { 1, 1, 1, 0, 8 }, /* U */702 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
700 { 2, 1, 1, 0, 8 }, /* V */703 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
701 { 3, 1, 1, 0, 8 }, /* A */704 { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
702 },705 },
703 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,706 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
704 },707 },
@@ -708,10 +711,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
708 .log2_chroma_w = 1,711 .log2_chroma_w = 1,
709 .log2_chroma_h = 1,712 .log2_chroma_h = 1,
710 .comp = {713 .comp = {
711 { 0, 1, 1, 0, 8 }, /* Y */714 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
712 { 1, 1, 1, 0, 8 }, /* U */715 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
713 { 2, 1, 1, 0, 8 }, /* V */716 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
714 { 3, 1, 1, 0, 8 }, /* A */717 { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
715 },718 },
716 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,719 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
717 },720 },
@@ -721,10 +724,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
721 .log2_chroma_w = 1,724 .log2_chroma_w = 1,
722 .log2_chroma_h = 0,725 .log2_chroma_h = 0,
723 .comp = {726 .comp = {
724 { 0, 1, 1, 0, 8 }, /* Y */727 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
725 { 1, 1, 1, 0, 8 }, /* U */728 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
726 { 2, 1, 1, 0, 8 }, /* V */729 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
727 { 3, 1, 1, 0, 8 }, /* A */730 { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
728 },731 },
729 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,732 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
730 },733 },
@@ -734,10 +737,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
734 .log2_chroma_w = 1,737 .log2_chroma_w = 1,
735 .log2_chroma_h = 0,738 .log2_chroma_h = 0,
736 .comp = {739 .comp = {
737 { 0, 1, 1, 0, 8 }, /* Y */740 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
738 { 1, 1, 1, 0, 8 }, /* U */741 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
739 { 2, 1, 1, 0, 8 }, /* V */742 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
740 { 3, 1, 1, 0, 8 }, /* A */743 { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
741 },744 },
742 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,745 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
743 },746 },
@@ -747,10 +750,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
747 .log2_chroma_w = 0,750 .log2_chroma_w = 0,
748 .log2_chroma_h = 0,751 .log2_chroma_h = 0,
749 .comp = {752 .comp = {
750 { 0, 1, 1, 0, 8 }, /* Y */753 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
751 { 1, 1, 1, 0, 8 }, /* U */754 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
752 { 2, 1, 1, 0, 8 }, /* V */755 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
753 { 3, 1, 1, 0, 8 }, /* A */756 { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
754 },757 },
755 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,758 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
756 },759 },
@@ -760,10 +763,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
760 .log2_chroma_w = 0,763 .log2_chroma_w = 0,
761 .log2_chroma_h = 0,764 .log2_chroma_h = 0,
762 .comp = {765 .comp = {
763 { 0, 1, 1, 0, 8 }, /* Y */766 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
764 { 1, 1, 1, 0, 8 }, /* U */767 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
765 { 2, 1, 1, 0, 8 }, /* V */768 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
766 { 3, 1, 1, 0, 8 }, /* A */769 { 3, 2, 0, 0, 9, 1, 8, 1 }, /* A */
767 },770 },
768 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,771 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
769 },772 },
@@ -773,10 +776,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
773 .log2_chroma_w = 1,776 .log2_chroma_w = 1,
774 .log2_chroma_h = 1,777 .log2_chroma_h = 1,
775 .comp = {778 .comp = {
776 { 0, 1, 1, 0, 9 }, /* Y */779 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
777 { 1, 1, 1, 0, 9 }, /* U */780 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
778 { 2, 1, 1, 0, 9 }, /* V */781 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
779 { 3, 1, 1, 0, 9 }, /* A */782 { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
780 },783 },
781 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,784 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
782 },785 },
@@ -786,10 +789,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
786 .log2_chroma_w = 1,789 .log2_chroma_w = 1,
787 .log2_chroma_h = 1,790 .log2_chroma_h = 1,
788 .comp = {791 .comp = {
789 { 0, 1, 1, 0, 9 }, /* Y */792 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
790 { 1, 1, 1, 0, 9 }, /* U */793 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
791 { 2, 1, 1, 0, 9 }, /* V */794 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
792 { 3, 1, 1, 0, 9 }, /* A */795 { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
793 },796 },
794 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,797 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
795 },798 },
@@ -799,10 +802,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
799 .log2_chroma_w = 1,802 .log2_chroma_w = 1,
800 .log2_chroma_h = 0,803 .log2_chroma_h = 0,
801 .comp = {804 .comp = {
802 { 0, 1, 1, 0, 9 }, /* Y */805 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
803 { 1, 1, 1, 0, 9 }, /* U */806 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
804 { 2, 1, 1, 0, 9 }, /* V */807 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
805 { 3, 1, 1, 0, 9 }, /* A */808 { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
806 },809 },
807 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,810 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
808 },811 },
@@ -812,10 +815,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
812 .log2_chroma_w = 1,815 .log2_chroma_w = 1,
813 .log2_chroma_h = 0,816 .log2_chroma_h = 0,
814 .comp = {817 .comp = {
815 { 0, 1, 1, 0, 9 }, /* Y */818 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
816 { 1, 1, 1, 0, 9 }, /* U */819 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
817 { 2, 1, 1, 0, 9 }, /* V */820 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
818 { 3, 1, 1, 0, 9 }, /* A */821 { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
819 },822 },
820 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,823 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
821 },824 },
@@ -825,10 +828,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
825 .log2_chroma_w = 0,828 .log2_chroma_w = 0,
826 .log2_chroma_h = 0,829 .log2_chroma_h = 0,
827 .comp = {830 .comp = {
828 { 0, 1, 1, 0, 9 }, /* Y */831 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
829 { 1, 1, 1, 0, 9 }, /* U */832 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
830 { 2, 1, 1, 0, 9 }, /* V */833 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
831 { 3, 1, 1, 0, 9 }, /* A */834 { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
832 },835 },
833 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,836 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
834 },837 },
@@ -838,10 +841,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
838 .log2_chroma_w = 0,841 .log2_chroma_w = 0,
839 .log2_chroma_h = 0,842 .log2_chroma_h = 0,
840 .comp = {843 .comp = {
841 { 0, 1, 1, 0, 9 }, /* Y */844 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
842 { 1, 1, 1, 0, 9 }, /* U */845 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
843 { 2, 1, 1, 0, 9 }, /* V */846 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
844 { 3, 1, 1, 0, 9 }, /* A */847 { 3, 2, 0, 0, 10, 1, 9, 1 }, /* A */
845 },848 },
846 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,849 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
847 },850 },
@@ -851,10 +854,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
851 .log2_chroma_w = 1,854 .log2_chroma_w = 1,
852 .log2_chroma_h = 1,855 .log2_chroma_h = 1,
853 .comp = {856 .comp = {
854 { 0, 1, 1, 0, 15 }, /* Y */857 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
855 { 1, 1, 1, 0, 15 }, /* U */858 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
856 { 2, 1, 1, 0, 15 }, /* V */859 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
857 { 3, 1, 1, 0, 15 }, /* A */860 { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
858 },861 },
859 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,862 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
860 },863 },
@@ -864,10 +867,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
864 .log2_chroma_w = 1,867 .log2_chroma_w = 1,
865 .log2_chroma_h = 1,868 .log2_chroma_h = 1,
866 .comp = {869 .comp = {
867 { 0, 1, 1, 0, 15 }, /* Y */870 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
868 { 1, 1, 1, 0, 15 }, /* U */871 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
869 { 2, 1, 1, 0, 15 }, /* V */872 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
870 { 3, 1, 1, 0, 15 }, /* A */873 { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
871 },874 },
872 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,875 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
873 },876 },
@@ -877,10 +880,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
877 .log2_chroma_w = 1,880 .log2_chroma_w = 1,
878 .log2_chroma_h = 0,881 .log2_chroma_h = 0,
879 .comp = {882 .comp = {
880 { 0, 1, 1, 0, 15 }, /* Y */883 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
881 { 1, 1, 1, 0, 15 }, /* U */884 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
882 { 2, 1, 1, 0, 15 }, /* V */885 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
883 { 3, 1, 1, 0, 15 }, /* A */886 { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
884 },887 },
885 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,888 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
886 },889 },
@@ -890,10 +893,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
890 .log2_chroma_w = 1,893 .log2_chroma_w = 1,
891 .log2_chroma_h = 0,894 .log2_chroma_h = 0,
892 .comp = {895 .comp = {
893 { 0, 1, 1, 0, 15 }, /* Y */896 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
894 { 1, 1, 1, 0, 15 }, /* U */897 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
895 { 2, 1, 1, 0, 15 }, /* V */898 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
896 { 3, 1, 1, 0, 15 }, /* A */899 { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
897 },900 },
898 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,901 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
899 },902 },
@@ -903,10 +906,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
903 .log2_chroma_w = 0,906 .log2_chroma_w = 0,
904 .log2_chroma_h = 0,907 .log2_chroma_h = 0,
905 .comp = {908 .comp = {
906 { 0, 1, 1, 0, 15 }, /* Y */909 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
907 { 1, 1, 1, 0, 15 }, /* U */910 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
908 { 2, 1, 1, 0, 15 }, /* V */911 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
909 { 3, 1, 1, 0, 15 }, /* A */912 { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
910 },913 },
911 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,914 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
912 },915 },
@@ -916,10 +919,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
916 .log2_chroma_w = 0,919 .log2_chroma_w = 0,
917 .log2_chroma_h = 0,920 .log2_chroma_h = 0,
918 .comp = {921 .comp = {
919 { 0, 1, 1, 0, 15 }, /* Y */922 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
920 { 1, 1, 1, 0, 15 }, /* U */923 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
921 { 2, 1, 1, 0, 15 }, /* V */924 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
922 { 3, 1, 1, 0, 15 }, /* A */925 { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
923 },926 },
924 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,927 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_ALPHA,
925 },928 },
@@ -967,9 +970,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 41 unmodified lines
967 .log2_chroma_w = 0,970 .log2_chroma_w = 0,
968 .log2_chroma_h = 0,971 .log2_chroma_h = 0,
969 .comp = {972 .comp = {
970 { 0, 5, 1, 0, 15 }, /* R */973 { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */
971 { 0, 5, 3, 0, 15 }, /* G */974 { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
972 { 0, 5, 5, 0, 15 }, /* B */975 { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */
973 },976 },
974 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE,977 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_BE,
975 },978 },
@@ -979,9 +982,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
979 .log2_chroma_w = 0,982 .log2_chroma_w = 0,
980 .log2_chroma_h = 0,983 .log2_chroma_h = 0,
981 .comp = {984 .comp = {
982 { 0, 5, 1, 0, 15 }, /* R */985 { 0, 6, 0, 0, 16, 5, 15, 1 }, /* R */
983 { 0, 5, 3, 0, 15 }, /* G */986 { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
984 { 0, 5, 5, 0, 15 }, /* B */987 { 0, 6, 4, 0, 16, 5, 15, 5 }, /* B */
985 },988 },
986 .flags = AV_PIX_FMT_FLAG_RGB,989 .flags = AV_PIX_FMT_FLAG_RGB,
987 },990 },
@@ -991,10 +994,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
991 .log2_chroma_w = 0,994 .log2_chroma_w = 0,
992 .log2_chroma_h = 0,995 .log2_chroma_h = 0,
993 .comp = {996 .comp = {
994 { 0, 7, 1, 0, 15 }, /* R */997 { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */
995 { 0, 7, 3, 0, 15 }, /* G */998 { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
996 { 0, 7, 5, 0, 15 }, /* B */999 { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */
997 { 0, 7, 7, 0, 15 }, /* A */1000 { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
998 },1001 },
999 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,1002 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
1000 },1003 },
@@ -1004,10 +1007,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1004 .log2_chroma_w = 0,1007 .log2_chroma_w = 0,
1005 .log2_chroma_h = 0,1008 .log2_chroma_h = 0,
1006 .comp = {1009 .comp = {
1007 { 0, 7, 1, 0, 15 }, /* R */1010 { 0, 8, 0, 0, 16, 7, 15, 1 }, /* R */
1008 { 0, 7, 3, 0, 15 }, /* G */1011 { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
1009 { 0, 7, 5, 0, 15 }, /* B */1012 { 0, 8, 4, 0, 16, 7, 15, 5 }, /* B */
1010 { 0, 7, 7, 0, 15 }, /* A */1013 { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
1011 },1014 },
1012 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,1015 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
1013 },1016 },
@@ -1017,9 +1020,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1017 .log2_chroma_w = 0,1020 .log2_chroma_w = 0,
1018 .log2_chroma_h = 0,1021 .log2_chroma_h = 0,
1019 .comp = {1022 .comp = {
1020 { 0, 1, 0, 3, 4 }, /* R */1023 { 0, 2, -1, 3, 5, 1, 4, 0 }, /* R */
1021 { 0, 1, 1, 5, 5 }, /* G */1024 { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
1022 { 0, 1, 1, 0, 4 }, /* B */1025 { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
1023 },1026 },
1024 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,1027 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
1025 },1028 },
@@ -1029,9 +1032,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1029 .log2_chroma_w = 0,1032 .log2_chroma_w = 0,
1030 .log2_chroma_h = 0,1033 .log2_chroma_h = 0,
1031 .comp = {1034 .comp = {
1032 { 0, 1, 2, 3, 4 }, /* R */1035 { 0, 2, 1, 3, 5, 1, 4, 2 }, /* R */
1033 { 0, 1, 1, 5, 5 }, /* G */1036 { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
1034 { 0, 1, 1, 0, 4 }, /* B */1037 { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
1035 },1038 },
1036 .flags = AV_PIX_FMT_FLAG_RGB,1039 .flags = AV_PIX_FMT_FLAG_RGB,
1037 },1040 },
@@ -1041,9 +1044,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1041 .log2_chroma_w = 0,1044 .log2_chroma_w = 0,
1042 .log2_chroma_h = 0,1045 .log2_chroma_h = 0,
1043 .comp = {1046 .comp = {
1044 { 0, 1, 0, 2, 4 }, /* R */1047 { 0, 2, -1, 2, 5, 1, 4, 0 }, /* R */
1045 { 0, 1, 1, 5, 4 }, /* G */1048 { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
1046 { 0, 1, 1, 0, 4 }, /* B */1049 { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
1047 },1050 },
1048 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,1051 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
1049 },1052 },
@@ -1053,9 +1056,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1053 .log2_chroma_w = 0,1056 .log2_chroma_w = 0,
1054 .log2_chroma_h = 0,1057 .log2_chroma_h = 0,
1055 .comp = {1058 .comp = {
1056 { 0, 1, 2, 2, 4 }, /* R */1059 { 0, 2, 1, 2, 5, 1, 4, 2 }, /* R */
1057 { 0, 1, 1, 5, 4 }, /* G */1060 { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
1058 { 0, 1, 1, 0, 4 }, /* B */1061 { 0, 2, 0, 0, 5, 1, 4, 1 }, /* B */
1059 },1062 },
1060 .flags = AV_PIX_FMT_FLAG_RGB,1063 .flags = AV_PIX_FMT_FLAG_RGB,
1061 },1064 },
@@ -1065,9 +1068,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1065 .log2_chroma_w = 0,1068 .log2_chroma_w = 0,
1066 .log2_chroma_h = 0,1069 .log2_chroma_h = 0,
1067 .comp = {1070 .comp = {
1068 { 0, 1, 0, 0, 3 }, /* R */1071 { 0, 2, -1, 0, 4, 1, 3, 0 }, /* R */
1069 { 0, 1, 1, 4, 3 }, /* G */1072 { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
1070 { 0, 1, 1, 0, 3 }, /* B */1073 { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */
1071 },1074 },
1072 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,1075 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
1073 },1076 },
@@ -1077,9 +1080,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1077 .log2_chroma_w = 0,1080 .log2_chroma_w = 0,
1078 .log2_chroma_h = 0,1081 .log2_chroma_h = 0,
1079 .comp = {1082 .comp = {
1080 { 0, 1, 2, 0, 3 }, /* R */1083 { 0, 2, 1, 0, 4, 1, 3, 2 }, /* R */
1081 { 0, 1, 1, 4, 3 }, /* G */1084 { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
1082 { 0, 1, 1, 0, 3 }, /* B */1085 { 0, 2, 0, 0, 4, 1, 3, 1 }, /* B */
1083 },1086 },
1084 .flags = AV_PIX_FMT_FLAG_RGB,1087 .flags = AV_PIX_FMT_FLAG_RGB,
1085 },1088 },
@@ -1089,9 +1092,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1089 .log2_chroma_w = 0,1092 .log2_chroma_w = 0,
1090 .log2_chroma_h = 0,1093 .log2_chroma_h = 0,
1091 .comp = {1094 .comp = {
1092 { 0, 5, 5, 0, 15 }, /* R */1095 { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
1093 { 0, 5, 3, 0, 15 }, /* G */1096 { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
1094 { 0, 5, 1, 0, 15 }, /* B */1097 { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
1095 },1098 },
1096 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,1099 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
1097 },1100 },
@@ -1101,9 +1104,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1101 .log2_chroma_w = 0,1104 .log2_chroma_w = 0,
1102 .log2_chroma_h = 0,1105 .log2_chroma_h = 0,
1103 .comp = {1106 .comp = {
1104 { 0, 5, 5, 0, 15 }, /* R */1107 { 0, 6, 4, 0, 16, 5, 15, 5 }, /* R */
1105 { 0, 5, 3, 0, 15 }, /* G */1108 { 0, 6, 2, 0, 16, 5, 15, 3 }, /* G */
1106 { 0, 5, 1, 0, 15 }, /* B */1109 { 0, 6, 0, 0, 16, 5, 15, 1 }, /* B */
1107 },1110 },
1108 .flags = AV_PIX_FMT_FLAG_RGB,1111 .flags = AV_PIX_FMT_FLAG_RGB,
1109 },1112 },
@@ -1113,10 +1116,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1113 .log2_chroma_w = 0,1116 .log2_chroma_w = 0,
1114 .log2_chroma_h = 0,1117 .log2_chroma_h = 0,
1115 .comp = {1118 .comp = {
1116 { 0, 7, 5, 0, 15 }, /* R */1119 { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */
1117 { 0, 7, 3, 0, 15 }, /* G */1120 { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
1118 { 0, 7, 1, 0, 15 }, /* B */1121 { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */
1119 { 0, 7, 7, 0, 15 }, /* A */1122 { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
1120 },1123 },
1121 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,1124 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
1122 },1125 },
@@ -1126,10 +1129,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1126 .log2_chroma_w = 0,1129 .log2_chroma_w = 0,
1127 .log2_chroma_h = 0,1130 .log2_chroma_h = 0,
1128 .comp = {1131 .comp = {
1129 { 0, 7, 5, 0, 15 }, /* R */1132 { 0, 8, 4, 0, 16, 7, 15, 5 }, /* R */
1130 { 0, 7, 3, 0, 15 }, /* G */1133 { 0, 8, 2, 0, 16, 7, 15, 3 }, /* G */
1131 { 0, 7, 1, 0, 15 }, /* B */1134 { 0, 8, 0, 0, 16, 7, 15, 1 }, /* B */
1132 { 0, 7, 7, 0, 15 }, /* A */1135 { 0, 8, 6, 0, 16, 7, 15, 7 }, /* A */
1133 },1136 },
1134 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,1137 .flags = AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,
1135 },1138 },
@@ -1139,9 +1142,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1139 .log2_chroma_w = 0,1142 .log2_chroma_w = 0,
1140 .log2_chroma_h = 0,1143 .log2_chroma_h = 0,
1141 .comp = {1144 .comp = {
1142 { 0, 1, 1, 0, 4 }, /* R */1145 { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
1143 { 0, 1, 1, 5, 5 }, /* G */1146 { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
1144 { 0, 1, 0, 3, 4 }, /* B */1147 { 0, 2, -1, 3, 5, 1, 4, 0 }, /* B */
1145 },1148 },
1146 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,1149 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
1147 },1150 },
@@ -1151,9 +1154,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1151 .log2_chroma_w = 0,1154 .log2_chroma_w = 0,
1152 .log2_chroma_h = 0,1155 .log2_chroma_h = 0,
1153 .comp = {1156 .comp = {
1154 { 0, 1, 1, 0, 4 }, /* R */1157 { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
1155 { 0, 1, 1, 5, 5 }, /* G */1158 { 0, 2, 0, 5, 6, 1, 5, 1 }, /* G */
1156 { 0, 1, 2, 3, 4 }, /* B */1159 { 0, 2, 1, 3, 5, 1, 4, 2 }, /* B */
1157 },1160 },
1158 .flags = AV_PIX_FMT_FLAG_RGB,1161 .flags = AV_PIX_FMT_FLAG_RGB,
1159 },1162 },
@@ -1163,9 +1166,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1163 .log2_chroma_w = 0,1166 .log2_chroma_w = 0,
1164 .log2_chroma_h = 0,1167 .log2_chroma_h = 0,
1165 .comp = {1168 .comp = {
1166 { 0, 1, 1, 0, 4 }, /* R */1169 { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
1167 { 0, 1, 1, 5, 4 }, /* G */1170 { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
1168 { 0, 1, 0, 2, 4 }, /* B */1171 { 0, 2, -1, 2, 5, 1, 4, 0 }, /* B */
1169 },1172 },
1170 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,1173 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
1171 },1174 },
@@ -1175,9 +1178,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1175 .log2_chroma_w = 0,1178 .log2_chroma_w = 0,
1176 .log2_chroma_h = 0,1179 .log2_chroma_h = 0,
1177 .comp = {1180 .comp = {
1178 { 0, 1, 1, 0, 4 }, /* R */1181 { 0, 2, 0, 0, 5, 1, 4, 1 }, /* R */
1179 { 0, 1, 1, 5, 4 }, /* G */1182 { 0, 2, 0, 5, 5, 1, 4, 1 }, /* G */
1180 { 0, 1, 2, 2, 4 }, /* B */1183 { 0, 2, 1, 2, 5, 1, 4, 2 }, /* B */
1181 },1184 },
1182 .flags = AV_PIX_FMT_FLAG_RGB,1185 .flags = AV_PIX_FMT_FLAG_RGB,
1183 },1186 },
@@ -1187,9 +1190,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1187 .log2_chroma_w = 0,1190 .log2_chroma_w = 0,
1188 .log2_chroma_h = 0,1191 .log2_chroma_h = 0,
1189 .comp = {1192 .comp = {
1190 { 0, 1, 1, 0, 3 }, /* R */1193 { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */
1191 { 0, 1, 1, 4, 3 }, /* G */1194 { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
1192 { 0, 1, 0, 0, 3 }, /* B */1195 { 0, 2, -1, 0, 4, 1, 3, 0 }, /* B */
1193 },1196 },
1194 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,1197 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_RGB,
1195 },1198 },
@@ -1199,9 +1202,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1199 .log2_chroma_w = 0,1202 .log2_chroma_w = 0,
1200 .log2_chroma_h = 0,1203 .log2_chroma_h = 0,
1201 .comp = {1204 .comp = {
1202 { 0, 1, 1, 0, 3 }, /* R */1205 { 0, 2, 0, 0, 4, 1, 3, 1 }, /* R */
1203 { 0, 1, 1, 4, 3 }, /* G */1206 { 0, 2, 0, 4, 4, 1, 3, 1 }, /* G */
1204 { 0, 1, 2, 0, 3 }, /* B */1207 { 0, 2, 1, 0, 4, 1, 3, 2 }, /* B */
1205 },1208 },
1206 .flags = AV_PIX_FMT_FLAG_RGB,1209 .flags = AV_PIX_FMT_FLAG_RGB,
1207 },1210 },
@@ -1238,9 +1241,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 30 unmodified lines
1238 .log2_chroma_w = 1,1241 .log2_chroma_w = 1,
1239 .log2_chroma_h = 1,1242 .log2_chroma_h = 1,
1240 .comp = {1243 .comp = {
1241 { 0, 1, 1, 0, 8 }, /* Y */1244 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
1242 { 1, 1, 1, 0, 8 }, /* U */1245 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
1243 { 2, 1, 1, 0, 8 }, /* V */1246 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1244 },1247 },
1245 .flags = AV_PIX_FMT_FLAG_PLANAR,1248 .flags = AV_PIX_FMT_FLAG_PLANAR,
1246 },1249 },
@@ -1250,9 +1253,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1250 .log2_chroma_w = 1,1253 .log2_chroma_w = 1,
1251 .log2_chroma_h = 1,1254 .log2_chroma_h = 1,
1252 .comp = {1255 .comp = {
1253 { 0, 1, 1, 0, 8 }, /* Y */1256 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
1254 { 1, 1, 1, 0, 8 }, /* U */1257 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
1255 { 2, 1, 1, 0, 8 }, /* V */1258 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1256 },1259 },
1257 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1260 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1258 },1261 },
@@ -1262,9 +1265,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1262 .log2_chroma_w = 1,1265 .log2_chroma_w = 1,
1263 .log2_chroma_h = 1,1266 .log2_chroma_h = 1,
1264 .comp = {1267 .comp = {
1265 { 0, 1, 1, 0, 9 }, /* Y */1268 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
1266 { 1, 1, 1, 0, 9 }, /* U */1269 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
1267 { 2, 1, 1, 0, 9 }, /* V */1270 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1268 },1271 },
1269 .flags = AV_PIX_FMT_FLAG_PLANAR,1272 .flags = AV_PIX_FMT_FLAG_PLANAR,
1270 },1273 },
@@ -1274,9 +1277,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1274 .log2_chroma_w = 1,1277 .log2_chroma_w = 1,
1275 .log2_chroma_h = 1,1278 .log2_chroma_h = 1,
1276 .comp = {1279 .comp = {
1277 { 0, 1, 1, 0, 9 }, /* Y */1280 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
1278 { 1, 1, 1, 0, 9 }, /* U */1281 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
1279 { 2, 1, 1, 0, 9 }, /* V */1282 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1280 },1283 },
1281 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1284 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1282 },1285 },
@@ -1286,9 +1289,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1286 .log2_chroma_w = 1,1289 .log2_chroma_w = 1,
1287 .log2_chroma_h = 1,1290 .log2_chroma_h = 1,
1288 .comp = {1291 .comp = {
1289 { 0, 1, 1, 0, 11 }, /* Y */1292 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
1290 { 1, 1, 1, 0, 11 }, /* U */1293 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
1291 { 2, 1, 1, 0, 11 }, /* V */1294 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1292 },1295 },
1293 .flags = AV_PIX_FMT_FLAG_PLANAR,1296 .flags = AV_PIX_FMT_FLAG_PLANAR,
1294 },1297 },
@@ -1298,9 +1301,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1298 .log2_chroma_w = 1,1301 .log2_chroma_w = 1,
1299 .log2_chroma_h = 1,1302 .log2_chroma_h = 1,
1300 .comp = {1303 .comp = {
1301 { 0, 1, 1, 0, 11 }, /* Y */1304 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
1302 { 1, 1, 1, 0, 11 }, /* U */1305 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
1303 { 2, 1, 1, 0, 11 }, /* V */1306 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1304 },1307 },
1305 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1308 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1306 },1309 },
@@ -1310,9 +1313,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1310 .log2_chroma_w = 1,1313 .log2_chroma_w = 1,
1311 .log2_chroma_h = 1,1314 .log2_chroma_h = 1,
1312 .comp = {1315 .comp = {
1313 { 0, 1, 1, 0, 13 }, /* Y */1316 { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
1314 { 1, 1, 1, 0, 13 }, /* U */1317 { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
1315 { 2, 1, 1, 0, 13 }, /* V */1318 { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1316 },1319 },
1317 .flags = AV_PIX_FMT_FLAG_PLANAR,1320 .flags = AV_PIX_FMT_FLAG_PLANAR,
1318 },1321 },
@@ -1322,9 +1325,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1322 .log2_chroma_w = 1,1325 .log2_chroma_w = 1,
1323 .log2_chroma_h = 1,1326 .log2_chroma_h = 1,
1324 .comp = {1327 .comp = {
1325 { 0, 1, 1, 0, 13 }, /* Y */1328 { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
1326 { 1, 1, 1, 0, 13 }, /* U */1329 { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
1327 { 2, 1, 1, 0, 13 }, /* V */1330 { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1328 },1331 },
1329 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1332 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1330 },1333 },
@@ -1334,9 +1337,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1334 .log2_chroma_w = 1,1337 .log2_chroma_w = 1,
1335 .log2_chroma_h = 1,1338 .log2_chroma_h = 1,
1336 .comp = {1339 .comp = {
1337 { 0, 1, 1, 0, 15 }, /* Y */1340 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
1338 { 1, 1, 1, 0, 15 }, /* U */1341 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
1339 { 2, 1, 1, 0, 15 }, /* V */1342 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1340 },1343 },
1341 .flags = AV_PIX_FMT_FLAG_PLANAR,1344 .flags = AV_PIX_FMT_FLAG_PLANAR,
1342 },1345 },
@@ -1346,9 +1349,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1346 .log2_chroma_w = 1,1349 .log2_chroma_w = 1,
1347 .log2_chroma_h = 1,1350 .log2_chroma_h = 1,
1348 .comp = {1351 .comp = {
1349 { 0, 1, 1, 0, 15 }, /* Y */1352 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
1350 { 1, 1, 1, 0, 15 }, /* U */1353 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
1351 { 2, 1, 1, 0, 15 }, /* V */1354 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1352 },1355 },
1353 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1356 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1354 },1357 },
@@ -1358,9 +1361,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1358 .log2_chroma_w = 1,1361 .log2_chroma_w = 1,
1359 .log2_chroma_h = 0,1362 .log2_chroma_h = 0,
1360 .comp = {1363 .comp = {
1361 { 0, 1, 1, 0, 8 }, /* Y */1364 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
1362 { 1, 1, 1, 0, 8 }, /* U */1365 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
1363 { 2, 1, 1, 0, 8 }, /* V */1366 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1364 },1367 },
1365 .flags = AV_PIX_FMT_FLAG_PLANAR,1368 .flags = AV_PIX_FMT_FLAG_PLANAR,
1366 },1369 },
@@ -1370,9 +1373,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1370 .log2_chroma_w = 1,1373 .log2_chroma_w = 1,
1371 .log2_chroma_h = 0,1374 .log2_chroma_h = 0,
1372 .comp = {1375 .comp = {
1373 { 0, 1, 1, 0, 8 }, /* Y */1376 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
1374 { 1, 1, 1, 0, 8 }, /* U */1377 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
1375 { 2, 1, 1, 0, 8 }, /* V */1378 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1376 },1379 },
1377 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1380 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1378 },1381 },
@@ -1382,9 +1385,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1382 .log2_chroma_w = 1,1385 .log2_chroma_w = 1,
1383 .log2_chroma_h = 0,1386 .log2_chroma_h = 0,
1384 .comp = {1387 .comp = {
1385 { 0, 1, 1, 0, 9 }, /* Y */1388 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
1386 { 1, 1, 1, 0, 9 }, /* U */1389 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
1387 { 2, 1, 1, 0, 9 }, /* V */1390 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1388 },1391 },
1389 .flags = AV_PIX_FMT_FLAG_PLANAR,1392 .flags = AV_PIX_FMT_FLAG_PLANAR,
1390 },1393 },
@@ -1394,9 +1397,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1394 .log2_chroma_w = 1,1397 .log2_chroma_w = 1,
1395 .log2_chroma_h = 0,1398 .log2_chroma_h = 0,
1396 .comp = {1399 .comp = {
1397 { 0, 1, 1, 0, 9 }, /* Y */1400 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
1398 { 1, 1, 1, 0, 9 }, /* U */1401 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
1399 { 2, 1, 1, 0, 9 }, /* V */1402 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1400 },1403 },
1401 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1404 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1402 },1405 },
@@ -1406,9 +1409,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1406 .log2_chroma_w = 1,1409 .log2_chroma_w = 1,
1407 .log2_chroma_h = 0,1410 .log2_chroma_h = 0,
1408 .comp = {1411 .comp = {
1409 { 0, 1, 1, 0, 11 }, /* Y */1412 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
1410 { 1, 1, 1, 0, 11 }, /* U */1413 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
1411 { 2, 1, 1, 0, 11 }, /* V */1414 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1412 },1415 },
1413 .flags = AV_PIX_FMT_FLAG_PLANAR,1416 .flags = AV_PIX_FMT_FLAG_PLANAR,
1414 },1417 },
@@ -1418,9 +1421,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1418 .log2_chroma_w = 1,1421 .log2_chroma_w = 1,
1419 .log2_chroma_h = 0,1422 .log2_chroma_h = 0,
1420 .comp = {1423 .comp = {
1421 { 0, 1, 1, 0, 11 }, /* Y */1424 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
1422 { 1, 1, 1, 0, 11 }, /* U */1425 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
1423 { 2, 1, 1, 0, 11 }, /* V */1426 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1424 },1427 },
1425 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1428 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1426 },1429 },
@@ -1430,9 +1433,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1430 .log2_chroma_w = 1,1433 .log2_chroma_w = 1,
1431 .log2_chroma_h = 0,1434 .log2_chroma_h = 0,
1432 .comp = {1435 .comp = {
1433 { 0, 1, 1, 0, 13 }, /* Y */1436 { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
1434 { 1, 1, 1, 0, 13 }, /* U */1437 { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
1435 { 2, 1, 1, 0, 13 }, /* V */1438 { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1436 },1439 },
1437 .flags = AV_PIX_FMT_FLAG_PLANAR,1440 .flags = AV_PIX_FMT_FLAG_PLANAR,
1438 },1441 },
@@ -1442,9 +1445,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1442 .log2_chroma_w = 1,1445 .log2_chroma_w = 1,
1443 .log2_chroma_h = 0,1446 .log2_chroma_h = 0,
1444 .comp = {1447 .comp = {
1445 { 0, 1, 1, 0, 13 }, /* Y */1448 { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
1446 { 1, 1, 1, 0, 13 }, /* U */1449 { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
1447 { 2, 1, 1, 0, 13 }, /* V */1450 { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1448 },1451 },
1449 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1452 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1450 },1453 },
@@ -1454,9 +1457,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1454 .log2_chroma_w = 1,1457 .log2_chroma_w = 1,
1455 .log2_chroma_h = 0,1458 .log2_chroma_h = 0,
1456 .comp = {1459 .comp = {
1457 { 0, 1, 1, 0, 15 }, /* Y */1460 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
1458 { 1, 1, 1, 0, 15 }, /* U */1461 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
1459 { 2, 1, 1, 0, 15 }, /* V */1462 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1460 },1463 },
1461 .flags = AV_PIX_FMT_FLAG_PLANAR,1464 .flags = AV_PIX_FMT_FLAG_PLANAR,
1462 },1465 },
@@ -1466,9 +1469,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1466 .log2_chroma_w = 1,1469 .log2_chroma_w = 1,
1467 .log2_chroma_h = 0,1470 .log2_chroma_h = 0,
1468 .comp = {1471 .comp = {
1469 { 0, 1, 1, 0, 15 }, /* Y */1472 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
1470 { 1, 1, 1, 0, 15 }, /* U */1473 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
1471 { 2, 1, 1, 0, 15 }, /* V */1474 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1472 },1475 },
1473 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1476 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1474 },1477 },
@@ -1478,9 +1481,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1478 .log2_chroma_w = 0,1481 .log2_chroma_w = 0,
1479 .log2_chroma_h = 0,1482 .log2_chroma_h = 0,
1480 .comp = {1483 .comp = {
1481 { 0, 1, 1, 0, 15 }, /* Y */1484 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
1482 { 1, 1, 1, 0, 15 }, /* U */1485 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
1483 { 2, 1, 1, 0, 15 }, /* V */1486 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1484 },1487 },
1485 .flags = AV_PIX_FMT_FLAG_PLANAR,1488 .flags = AV_PIX_FMT_FLAG_PLANAR,
1486 },1489 },
@@ -1490,9 +1493,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1490 .log2_chroma_w = 0,1493 .log2_chroma_w = 0,
1491 .log2_chroma_h = 0,1494 .log2_chroma_h = 0,
1492 .comp = {1495 .comp = {
1493 { 0, 1, 1, 0, 15 }, /* Y */1496 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* Y */
1494 { 1, 1, 1, 0, 15 }, /* U */1497 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* U */
1495 { 2, 1, 1, 0, 15 }, /* V */1498 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* V */
1496 },1499 },
1497 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1500 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1498 },1501 },
@@ -1502,9 +1505,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1502 .log2_chroma_w = 0,1505 .log2_chroma_w = 0,
1503 .log2_chroma_h = 0,1506 .log2_chroma_h = 0,
1504 .comp = {1507 .comp = {
1505 { 0, 1, 1, 0, 9 }, /* Y */1508 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
1506 { 1, 1, 1, 0, 9 }, /* U */1509 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
1507 { 2, 1, 1, 0, 9 }, /* V */1510 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1508 },1511 },
1509 .flags = AV_PIX_FMT_FLAG_PLANAR,1512 .flags = AV_PIX_FMT_FLAG_PLANAR,
1510 },1513 },
@@ -1514,9 +1517,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1514 .log2_chroma_w = 0,1517 .log2_chroma_w = 0,
1515 .log2_chroma_h = 0,1518 .log2_chroma_h = 0,
1516 .comp = {1519 .comp = {
1517 { 0, 1, 1, 0, 9 }, /* Y */1520 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
1518 { 1, 1, 1, 0, 9 }, /* U */1521 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* U */
1519 { 2, 1, 1, 0, 9 }, /* V */1522 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* V */
1520 },1523 },
1521 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1524 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1522 },1525 },
@@ -1526,9 +1529,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1526 .log2_chroma_w = 0,1529 .log2_chroma_w = 0,
1527 .log2_chroma_h = 0,1530 .log2_chroma_h = 0,
1528 .comp = {1531 .comp = {
1529 { 0, 1, 1, 0, 8 }, /* Y */1532 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
1530 { 1, 1, 1, 0, 8 }, /* U */1533 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
1531 { 2, 1, 1, 0, 8 }, /* V */1534 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1532 },1535 },
1533 .flags = AV_PIX_FMT_FLAG_PLANAR,1536 .flags = AV_PIX_FMT_FLAG_PLANAR,
1534 },1537 },
@@ -1538,9 +1541,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1538 .log2_chroma_w = 0,1541 .log2_chroma_w = 0,
1539 .log2_chroma_h = 0,1542 .log2_chroma_h = 0,
1540 .comp = {1543 .comp = {
1541 { 0, 1, 1, 0, 8 }, /* Y */1544 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* Y */
1542 { 1, 1, 1, 0, 8 }, /* U */1545 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* U */
1543 { 2, 1, 1, 0, 8 }, /* V */1546 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* V */
1544 },1547 },
1545 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1548 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1546 },1549 },
@@ -1550,9 +1553,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1550 .log2_chroma_w = 0,1553 .log2_chroma_w = 0,
1551 .log2_chroma_h = 0,1554 .log2_chroma_h = 0,
1552 .comp = {1555 .comp = {
1553 { 0, 1, 1, 0, 11 }, /* Y */1556 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
1554 { 1, 1, 1, 0, 11 }, /* U */1557 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
1555 { 2, 1, 1, 0, 11 }, /* V */1558 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1556 },1559 },
1557 .flags = AV_PIX_FMT_FLAG_PLANAR,1560 .flags = AV_PIX_FMT_FLAG_PLANAR,
1558 },1561 },
@@ -1562,9 +1565,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1562 .log2_chroma_w = 0,1565 .log2_chroma_w = 0,
1563 .log2_chroma_h = 0,1566 .log2_chroma_h = 0,
1564 .comp = {1567 .comp = {
1565 { 0, 1, 1, 0, 11 }, /* Y */1568 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* Y */
1566 { 1, 1, 1, 0, 11 }, /* U */1569 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* U */
1567 { 2, 1, 1, 0, 11 }, /* V */1570 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* V */
1568 },1571 },
1569 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1572 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1570 },1573 },
@@ -1574,9 +1577,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1574 .log2_chroma_w = 0,1577 .log2_chroma_w = 0,
1575 .log2_chroma_h = 0,1578 .log2_chroma_h = 0,
1576 .comp = {1579 .comp = {
1577 { 0, 1, 1, 0, 13 }, /* Y */1580 { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
1578 { 1, 1, 1, 0, 13 }, /* U */1581 { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
1579 { 2, 1, 1, 0, 13 }, /* V */1582 { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1580 },1583 },
1581 .flags = AV_PIX_FMT_FLAG_PLANAR,1584 .flags = AV_PIX_FMT_FLAG_PLANAR,
1582 },1585 },
@@ -1586,9 +1589,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1586 .log2_chroma_w = 0,1589 .log2_chroma_w = 0,
1587 .log2_chroma_h = 0,1590 .log2_chroma_h = 0,
1588 .comp = {1591 .comp = {
1589 { 0, 1, 1, 0, 13 }, /* Y */1592 { 0, 2, 0, 0, 14, 1, 13, 1 }, /* Y */
1590 { 1, 1, 1, 0, 13 }, /* U */1593 { 1, 2, 0, 0, 14, 1, 13, 1 }, /* U */
1591 { 2, 1, 1, 0, 13 }, /* V */1594 { 2, 2, 0, 0, 14, 1, 13, 1 }, /* V */
1592 },1595 },
1593 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,1596 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR,
1594 },1597 },
@@ -1614,8 +1617,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 19 unmodified lines
1614 .name = "ya8",1617 .name = "ya8",
1615 .nb_components = 2,1618 .nb_components = 2,
1616 .comp = {1619 .comp = {
1617 { 0, 1, 1, 0, 7 }, /* Y */1620 { 0, 2, 0, 0, 8, 1, 7, 1 }, /* Y */
1618 { 0, 1, 2, 0, 7 }, /* A */1621 { 0, 2, 1, 0, 8, 1, 7, 2 }, /* A */
1619 },1622 },
1620 .flags = AV_PIX_FMT_FLAG_ALPHA,1623 .flags = AV_PIX_FMT_FLAG_ALPHA,
1621 .alias = "gray8a",1624 .alias = "gray8a",
@@ -1624,8 +1627,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 2 unmodified lines
1624 .name = "ya16le",1627 .name = "ya16le",
1625 .nb_components = 2,1628 .nb_components = 2,
1626 .comp = {1629 .comp = {
1627 { 0, 3, 1, 0, 15 }, /* Y */1630 { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
1628 { 0, 3, 3, 0, 15 }, /* A */1631 { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
1629 },1632 },
1630 .flags = AV_PIX_FMT_FLAG_ALPHA,1633 .flags = AV_PIX_FMT_FLAG_ALPHA,
1631 },1634 },
@@ -1633,8 +1636,8 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1 unmodified line
1633 .name = "ya16be",1636 .name = "ya16be",
1634 .nb_components = 2,1637 .nb_components = 2,
1635 .comp = {1638 .comp = {
1636 { 0, 3, 1, 0, 15 }, /* Y */1639 { 0, 4, 0, 0, 16, 3, 15, 1 }, /* Y */
1637 { 0, 3, 3, 0, 15 }, /* A */1640 { 0, 4, 2, 0, 16, 3, 15, 3 }, /* A */
1638 },1641 },
1639 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA,1642 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA,
1640 },1643 },
@@ -1648,9 +1651,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 7 unmodified lines
1648 .log2_chroma_w = 0,1651 .log2_chroma_w = 0,
1649 .log2_chroma_h = 0,1652 .log2_chroma_h = 0,
1650 .comp = {1653 .comp = {
1651 { 2, 0, 1, 0, 7 }, /* R */1654 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */
1652 { 0, 0, 1, 0, 7 }, /* G */1655 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */
1653 { 1, 0, 1, 0, 7 }, /* B */1656 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */
1654 },1657 },
1655 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1658 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1656 },1659 },
@@ -1660,9 +1663,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1660 .log2_chroma_w = 0,1663 .log2_chroma_w = 0,
1661 .log2_chroma_h = 0,1664 .log2_chroma_h = 0,
1662 .comp = {1665 .comp = {
1663 { 2, 1, 1, 0, 8 }, /* R */1666 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */
1664 { 0, 1, 1, 0, 8 }, /* G */1667 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */
1665 { 1, 1, 1, 0, 8 }, /* B */1668 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */
1666 },1669 },
1667 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1670 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1668 },1671 },
@@ -1672,9 +1675,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1672 .log2_chroma_w = 0,1675 .log2_chroma_w = 0,
1673 .log2_chroma_h = 0,1676 .log2_chroma_h = 0,
1674 .comp = {1677 .comp = {
1675 { 2, 1, 1, 0, 8 }, /* R */1678 { 2, 2, 0, 0, 9, 1, 8, 1 }, /* R */
1676 { 0, 1, 1, 0, 8 }, /* G */1679 { 0, 2, 0, 0, 9, 1, 8, 1 }, /* G */
1677 { 1, 1, 1, 0, 8 }, /* B */1680 { 1, 2, 0, 0, 9, 1, 8, 1 }, /* B */
1678 },1681 },
1679 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1682 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1680 },1683 },
@@ -1684,9 +1687,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1684 .log2_chroma_w = 0,1687 .log2_chroma_w = 0,
1685 .log2_chroma_h = 0,1688 .log2_chroma_h = 0,
1686 .comp = {1689 .comp = {
1687 { 2, 1, 1, 0, 9 }, /* R */1690 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
1688 { 0, 1, 1, 0, 9 }, /* G */1691 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
1689 { 1, 1, 1, 0, 9 }, /* B */1692 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
1690 },1693 },
1691 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1694 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1692 },1695 },
@@ -1696,9 +1699,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1696 .log2_chroma_w = 0,1699 .log2_chroma_w = 0,
1697 .log2_chroma_h = 0,1700 .log2_chroma_h = 0,
1698 .comp = {1701 .comp = {
1699 { 2, 1, 1, 0, 9 }, /* R */1702 { 2, 2, 0, 0, 10, 1, 9, 1 }, /* R */
1700 { 0, 1, 1, 0, 9 }, /* G */1703 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* G */
1701 { 1, 1, 1, 0, 9 }, /* B */1704 { 1, 2, 0, 0, 10, 1, 9, 1 }, /* B */
1702 },1705 },
1703 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1706 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1704 },1707 },
@@ -1708,9 +1711,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1708 .log2_chroma_w = 0,1711 .log2_chroma_w = 0,
1709 .log2_chroma_h = 0,1712 .log2_chroma_h = 0,
1710 .comp = {1713 .comp = {
1711 { 2, 1, 1, 0, 11 }, /* R */1714 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
1712 { 0, 1, 1, 0, 11 }, /* G */1715 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
1713 { 1, 1, 1, 0, 11 }, /* B */1716 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
1714 },1717 },
1715 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1718 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1716 },1719 },
@@ -1720,9 +1723,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1720 .log2_chroma_w = 0,1723 .log2_chroma_w = 0,
1721 .log2_chroma_h = 0,1724 .log2_chroma_h = 0,
1722 .comp = {1725 .comp = {
1723 { 2, 1, 1, 0, 11 }, /* R */1726 { 2, 2, 0, 0, 12, 1, 11, 1 }, /* R */
1724 { 0, 1, 1, 0, 11 }, /* G */1727 { 0, 2, 0, 0, 12, 1, 11, 1 }, /* G */
1725 { 1, 1, 1, 0, 11 }, /* B */1728 { 1, 2, 0, 0, 12, 1, 11, 1 }, /* B */
1726 },1729 },
1727 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1730 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1728 },1731 },
@@ -1732,9 +1735,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1732 .log2_chroma_w = 0,1735 .log2_chroma_w = 0,
1733 .log2_chroma_h = 0,1736 .log2_chroma_h = 0,
1734 .comp = {1737 .comp = {
1735 { 2, 1, 1, 0, 13 }, /* R */1738 { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */
1736 { 0, 1, 1, 0, 13 }, /* G */1739 { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */
1737 { 1, 1, 1, 0, 13 }, /* B */1740 { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */
1738 },1741 },
1739 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1742 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1740 },1743 },
@@ -1744,9 +1747,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1744 .log2_chroma_w = 0,1747 .log2_chroma_w = 0,
1745 .log2_chroma_h = 0,1748 .log2_chroma_h = 0,
1746 .comp = {1749 .comp = {
1747 { 2, 1, 1, 0, 13 }, /* R */1750 { 2, 2, 0, 0, 14, 1, 13, 1 }, /* R */
1748 { 0, 1, 1, 0, 13 }, /* G */1751 { 0, 2, 0, 0, 14, 1, 13, 1 }, /* G */
1749 { 1, 1, 1, 0, 13 }, /* B */1752 { 1, 2, 0, 0, 14, 1, 13, 1 }, /* B */
1750 },1753 },
1751 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1754 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1752 },1755 },
@@ -1756,9 +1759,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1756 .log2_chroma_w = 0,1759 .log2_chroma_w = 0,
1757 .log2_chroma_h = 0,1760 .log2_chroma_h = 0,
1758 .comp = {1761 .comp = {
1759 { 2, 1, 1, 0, 15 }, /* R */1762 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
1760 { 0, 1, 1, 0, 15 }, /* G */1763 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
1761 { 1, 1, 1, 0, 15 }, /* B */1764 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
1762 },1765 },
1763 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1766 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1764 },1767 },
@@ -1768,9 +1771,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1768 .log2_chroma_w = 0,1771 .log2_chroma_w = 0,
1769 .log2_chroma_h = 0,1772 .log2_chroma_h = 0,
1770 .comp = {1773 .comp = {
1771 { 2, 1, 1, 0, 15 }, /* R */1774 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
1772 { 0, 1, 1, 0, 15 }, /* G */1775 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
1773 { 1, 1, 1, 0, 15 }, /* B */1776 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
1774 },1777 },
1775 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,1778 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB,
1776 },1779 },
@@ -1780,10 +1783,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1780 .log2_chroma_w = 0,1783 .log2_chroma_w = 0,
1781 .log2_chroma_h = 0,1784 .log2_chroma_h = 0,
1782 .comp = {1785 .comp = {
1783 { 2, 0, 1, 0, 7 }, /* R */1786 { 2, 1, 0, 0, 8, 0, 7, 1 }, /* R */
1784 { 0, 0, 1, 0, 7 }, /* G */1787 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* G */
1785 { 1, 0, 1, 0, 7 }, /* B */1788 { 1, 1, 0, 0, 8, 0, 7, 1 }, /* B */
1786 { 3, 0, 1, 0, 7 }, /* A */1789 { 3, 1, 0, 0, 8, 0, 7, 1 }, /* A */
1787 },1790 },
1788 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |1791 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
1789 AV_PIX_FMT_FLAG_ALPHA,1792 AV_PIX_FMT_FLAG_ALPHA,
@@ -1794,10 +1797,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
1794 .log2_chroma_w = 0,1797 .log2_chroma_w = 0,
1795 .log2_chroma_h = 0,1798 .log2_chroma_h = 0,
1796 .comp = {1799 .comp = {
1797 { 2, 1, 1, 0, 15 }, /* R */1800 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
1798 { 0, 1, 1, 0, 15 }, /* G */1801 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
1799 { 1, 1, 1, 0, 15 }, /* B */1802 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
1800 { 3, 1, 1, 0, 15 }, /* A */1803 { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
1801 },1804 },
1802 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |1805 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_RGB |
1803 AV_PIX_FMT_FLAG_ALPHA,1806 AV_PIX_FMT_FLAG_ALPHA,
@@ -1808,10 +1811,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 4 unmodified lines
1808 .log2_chroma_w = 0,1811 .log2_chroma_w = 0,
1809 .log2_chroma_h = 0,1812 .log2_chroma_h = 0,
1810 .comp = {1813 .comp = {
1811 { 2, 1, 1, 0, 15 }, /* R */1814 { 2, 2, 0, 0, 16, 1, 15, 1 }, /* R */
1812 { 0, 1, 1, 0, 15 }, /* G */1815 { 0, 2, 0, 0, 16, 1, 15, 1 }, /* G */
1813 { 1, 1, 1, 0, 15 }, /* B */1816 { 1, 2, 0, 0, 16, 1, 15, 1 }, /* B */
1814 { 3, 1, 1, 0, 15 }, /* A */1817 { 3, 2, 0, 0, 16, 1, 15, 1 }, /* A */
1815 },1818 },
1816 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR |1819 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_PLANAR |
1817 AV_PIX_FMT_FLAG_RGB | AV_PIX_FMT_FLAG_ALPHA,1820 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] = { · 10 unmodified lines
1828 .log2_chroma_w = 0,1831 .log2_chroma_w = 0,
1829 .log2_chroma_h = 0,1832 .log2_chroma_h = 0,
1830 .comp = {1833 .comp = {
1831 { 0, 5, 1, 4, 11 }, /* X */1834 { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */
1832 { 0, 5, 3, 4, 11 }, /* Y */1835 { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */
1833 { 0, 5, 5, 4, 11 }, /* Z */1836 { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */
1834 },1837 },
1835 /*.flags = -- not used*/1838 /*.flags = -- not used*/
1836 },1839 },
@@ -1840,9 +1843,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1840 .log2_chroma_w = 0,1843 .log2_chroma_w = 0,
1841 .log2_chroma_h = 0,1844 .log2_chroma_h = 0,
1842 .comp = {1845 .comp = {
1843 { 0, 5, 1, 4, 11 }, /* X */1846 { 0, 6, 0, 4, 12, 5, 11, 1 }, /* X */
1844 { 0, 5, 3, 4, 11 }, /* Y */1847 { 0, 6, 2, 4, 12, 5, 11, 3 }, /* Y */
1845 { 0, 5, 5, 4, 11 }, /* Z */1848 { 0, 6, 4, 4, 12, 5, 11, 5 }, /* Z */
1846 },1849 },
1847 .flags = AV_PIX_FMT_FLAG_BE,1850 .flags = AV_PIX_FMT_FLAG_BE,
1848 },1851 },
@@ -1852,9 +1855,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1852 .log2_chroma_w= 0, \1855 .log2_chroma_w= 0, \
1853 .log2_chroma_h= 0, \1856 .log2_chroma_h= 0, \
1854 .comp = { \1857 .comp = { \
1855 {0,0,0,0,1}, \1858 {0,1,0,0,2,0,1,1},\
1856 {0,0,0,0,3}, \1859 {0,1,0,0,4,0,3,1},\
1857 {0,0,0,0,1}, \1860 {0,1,0,0,2,0,1,1},\
1858 }, \1861 }, \
1859 1862
1860#define BAYER16_DESC_COMMON \1863#define BAYER16_DESC_COMMON \
@@ -1862,9 +1865,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 1 unmodified line
1862 .log2_chroma_w= 0, \1865 .log2_chroma_w= 0, \
1863 .log2_chroma_h= 0, \1866 .log2_chroma_h= 0, \
1864 .comp = { \1867 .comp = { \
1865 {0,1,0,0, 3}, \1868 {0,2,0,0,4,1,3,1},\
1866 {0,1,0,0, 7}, \1869 {0,2,0,0,8,1,7,1},\
1867 {0,1,0,0, 3}, \1870 {0,2,0,0,4,1,3,1},\
1868 }, \1871 }, \
1869 1872
1870 [AV_PIX_FMT_BAYER_BGGR8] = {1873 [AV_PIX_FMT_BAYER_BGGR8] = {
@@ -1933,9 +1936,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 62 unmodified lines
1933 .log2_chroma_w = 1,1936 .log2_chroma_w = 1,
1934 .log2_chroma_h = 0,1937 .log2_chroma_h = 0,
1935 .comp = {1938 .comp = {
1936 { 0, 0, 1, 0, 7 }, /* Y */1939 { 0, 1, 0, 0, 8, 0, 7, 1 }, /* Y */
1937 { 1, 1, 1, 0, 7 }, /* U */1940 { 1, 2, 0, 0, 8, 1, 7, 1 }, /* U */
1938 { 1, 1, 2, 0, 7 }, /* V */1941 { 1, 2, 1, 0, 8, 1, 7, 2 }, /* V */
1939 },1942 },
1940 .flags = AV_PIX_FMT_FLAG_PLANAR,1943 .flags = AV_PIX_FMT_FLAG_PLANAR,
1941 },1944 },
@@ -1945,9 +1948,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1945 .log2_chroma_w = 1,1948 .log2_chroma_w = 1,
1946 .log2_chroma_h = 0,1949 .log2_chroma_h = 0,
1947 .comp = {1950 .comp = {
1948 { 0, 1, 1, 0, 9 }, /* Y */1951 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
1949 { 1, 3, 1, 0, 9 }, /* U */1952 { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */
1950 { 1, 3, 3, 0, 9 }, /* V */1953 { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */
1951 },1954 },
1952 .flags = AV_PIX_FMT_FLAG_PLANAR,1955 .flags = AV_PIX_FMT_FLAG_PLANAR,
1953 },1956 },
@@ -1957,9 +1960,9 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1957 .log2_chroma_w = 1,1960 .log2_chroma_w = 1,
1958 .log2_chroma_h = 0,1961 .log2_chroma_h = 0,
1959 .comp = {1962 .comp = {
1960 { 0, 1, 1, 0, 9 }, /* Y */1963 { 0, 2, 0, 0, 10, 1, 9, 1 }, /* Y */
1961 { 1, 3, 1, 0, 9 }, /* U */1964 { 1, 4, 0, 0, 10, 3, 9, 1 }, /* U */
1962 { 1, 3, 3, 0, 9 }, /* V */1965 { 1, 4, 2, 0, 10, 3, 9, 3 }, /* V */
1963 },1966 },
1964 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,1967 .flags = AV_PIX_FMT_FLAG_PLANAR | AV_PIX_FMT_FLAG_BE,
1965 },1968 },
@@ -1981,10 +1984,10 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 15 unmodified lines
1981 .log2_chroma_w = 0,1984 .log2_chroma_w = 0,
1982 .log2_chroma_h = 0,1985 .log2_chroma_h = 0,
1983 .comp = {1986 .comp = {
1984 { 0, 7, 3, 0, 15 }, /* Y */1987 { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */
1985 { 0, 7, 5, 0, 15 }, /* U */1988 { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */
1986 { 0, 7, 7, 0, 15 }, /* V */1989 { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */
1987 { 0, 7, 1, 0, 15 }, /* A */1990 { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */
1988 },1991 },
1989 .flags = AV_PIX_FMT_FLAG_ALPHA,1992 .flags = AV_PIX_FMT_FLAG_ALPHA,
1990 },1993 },
@@ -1994,14 +1997,17 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { · 3 unmodified lines
1994 .log2_chroma_w = 0,1997 .log2_chroma_w = 0,
1995 .log2_chroma_h = 0,1998 .log2_chroma_h = 0,
1996 .comp = {1999 .comp = {
1997 { 0, 7, 3, 0, 15 }, /* Y */2000 { 0, 8, 2, 0, 16, 7, 15, 3 }, /* Y */
1998 { 0, 7, 5, 0, 15 }, /* U */2001 { 0, 8, 4, 0, 16, 7, 15, 5 }, /* U */
1999 { 0, 7, 7, 0, 15 }, /* V */2002 { 0, 8, 6, 0, 16, 7, 15, 7 }, /* V */
2000 { 0, 7, 1, 0, 15 }, /* A */2003 { 0, 8, 0, 0, 16, 7, 15, 1 }, /* A */
2001 },2004 },
2002 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA,2005 .flags = AV_PIX_FMT_FLAG_BE | AV_PIX_FMT_FLAG_ALPHA,
2003 },2006 },
2004};2007};
2008#if FF_API_PLUS1_MINUS1
2009FF_ENABLE_DEPRECATION_WARNINGS
2010#endif
2005 2011
2006static const char *color_range_names[AVCOL_RANGE_NB] = {2012static const char *color_range_names[AVCOL_RANGE_NB] = {
2007 "unknown", "tv", "pc",2013 "unknown", "tv", "pc",
@@ -2082,7 +2088,7 @@ int av_get_bits_per_pixel(const AVPixFmtDescriptor *pixdesc) · 74 unmodified lines
2082 2088
2083 for (c = 0; c < pixdesc->nb_components; c++) {2089 for (c = 0; c < pixdesc->nb_components; c++) {
2084 int s = c == 1 || c == 2 ? 0 : log2_pixels;2090 int s = c == 1 || c == 2 ? 0 : log2_pixels;
2085 bits += (pixdesc->comp[c].depth_minus1 + 1) << s;2091 bits += pixdesc->comp[c].depth << s;
2086 }2092 }
2087 2093
2088 return bits >> log2_pixels;2094 return bits >> log2_pixels;
libavutil/pixdesc.h+18−6
@@ -26,6 +26,7 @@ · 25 unmodified lines
26 26
27#include "attributes.h"27#include "attributes.h"
28#include "pixfmt.h"28#include "pixfmt.h"
29#include "version.h"
29 30
30typedef struct AVComponentDescriptor {31typedef struct AVComponentDescriptor {
31 /**32 /**
@@ -34,16 +35,16 @@ typedef struct AVComponentDescriptor { · 2 unmodified lines
34 int plane;35 int plane;
35 36
36 /**37 /**
37 * Number of elements between 2 horizontally consecutive pixels minus 1.38 * Number of elements between 2 horizontally consecutive pixels.
38 * Elements are bits for bitstream formats, bytes otherwise.39 * Elements are bits for bitstream formats, bytes otherwise.
39 */40 */
40 int step_minus1;41 int step;
41 42
42 /**43 /**
43 * Number of elements before the component of the first pixel plus 1.44 * Number of elements before the component of the first pixel.
44 * Elements are bits for bitstream formats, bytes otherwise.45 * Elements are bits for bitstream formats, bytes otherwise.
45 */46 */
46 int offset_plus1;47 int offset;
47 48
48 /**49 /**
49 * Number of least significant bits that must be shifted away50 * Number of least significant bits that must be shifted away
@@ -52,9 +53,20 @@ typedef struct AVComponentDescriptor { · 2 unmodified lines
52 int shift;53 int shift;
53 54
54 /**55 /**
55 * Number of bits in the component minus 1.56 * Number of bits in the component.
56 */57 */
57 int depth_minus1;58 int depth;
59
60#if FF_API_PLUS1_MINUS1
61 /** deprecated, use step instead */
62 attribute_deprecated int step_minus1;
63
64 /** deprecated, use depth instead */
65 attribute_deprecated int depth_minus1;
66
67 /** deprecated, use offset instead */
68 attribute_deprecated int offset_plus1;
69#endif
58} AVComponentDescriptor;70} AVComponentDescriptor;
59 71
60/**72/**
libavutil/version.h+4−0
@@ -105,6 +105,10 @@ · 104 unmodified lines
105#ifndef FF_API_FRAME_QP105#ifndef FF_API_FRAME_QP
106#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)106#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
107#endif107#endif
108#ifndef FF_API_PLUS1_MINUS1
109#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
110#endif
111
108 112
109/**113/**
110 * @}114 * @}
libswscale/output.c+2−2
@@ -1845,7 +1845,7 @@ yuv2gbrp_full_X_c(SwsContext *c, const int16_t *lumFilter, · 1844 unmodified lines
1845 int i;1845 int i;
1846 int hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpSrc;1846 int hasAlpha = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) && alpSrc;
1847 uint16_t **dest16 = (uint16_t**)dest;1847 uint16_t **dest16 = (uint16_t**)dest;
1848 int SH = 22 + 7 - desc->comp[0].depth_minus1;1848 int SH = 22 + 8 - desc->comp[0].depth;
1849 int A = 0; // init to silence warning1849 int A = 0; // init to silence warning
1850 1850
1851 for (i = 0; i < dstW; i++) {1851 for (i = 0; i < dstW; i++) {
@@ -2073,7 +2073,7 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, · 221 unmodified lines
2073 *yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c;2073 *yuv2planeX = isBE(dstFormat) ? yuv2planeX_16BE_c : yuv2planeX_16LE_c;
2074 *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c;2074 *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_16BE_c : yuv2plane1_16LE_c;
2075 } else if (is9_OR_10BPS(dstFormat)) {2075 } else if (is9_OR_10BPS(dstFormat)) {
2076 if (desc->comp[0].depth_minus1 == 8) {2076 if (desc->comp[0].depth == 9) {
2077 *yuv2planeX = isBE(dstFormat) ? yuv2planeX_9BE_c : yuv2planeX_9LE_c;2077 *yuv2planeX = isBE(dstFormat) ? yuv2planeX_9BE_c : yuv2planeX_9LE_c;
2078 *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_9BE_c : yuv2plane1_9LE_c;2078 *yuv2plane1 = isBE(dstFormat) ? yuv2plane1_9BE_c : yuv2plane1_9LE_c;
2079 } else if (desc->comp[0].depth_minus1 == 9) {2079 } else if (desc->comp[0].depth_minus1 == 9) {
libswscale/swscale.c+3−3
@@ -87,7 +87,7 @@ static void hScale16To19_c(SwsContext *c, int16_t *_dst, int dstW, · 86 unmodified lines
87 int i;87 int i;
88 int32_t *dst = (int32_t *) _dst;88 int32_t *dst = (int32_t *) _dst;
89 const uint16_t *src = (const uint16_t *) _src;89 const uint16_t *src = (const uint16_t *) _src;
90 int bits = desc->comp[0].depth_minus1;90 int bits = desc->comp[0].depth - 1;
91 int sh = bits - 4;91 int sh = bits - 4;
92 92
93 if((isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8) && desc->comp[0].depth_minus1<15)93 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, · 19 unmodified lines
113 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);113 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat);
114 int i;114 int i;
115 const uint16_t *src = (const uint16_t *) _src;115 const uint16_t *src = (const uint16_t *) _src;
116 int sh = desc->comp[0].depth_minus1;116 int sh = desc->comp[0].depth - 1;
117 117
118 if(sh<15)118 if(sh<15)
119 sh= isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8 ? 13 : desc->comp[0].depth_minus1;119 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[], · 676 unmodified lines
796 if (is16BPS(dstFormat) || isNBPS(dstFormat)) {796 if (is16BPS(dstFormat) || isNBPS(dstFormat)) {
797 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat);797 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat);
798 fillPlane16(dst[3], dstStride[3], length, height, lastDstY,798 fillPlane16(dst[3], dstStride[3], length, height, lastDstY,
799 1, desc->comp[3].depth_minus1,799 1, desc->comp[3].depth,
800 isBE(dstFormat));800 isBE(dstFormat));
801 } else801 } else
802 fillPlane(dst[3], dstStride[3], length, height, lastDstY, 255);802 fillPlane(dst[3], dstStride[3], length, height, lastDstY, 255);
libswscale/swscale_internal.h+3−3
@@ -651,14 +651,14 @@ static av_always_inline int is16BPS(enum AVPixelFormat pix_fmt) · 650 unmodified lines
651{651{
652 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);652 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
653 av_assert0(desc);653 av_assert0(desc);
654 return desc->comp[0].depth_minus1 == 15;654 return desc->comp[0].depth == 16;
655}655}
656 656
657static av_always_inline int is9_OR_10BPS(enum AVPixelFormat pix_fmt)657static av_always_inline int is9_OR_10BPS(enum AVPixelFormat pix_fmt)
658{658{
659 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);659 const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);
660 av_assert0(desc);660 av_assert0(desc);
661 return desc->comp[0].depth_minus1 >= 8 && desc->comp[0].depth_minus1 <= 13;661 return desc->comp[0].depth >= 9 && desc->comp[0].depth <= 14;
662}662}
663 663
664#define isNBPS(x) is9_OR_10BPS(x)664#define isNBPS(x) is9_OR_10BPS(x)
@@ -928,7 +928,7 @@ static inline void fillPlane16(uint8_t *plane, int stride, int width, int height · 263 unmodified lines
928{928{
929 int i, j;929 int i, j;
930 uint8_t *ptr = plane + stride * y;930 uint8_t *ptr = plane + stride * y;
931 int v = alpha ? 0xFFFF>>(15-bits) : (1<<bits);931 int v = alpha ? 0xFFFF>>(16-bits) : (1<<(bits-1));
932 for (i = 0; i < height; i++) {932 for (i = 0; i < height; i++) {
933#define FILL(wfunc) \933#define FILL(wfunc) \
934 for (j = 0; j < width; j++) {\934 for (j = 0; j < width; j++) {\
libswscale/swscale_unscaled.c+5−5
@@ -1417,7 +1417,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[], · 1416 unmodified lines
1417 if (!src[plane] || (plane == 1 && !src[2])) {1417 if (!src[plane] || (plane == 1 && !src[2])) {
1418 if (is16BPS(c->dstFormat) || isNBPS(c->dstFormat)) {1418 if (is16BPS(c->dstFormat) || isNBPS(c->dstFormat)) {
1419 fillPlane16(dst[plane], dstStride[plane], length, height, y,1419 fillPlane16(dst[plane], dstStride[plane], length, height, y,
1420 plane == 3, desc_dst->comp[plane].depth_minus1,1420 plane == 3, desc_dst->comp[plane].depth,
1421 isBE(c->dstFormat));1421 isBE(c->dstFormat));
1422 } else {1422 } else {
1423 fillPlane(dst[plane], dstStride[plane], length, height, y,1423 fillPlane(dst[plane], dstStride[plane], length, height, y,
@@ -1427,8 +1427,8 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[], · 3 unmodified lines
1427 if(isNBPS(c->srcFormat) || isNBPS(c->dstFormat)1427 if(isNBPS(c->srcFormat) || isNBPS(c->dstFormat)
1428 || (is16BPS(c->srcFormat) != is16BPS(c->dstFormat))1428 || (is16BPS(c->srcFormat) != is16BPS(c->dstFormat))
1429 ) {1429 ) {
1430 const int src_depth = desc_src->comp[plane].depth_minus1 + 1;1430 const int src_depth = desc_src->comp[plane].depth;
1431 const int dst_depth = desc_dst->comp[plane].depth_minus1 + 1;1431 const int dst_depth = desc_dst->comp[plane].depth;
1432 const uint16_t *srcPtr2 = (const uint16_t *) srcPtr;1432 const uint16_t *srcPtr2 = (const uint16_t *) srcPtr;
1433 uint16_t *dstPtr2 = (uint16_t*)dstPtr;1433 uint16_t *dstPtr2 = (uint16_t*)dstPtr;
1434 1434
@@ -1543,7 +1543,7 @@ static int planarCopyWrapper(SwsContext *c, const uint8_t *src[], · 108 unmodified lines
1543 } else {1543 } else {
1544 if (is16BPS(c->srcFormat) && is16BPS(c->dstFormat))1544 if (is16BPS(c->srcFormat) && is16BPS(c->dstFormat))
1545 length *= 2;1545 length *= 2;
1546 else if (!desc_src->comp[0].depth_minus1)1546 else if (desc_src->comp[0].depth == 1)
1547 length >>= 3; // monowhite/black1547 length >>= 3; // monowhite/black
1548 for (i = 0; i < height; i++) {1548 for (i = 0; i < height; i++) {
1549 memcpy(dstPtr, srcPtr, length);1549 memcpy(dstPtr, srcPtr, length);
@@ -1648,7 +1648,7 @@ void ff_get_unscaled_swscale(SwsContext *c) · 98 unmodified lines
1648 dstFormat == AV_PIX_FMT_BGRA64LE || dstFormat == AV_PIX_FMT_BGRA64BE))1648 dstFormat == AV_PIX_FMT_BGRA64LE || dstFormat == AV_PIX_FMT_BGRA64BE))
1649 c->swscale = planarRgb16ToRgb16Wrapper;1649 c->swscale = planarRgb16ToRgb16Wrapper;
1650 1650
1651 if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth_minus1 == 7 &&1651 if (av_pix_fmt_desc_get(srcFormat)->comp[0].depth == 8 &&
1652 isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP)1652 isPackedRGB(srcFormat) && dstFormat == AV_PIX_FMT_GBRP)
1653 c->swscale = rgbToPlanarRgbWrapper;1653 c->swscale = rgbToPlanarRgbWrapper;
1654 1654
libswscale/utils.c+2−2
@@ -1335,10 +1335,10 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, · 1334 unmodified lines
1335 1335
1336 FF_ALLOCZ_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail);1336 FF_ALLOCZ_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail);
1337 1337
1338 c->srcBpc = 1 + desc_src->comp[0].depth_minus1;1338 c->srcBpc = desc_src->comp[0].depth;
1339 if (c->srcBpc < 8)1339 if (c->srcBpc < 8)
1340 c->srcBpc = 8;1340 c->srcBpc = 8;
1341 c->dstBpc = 1 + desc_dst->comp[0].depth_minus1;1341 c->dstBpc = desc_dst->comp[0].depth;
1342 if (c->dstBpc < 8)1342 if (c->dstBpc < 8)
1343 c->dstBpc = 8;1343 c->dstBpc = 8;
1344 if (isAnyRGB(srcFormat) || srcFormat == AV_PIX_FMT_PAL8)1344 if (isAnyRGB(srcFormat) || srcFormat == AV_PIX_FMT_PAL8)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t