Mercurial > libavcodec.hg

comparison imgconvert.c @ 10583:96d1d05cfd37 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use pixel formats names defined in av_pix_fmt_descriptors rather than in those in pix_fmt_info, and remove the not anymore used PixFmtInfo.name field.
author stefano
date Sat, 28 Nov 2009 01:13:43 +0000
parents 2c581477f8d6
children e3e0c834590e
comparison
equal deleted inserted replaced
10582:2c581477f8d6 10583:96d1d05cfd37
51 #define FF_PIXEL_PLANAR 0 /**< each channel has one component in AVPicture */ 51 #define FF_PIXEL_PLANAR 0 /**< each channel has one component in AVPicture */
52 #define FF_PIXEL_PACKED 1 /**< only one components containing all the channels */ 52 #define FF_PIXEL_PACKED 1 /**< only one components containing all the channels */
53 #define FF_PIXEL_PALETTE 2 /**< one components containing indexes for a palette */ 53 #define FF_PIXEL_PALETTE 2 /**< one components containing indexes for a palette */
54 54
55 typedef struct PixFmtInfo { 55 typedef struct PixFmtInfo {
56 const char *name;
57 uint8_t nb_channels; /**< number of channels (including alpha) */ 56 uint8_t nb_channels; /**< number of channels (including alpha) */
58 uint8_t color_type; /**< color type (see FF_COLOR_xxx constants) */ 57 uint8_t color_type; /**< color type (see FF_COLOR_xxx constants) */
59 uint8_t pixel_type; /**< pixel storage type (see FF_PIXEL_xxx constants) */ 58 uint8_t pixel_type; /**< pixel storage type (see FF_PIXEL_xxx constants) */
60 uint8_t is_alpha : 1; /**< true if alpha can be specified */ 59 uint8_t is_alpha : 1; /**< true if alpha can be specified */
61 uint8_t depth; /**< bit depth of the color components */ 60 uint8_t depth; /**< bit depth of the color components */
63 62
64 /* this table gives more information about formats */ 63 /* this table gives more information about formats */
65 static const PixFmtInfo pix_fmt_info[PIX_FMT_NB] = { 64 static const PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
66 /* YUV formats */ 65 /* YUV formats */
67 [PIX_FMT_YUV420P] = { 66 [PIX_FMT_YUV420P] = {
68 .name = "yuv420p",
69 .nb_channels = 3, 67 .nb_channels = 3,
70 .color_type = FF_COLOR_YUV, 68 .color_type = FF_COLOR_YUV,
71 .pixel_type = FF_PIXEL_PLANAR, 69 .pixel_type = FF_PIXEL_PLANAR,
72 .depth = 8, 70 .depth = 8,
73 }, 71 },
74 [PIX_FMT_YUV422P] = { 72 [PIX_FMT_YUV422P] = {
75 .name = "yuv422p",
76 .nb_channels = 3, 73 .nb_channels = 3,
77 .color_type = FF_COLOR_YUV, 74 .color_type = FF_COLOR_YUV,
78 .pixel_type = FF_PIXEL_PLANAR, 75 .pixel_type = FF_PIXEL_PLANAR,
79 .depth = 8, 76 .depth = 8,
80 }, 77 },
81 [PIX_FMT_YUV444P] = { 78 [PIX_FMT_YUV444P] = {
82 .name = "yuv444p",
83 .nb_channels = 3, 79 .nb_channels = 3,
84 .color_type = FF_COLOR_YUV, 80 .color_type = FF_COLOR_YUV,
85 .pixel_type = FF_PIXEL_PLANAR, 81 .pixel_type = FF_PIXEL_PLANAR,
86 .depth = 8, 82 .depth = 8,
87 }, 83 },
88 [PIX_FMT_YUYV422] = { 84 [PIX_FMT_YUYV422] = {
89 .name = "yuyv422",
90 .nb_channels = 1, 85 .nb_channels = 1,
91 .color_type = FF_COLOR_YUV, 86 .color_type = FF_COLOR_YUV,
92 .pixel_type = FF_PIXEL_PACKED, 87 .pixel_type = FF_PIXEL_PACKED,
93 .depth = 8, 88 .depth = 8,
94 }, 89 },
95 [PIX_FMT_UYVY422] = { 90 [PIX_FMT_UYVY422] = {
96 .name = "uyvy422",
97 .nb_channels = 1, 91 .nb_channels = 1,
98 .color_type = FF_COLOR_YUV, 92 .color_type = FF_COLOR_YUV,
99 .pixel_type = FF_PIXEL_PACKED, 93 .pixel_type = FF_PIXEL_PACKED,
100 .depth = 8, 94 .depth = 8,
101 }, 95 },
102 [PIX_FMT_YUV410P] = { 96 [PIX_FMT_YUV410P] = {
103 .name = "yuv410p",
104 .nb_channels = 3, 97 .nb_channels = 3,
105 .color_type = FF_COLOR_YUV, 98 .color_type = FF_COLOR_YUV,
106 .pixel_type = FF_PIXEL_PLANAR, 99 .pixel_type = FF_PIXEL_PLANAR,
107 .depth = 8, 100 .depth = 8,
108 }, 101 },
109 [PIX_FMT_YUV411P] = { 102 [PIX_FMT_YUV411P] = {
110 .name = "yuv411p",
111 .nb_channels = 3, 103 .nb_channels = 3,
112 .color_type = FF_COLOR_YUV, 104 .color_type = FF_COLOR_YUV,
113 .pixel_type = FF_PIXEL_PLANAR, 105 .pixel_type = FF_PIXEL_PLANAR,
114 .depth = 8, 106 .depth = 8,
115 }, 107 },
116 [PIX_FMT_YUV440P] = { 108 [PIX_FMT_YUV440P] = {
117 .name = "yuv440p",
118 .nb_channels = 3, 109 .nb_channels = 3,
119 .color_type = FF_COLOR_YUV, 110 .color_type = FF_COLOR_YUV,
120 .pixel_type = FF_PIXEL_PLANAR, 111 .pixel_type = FF_PIXEL_PLANAR,
121 .depth = 8, 112 .depth = 8,
122 }, 113 },
123 [PIX_FMT_YUV420P16LE] = { 114 [PIX_FMT_YUV420P16LE] = {
124 .name = "yuv420p16le",
125 .nb_channels = 3, 115 .nb_channels = 3,
126 .color_type = FF_COLOR_YUV, 116 .color_type = FF_COLOR_YUV,
127 .pixel_type = FF_PIXEL_PLANAR, 117 .pixel_type = FF_PIXEL_PLANAR,
128 .depth = 16, 118 .depth = 16,
129 }, 119 },
130 [PIX_FMT_YUV422P16LE] = { 120 [PIX_FMT_YUV422P16LE] = {
131 .name = "yuv422p16le",
132 .nb_channels = 3, 121 .nb_channels = 3,
133 .color_type = FF_COLOR_YUV, 122 .color_type = FF_COLOR_YUV,
134 .pixel_type = FF_PIXEL_PLANAR, 123 .pixel_type = FF_PIXEL_PLANAR,
135 .depth = 16, 124 .depth = 16,
136 }, 125 },
137 [PIX_FMT_YUV444P16LE] = { 126 [PIX_FMT_YUV444P16LE] = {
138 .name = "yuv444p16le",
139 .nb_channels = 3, 127 .nb_channels = 3,
140 .color_type = FF_COLOR_YUV, 128 .color_type = FF_COLOR_YUV,
141 .pixel_type = FF_PIXEL_PLANAR, 129 .pixel_type = FF_PIXEL_PLANAR,
142 .depth = 16, 130 .depth = 16,
143 }, 131 },
144 [PIX_FMT_YUV420P16BE] = { 132 [PIX_FMT_YUV420P16BE] = {
145 .name = "yuv420p16be",
146 .nb_channels = 3, 133 .nb_channels = 3,
147 .color_type = FF_COLOR_YUV, 134 .color_type = FF_COLOR_YUV,
148 .pixel_type = FF_PIXEL_PLANAR, 135 .pixel_type = FF_PIXEL_PLANAR,
149 .depth = 16, 136 .depth = 16,
150 }, 137 },
151 [PIX_FMT_YUV422P16BE] = { 138 [PIX_FMT_YUV422P16BE] = {
152 .name = "yuv422p16be",
153 .nb_channels = 3, 139 .nb_channels = 3,
154 .color_type = FF_COLOR_YUV, 140 .color_type = FF_COLOR_YUV,
155 .pixel_type = FF_PIXEL_PLANAR, 141 .pixel_type = FF_PIXEL_PLANAR,
156 .depth = 16, 142 .depth = 16,
157 }, 143 },
158 [PIX_FMT_YUV444P16BE] = { 144 [PIX_FMT_YUV444P16BE] = {
159 .name = "yuv444p16be",
160 .nb_channels = 3, 145 .nb_channels = 3,
161 .color_type = FF_COLOR_YUV, 146 .color_type = FF_COLOR_YUV,
162 .pixel_type = FF_PIXEL_PLANAR, 147 .pixel_type = FF_PIXEL_PLANAR,
163 .depth = 16, 148 .depth = 16,
164 }, 149 },
165 150
166 151
167 /* YUV formats with alpha plane */ 152 /* YUV formats with alpha plane */
168 [PIX_FMT_YUVA420P] = { 153 [PIX_FMT_YUVA420P] = {
169 .name = "yuva420p",
170 .nb_channels = 4, 154 .nb_channels = 4,
171 .color_type = FF_COLOR_YUV, 155 .color_type = FF_COLOR_YUV,
172 .pixel_type = FF_PIXEL_PLANAR, 156 .pixel_type = FF_PIXEL_PLANAR,
173 .depth = 8, 157 .depth = 8,
174 }, 158 },
175 159
176 /* JPEG YUV */ 160 /* JPEG YUV */
177 [PIX_FMT_YUVJ420P] = { 161 [PIX_FMT_YUVJ420P] = {
178 .name = "yuvj420p",
179 .nb_channels = 3, 162 .nb_channels = 3,
180 .color_type = FF_COLOR_YUV_JPEG, 163 .color_type = FF_COLOR_YUV_JPEG,
181 .pixel_type = FF_PIXEL_PLANAR, 164 .pixel_type = FF_PIXEL_PLANAR,
182 .depth = 8, 165 .depth = 8,
183 }, 166 },
184 [PIX_FMT_YUVJ422P] = { 167 [PIX_FMT_YUVJ422P] = {
185 .name = "yuvj422p",
186 .nb_channels = 3, 168 .nb_channels = 3,
187 .color_type = FF_COLOR_YUV_JPEG, 169 .color_type = FF_COLOR_YUV_JPEG,
188 .pixel_type = FF_PIXEL_PLANAR, 170 .pixel_type = FF_PIXEL_PLANAR,
189 .depth = 8, 171 .depth = 8,
190 }, 172 },
191 [PIX_FMT_YUVJ444P] = { 173 [PIX_FMT_YUVJ444P] = {
192 .name = "yuvj444p",
193 .nb_channels = 3, 174 .nb_channels = 3,
194 .color_type = FF_COLOR_YUV_JPEG, 175 .color_type = FF_COLOR_YUV_JPEG,
195 .pixel_type = FF_PIXEL_PLANAR, 176 .pixel_type = FF_PIXEL_PLANAR,
196 .depth = 8, 177 .depth = 8,
197 }, 178 },
198 [PIX_FMT_YUVJ440P] = { 179 [PIX_FMT_YUVJ440P] = {
199 .name = "yuvj440p",
200 .nb_channels = 3, 180 .nb_channels = 3,
201 .color_type = FF_COLOR_YUV_JPEG, 181 .color_type = FF_COLOR_YUV_JPEG,
202 .pixel_type = FF_PIXEL_PLANAR, 182 .pixel_type = FF_PIXEL_PLANAR,
203 .depth = 8, 183 .depth = 8,
204 }, 184 },
205 185
206 /* RGB formats */ 186 /* RGB formats */
207 [PIX_FMT_RGB24] = { 187 [PIX_FMT_RGB24] = {
208 .name = "rgb24",
209 .nb_channels = 3, 188 .nb_channels = 3,
210 .color_type = FF_COLOR_RGB, 189 .color_type = FF_COLOR_RGB,
211 .pixel_type = FF_PIXEL_PACKED, 190 .pixel_type = FF_PIXEL_PACKED,
212 .depth = 8, 191 .depth = 8,
213 }, 192 },
214 [PIX_FMT_BGR24] = { 193 [PIX_FMT_BGR24] = {
215 .name = "bgr24",
216 .nb_channels = 3, 194 .nb_channels = 3,
217 .color_type = FF_COLOR_RGB, 195 .color_type = FF_COLOR_RGB,
218 .pixel_type = FF_PIXEL_PACKED, 196 .pixel_type = FF_PIXEL_PACKED,
219 .depth = 8, 197 .depth = 8,
220 }, 198 },
221 [PIX_FMT_ARGB] = { 199 [PIX_FMT_ARGB] = {
222 .name = "argb",
223 .nb_channels = 4, .is_alpha = 1, 200 .nb_channels = 4, .is_alpha = 1,
224 .color_type = FF_COLOR_RGB, 201 .color_type = FF_COLOR_RGB,
225 .pixel_type = FF_PIXEL_PACKED, 202 .pixel_type = FF_PIXEL_PACKED,
226 .depth = 8, 203 .depth = 8,
227 }, 204 },
228 [PIX_FMT_RGB48BE] = { 205 [PIX_FMT_RGB48BE] = {
229 .name = "rgb48be",
230 .nb_channels = 3, 206 .nb_channels = 3,
231 .color_type = FF_COLOR_RGB, 207 .color_type = FF_COLOR_RGB,
232 .pixel_type = FF_PIXEL_PACKED, 208 .pixel_type = FF_PIXEL_PACKED,
233 .depth = 16, 209 .depth = 16,
234 }, 210 },
235 [PIX_FMT_RGB48LE] = { 211 [PIX_FMT_RGB48LE] = {
236 .name = "rgb48le",
237 .nb_channels = 3, 212 .nb_channels = 3,
238 .color_type = FF_COLOR_RGB, 213 .color_type = FF_COLOR_RGB,
239 .pixel_type = FF_PIXEL_PACKED, 214 .pixel_type = FF_PIXEL_PACKED,
240 .depth = 16, 215 .depth = 16,
241 }, 216 },
242 [PIX_FMT_RGB565BE] = { 217 [PIX_FMT_RGB565BE] = {
243 .name = "rgb565be",
244 .nb_channels = 3, 218 .nb_channels = 3,
245 .color_type = FF_COLOR_RGB, 219 .color_type = FF_COLOR_RGB,
246 .pixel_type = FF_PIXEL_PACKED, 220 .pixel_type = FF_PIXEL_PACKED,
247 .depth = 5, 221 .depth = 5,
248 }, 222 },
249 [PIX_FMT_RGB565LE] = { 223 [PIX_FMT_RGB565LE] = {
250 .name = "rgb565le",
251 .nb_channels = 3, 224 .nb_channels = 3,
252 .color_type = FF_COLOR_RGB, 225 .color_type = FF_COLOR_RGB,
253 .pixel_type = FF_PIXEL_PACKED, 226 .pixel_type = FF_PIXEL_PACKED,
254 .depth = 5, 227 .depth = 5,
255 }, 228 },
256 [PIX_FMT_RGB555BE] = { 229 [PIX_FMT_RGB555BE] = {
257 .name = "rgb555be",
258 .nb_channels = 3, 230 .nb_channels = 3,
259 .color_type = FF_COLOR_RGB, 231 .color_type = FF_COLOR_RGB,
260 .pixel_type = FF_PIXEL_PACKED, 232 .pixel_type = FF_PIXEL_PACKED,
261 .depth = 5, 233 .depth = 5,
262 }, 234 },
263 [PIX_FMT_RGB555LE] = { 235 [PIX_FMT_RGB555LE] = {
264 .name = "rgb555le",
265 .nb_channels = 3, 236 .nb_channels = 3,
266 .color_type = FF_COLOR_RGB, 237 .color_type = FF_COLOR_RGB,
267 .pixel_type = FF_PIXEL_PACKED, 238 .pixel_type = FF_PIXEL_PACKED,
268 .depth = 5, 239 .depth = 5,
269 }, 240 },
270 241
271 /* gray / mono formats */ 242 /* gray / mono formats */
272 [PIX_FMT_GRAY16BE] = { 243 [PIX_FMT_GRAY16BE] = {
273 .name = "gray16be",
274 .nb_channels = 1, 244 .nb_channels = 1,
275 .color_type = FF_COLOR_GRAY, 245 .color_type = FF_COLOR_GRAY,
276 .pixel_type = FF_PIXEL_PLANAR, 246 .pixel_type = FF_PIXEL_PLANAR,
277 .depth = 16, 247 .depth = 16,
278 }, 248 },
279 [PIX_FMT_GRAY16LE] = { 249 [PIX_FMT_GRAY16LE] = {
280 .name = "gray16le",
281 .nb_channels = 1, 250 .nb_channels = 1,
282 .color_type = FF_COLOR_GRAY, 251 .color_type = FF_COLOR_GRAY,
283 .pixel_type = FF_PIXEL_PLANAR, 252 .pixel_type = FF_PIXEL_PLANAR,
284 .depth = 16, 253 .depth = 16,
285 }, 254 },
286 [PIX_FMT_GRAY8] = { 255 [PIX_FMT_GRAY8] = {
287 .name = "gray",
288 .nb_channels = 1, 256 .nb_channels = 1,
289 .color_type = FF_COLOR_GRAY, 257 .color_type = FF_COLOR_GRAY,
290 .pixel_type = FF_PIXEL_PLANAR, 258 .pixel_type = FF_PIXEL_PLANAR,
291 .depth = 8, 259 .depth = 8,
292 }, 260 },
293 [PIX_FMT_MONOWHITE] = { 261 [PIX_FMT_MONOWHITE] = {
294 .name = "monow",
295 .nb_channels = 1, 262 .nb_channels = 1,
296 .color_type = FF_COLOR_GRAY, 263 .color_type = FF_COLOR_GRAY,
297 .pixel_type = FF_PIXEL_PLANAR, 264 .pixel_type = FF_PIXEL_PLANAR,
298 .depth = 1, 265 .depth = 1,
299 }, 266 },
300 [PIX_FMT_MONOBLACK] = { 267 [PIX_FMT_MONOBLACK] = {
301 .name = "monob",
302 .nb_channels = 1, 268 .nb_channels = 1,
303 .color_type = FF_COLOR_GRAY, 269 .color_type = FF_COLOR_GRAY,
304 .pixel_type = FF_PIXEL_PLANAR, 270 .pixel_type = FF_PIXEL_PLANAR,
305 .depth = 1, 271 .depth = 1,
306 }, 272 },
307 273
308 /* paletted formats */ 274 /* paletted formats */
309 [PIX_FMT_PAL8] = { 275 [PIX_FMT_PAL8] = {
310 .name = "pal8",
311 .nb_channels = 4, .is_alpha = 1, 276 .nb_channels = 4, .is_alpha = 1,
312 .color_type = FF_COLOR_RGB, 277 .color_type = FF_COLOR_RGB,
313 .pixel_type = FF_PIXEL_PALETTE, 278 .pixel_type = FF_PIXEL_PALETTE,
314 .depth = 8, 279 .depth = 8,
315 }, 280 },
316 [PIX_FMT_XVMC_MPEG2_MC] = { 281 [PIX_FMT_XVMC_MPEG2_MC] = {
317 .name = "xvmcmc",
318 }, 282 },
319 [PIX_FMT_XVMC_MPEG2_IDCT] = { 283 [PIX_FMT_XVMC_MPEG2_IDCT] = {
320 .name = "xvmcidct",
321 }, 284 },
322 [PIX_FMT_VDPAU_MPEG1] = { 285 [PIX_FMT_VDPAU_MPEG1] = {
323 .name = "vdpau_mpeg1",
324 }, 286 },
325 [PIX_FMT_VDPAU_MPEG2] = { 287 [PIX_FMT_VDPAU_MPEG2] = {
326 .name = "vdpau_mpeg2",
327 }, 288 },
328 [PIX_FMT_VDPAU_H264] = { 289 [PIX_FMT_VDPAU_H264] = {
329 .name = "vdpau_h264",
330 }, 290 },
331 [PIX_FMT_VDPAU_WMV3] = { 291 [PIX_FMT_VDPAU_WMV3] = {
332 .name = "vdpau_wmv3",
333 }, 292 },
334 [PIX_FMT_VDPAU_VC1] = { 293 [PIX_FMT_VDPAU_VC1] = {
335 .name = "vdpau_vc1",
336 }, 294 },
337 [PIX_FMT_VDPAU_MPEG4] = { 295 [PIX_FMT_VDPAU_MPEG4] = {
338 .name = "vdpau_mpeg4",
339 }, 296 },
340 [PIX_FMT_UYYVYY411] = { 297 [PIX_FMT_UYYVYY411] = {
341 .name = "uyyvyy411",
342 .nb_channels = 1, 298 .nb_channels = 1,
343 .color_type = FF_COLOR_YUV, 299 .color_type = FF_COLOR_YUV,
344 .pixel_type = FF_PIXEL_PACKED, 300 .pixel_type = FF_PIXEL_PACKED,
345 .depth = 8, 301 .depth = 8,
346 }, 302 },
347 [PIX_FMT_ABGR] = { 303 [PIX_FMT_ABGR] = {
348 .name = "abgr",
349 .nb_channels = 4, .is_alpha = 1, 304 .nb_channels = 4, .is_alpha = 1,
350 .color_type = FF_COLOR_RGB, 305 .color_type = FF_COLOR_RGB,
351 .pixel_type = FF_PIXEL_PACKED, 306 .pixel_type = FF_PIXEL_PACKED,
352 .depth = 8, 307 .depth = 8,
353 }, 308 },
354 [PIX_FMT_BGR565BE] = { 309 [PIX_FMT_BGR565BE] = {
355 .name = "bgr565be",
356 .nb_channels = 3, 310 .nb_channels = 3,
357 .color_type = FF_COLOR_RGB, 311 .color_type = FF_COLOR_RGB,
358 .pixel_type = FF_PIXEL_PACKED, 312 .pixel_type = FF_PIXEL_PACKED,
359 .depth = 5, 313 .depth = 5,
360 }, 314 },
361 [PIX_FMT_BGR565LE] = { 315 [PIX_FMT_BGR565LE] = {
362 .name = "bgr565le",
363 .nb_channels = 3, 316 .nb_channels = 3,
364 .color_type = FF_COLOR_RGB, 317 .color_type = FF_COLOR_RGB,
365 .pixel_type = FF_PIXEL_PACKED, 318 .pixel_type = FF_PIXEL_PACKED,
366 .depth = 5, 319 .depth = 5,
367 }, 320 },
368 [PIX_FMT_BGR555BE] = { 321 [PIX_FMT_BGR555BE] = {
369 .name = "bgr555be",
370 .nb_channels = 3, 322 .nb_channels = 3,
371 .color_type = FF_COLOR_RGB, 323 .color_type = FF_COLOR_RGB,
372 .pixel_type = FF_PIXEL_PACKED, 324 .pixel_type = FF_PIXEL_PACKED,
373 .depth = 5, 325 .depth = 5,
374 }, 326 },
375 [PIX_FMT_BGR555LE] = { 327 [PIX_FMT_BGR555LE] = {
376 .name = "bgr555le",
377 .nb_channels = 3, 328 .nb_channels = 3,
378 .color_type = FF_COLOR_RGB, 329 .color_type = FF_COLOR_RGB,
379 .pixel_type = FF_PIXEL_PACKED, 330 .pixel_type = FF_PIXEL_PACKED,
380 .depth = 5, 331 .depth = 5,
381 }, 332 },
382 [PIX_FMT_RGB8] = { 333 [PIX_FMT_RGB8] = {
383 .name = "rgb8",
384 .nb_channels = 1, 334 .nb_channels = 1,
385 .color_type = FF_COLOR_RGB, 335 .color_type = FF_COLOR_RGB,
386 .pixel_type = FF_PIXEL_PACKED, 336 .pixel_type = FF_PIXEL_PACKED,
387 .depth = 8, 337 .depth = 8,
388 }, 338 },
389 [PIX_FMT_RGB4] = { 339 [PIX_FMT_RGB4] = {
390 .name = "rgb4",
391 .nb_channels = 1, 340 .nb_channels = 1,
392 .color_type = FF_COLOR_RGB, 341 .color_type = FF_COLOR_RGB,
393 .pixel_type = FF_PIXEL_PACKED, 342 .pixel_type = FF_PIXEL_PACKED,
394 .depth = 4, 343 .depth = 4,
395 }, 344 },
396 [PIX_FMT_RGB4_BYTE] = { 345 [PIX_FMT_RGB4_BYTE] = {
397 .name = "rgb4_byte",
398 .nb_channels = 1, 346 .nb_channels = 1,
399 .color_type = FF_COLOR_RGB, 347 .color_type = FF_COLOR_RGB,
400 .pixel_type = FF_PIXEL_PACKED, 348 .pixel_type = FF_PIXEL_PACKED,
401 .depth = 8, 349 .depth = 8,
402 }, 350 },
403 [PIX_FMT_BGR8] = { 351 [PIX_FMT_BGR8] = {
404 .name = "bgr8",
405 .nb_channels = 1, 352 .nb_channels = 1,
406 .color_type = FF_COLOR_RGB, 353 .color_type = FF_COLOR_RGB,
407 .pixel_type = FF_PIXEL_PACKED, 354 .pixel_type = FF_PIXEL_PACKED,
408 .depth = 8, 355 .depth = 8,
409 }, 356 },
410 [PIX_FMT_BGR4] = { 357 [PIX_FMT_BGR4] = {
411 .name = "bgr4",
412 .nb_channels = 1, 358 .nb_channels = 1,
413 .color_type = FF_COLOR_RGB, 359 .color_type = FF_COLOR_RGB,
414 .pixel_type = FF_PIXEL_PACKED, 360 .pixel_type = FF_PIXEL_PACKED,
415 .depth = 4, 361 .depth = 4,
416 }, 362 },
417 [PIX_FMT_BGR4_BYTE] = { 363 [PIX_FMT_BGR4_BYTE] = {
418 .name = "bgr4_byte",
419 .nb_channels = 1, 364 .nb_channels = 1,
420 .color_type = FF_COLOR_RGB, 365 .color_type = FF_COLOR_RGB,
421 .pixel_type = FF_PIXEL_PACKED, 366 .pixel_type = FF_PIXEL_PACKED,
422 .depth = 8, 367 .depth = 8,
423 }, 368 },
424 [PIX_FMT_NV12] = { 369 [PIX_FMT_NV12] = {
425 .name = "nv12",
426 .nb_channels = 2, 370 .nb_channels = 2,
427 .color_type = FF_COLOR_YUV, 371 .color_type = FF_COLOR_YUV,
428 .pixel_type = FF_PIXEL_PLANAR, 372 .pixel_type = FF_PIXEL_PLANAR,
429 .depth = 8, 373 .depth = 8,
430 }, 374 },
431 [PIX_FMT_NV21] = { 375 [PIX_FMT_NV21] = {
432 .name = "nv21",
433 .nb_channels = 2, 376 .nb_channels = 2,
434 .color_type = FF_COLOR_YUV, 377 .color_type = FF_COLOR_YUV,
435 .pixel_type = FF_PIXEL_PLANAR, 378 .pixel_type = FF_PIXEL_PLANAR,
436 .depth = 8, 379 .depth = 8,
437 }, 380 },
438 381
439 [PIX_FMT_BGRA] = { 382 [PIX_FMT_BGRA] = {
440 .name = "bgra",
441 .nb_channels = 4, .is_alpha = 1, 383 .nb_channels = 4, .is_alpha = 1,
442 .color_type = FF_COLOR_RGB, 384 .color_type = FF_COLOR_RGB,
443 .pixel_type = FF_PIXEL_PACKED, 385 .pixel_type = FF_PIXEL_PACKED,
444 .depth = 8, 386 .depth = 8,
445 }, 387 },
446 [PIX_FMT_RGBA] = { 388 [PIX_FMT_RGBA] = {
447 .name = "rgba",
448 .nb_channels = 4, .is_alpha = 1, 389 .nb_channels = 4, .is_alpha = 1,
449 .color_type = FF_COLOR_RGB, 390 .color_type = FF_COLOR_RGB,
450 .pixel_type = FF_PIXEL_PACKED, 391 .pixel_type = FF_PIXEL_PACKED,
451 .depth = 8, 392 .depth = 8,
452 }, 393 },
453 394
454 /* VA API formats */ 395 /* VA API formats */
455 [PIX_FMT_VAAPI_MOCO] = { 396 [PIX_FMT_VAAPI_MOCO] = {
456 .name = "vaapi_moco",
457 }, 397 },
458 [PIX_FMT_VAAPI_IDCT] = { 398 [PIX_FMT_VAAPI_IDCT] = {
459 .name = "vaapi_idct",
460 }, 399 },
461 [PIX_FMT_VAAPI_VLD] = { 400 [PIX_FMT_VAAPI_VLD] = {
462 .name = "vaapi_vld",
463 }, 401 },
464 }; 402 };
465 403
466 void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift) 404 void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift)
467 { 405 {
480 static enum PixelFormat avcodec_get_pix_fmt_internal(const char *name) 418 static enum PixelFormat avcodec_get_pix_fmt_internal(const char *name)
481 { 419 {
482 int i; 420 int i;
483 421
484 for (i=0; i < PIX_FMT_NB; i++) 422 for (i=0; i < PIX_FMT_NB; i++)
485 if (pix_fmt_info[i].name && !strcmp(pix_fmt_info[i].name, name)) 423 if (av_pix_fmt_descriptors[i].name && !strcmp(av_pix_fmt_descriptors[i].name, name))
486 return i; 424 return i;
487 return PIX_FMT_NONE; 425 return PIX_FMT_NONE;
488 } 426 }
489 427
490 #if HAVE_BIGENDIAN 428 #if HAVE_BIGENDIAN
523 461
524 char is_alpha_char= info.is_alpha ? 'y' : 'n'; 462 char is_alpha_char= info.is_alpha ? 'y' : 'n';
525 463
526 snprintf (buf, buf_size, 464 snprintf (buf, buf_size,
527 "%-11s %5d %9d %6c", 465 "%-11s %5d %9d %6c",
528 info.name, 466 av_pix_fmt_descriptors[pix_fmt].name,
529 info.nb_channels, 467 info.nb_channels,
530 info.depth, 468 info.depth,
531 is_alpha_char 469 is_alpha_char
532 ); 470 );
533 } 471 }