annotate imgconvert.c @ 11352:6e0af2cfdcfe libavcodec

Do MC and IDCT in coding (hilbert) order This increases the slice size to 64 pixels, due to having to decode an entire chroma superblock row per slice. This can be up to 6% slower depending on clip and CPU, but is necessary for future optimizations that gain significantly more than was lost.
author conrad
date Wed, 03 Mar 2010 23:27:40 +0000
parents ad0ea9f21f9a
children eb03ee2f7781
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
5355
45d083bbbbe7 typo fixes
diego
parents: 5354
diff changeset
2 * Misc image conversion routines
8629
04423b2f6e0b cosmetics: Remove pointless period after copyright statement non-sentences.
diego
parents: 8601
diff changeset
3 * Copyright (c) 2001, 2002, 2003 Fabrice Bellard
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3646
diff changeset
5 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3646
diff changeset
6 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3646
diff changeset
7 * FFmpeg is free software; you can redistribute it and/or
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
8 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
9 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3646
diff changeset
10 * version 2.1 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3646
diff changeset
12 * FFmpeg is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
15 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
16 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3646
diff changeset
18 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
21
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
22 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8631
diff changeset
23 * @file libavcodec/imgconvert.c
5355
45d083bbbbe7 typo fixes
diego
parents: 5354
diff changeset
24 * misc image conversion routines
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
25 */
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
26
1203
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
27 /* TODO:
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
28 * - write 'ffimg' program to test all the image related stuff
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
29 * - move all api to slice based system
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
30 * - integrate deinterlacing, postprocessing and scaling in the conversion process
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
31 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
32
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
33 #include "avcodec.h"
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
34 #include "dsputil.h"
5354
dfa6e7fa2bac create colorspace.h and use it where appropriate
benoit
parents: 5084
diff changeset
35 #include "colorspace.h"
11318
ad0ea9f21f9a Include internal.h and imgconvert.h, they contain the prototypes for the
cehoyos
parents: 11059
diff changeset
36 #include "internal.h"
ad0ea9f21f9a Include internal.h and imgconvert.h, they contain the prototypes for the
cehoyos
parents: 11059
diff changeset
37 #include "imgconvert.h"
10572
a21b640dba50 Use av_pix_fmt_descriptors in ff_is_hwaccel_pix_fmt() rather than
stefano
parents: 10569
diff changeset
38 #include "libavutil/pixdesc.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
39
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
40 #if HAVE_MMX
8430
7768bdfd4f7b Rename libavcodec/i386/ --> libavcodec/x86/.
diego
parents: 8321
diff changeset
41 #include "x86/mmx.h"
7768bdfd4f7b Rename libavcodec/i386/ --> libavcodec/x86/.
diego
parents: 8321
diff changeset
42 #include "x86/dsputil_mmx.h"
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
43 #endif
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
44
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
45 #define xglue(x, y) x ## y
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
46 #define glue(x, y) xglue(x, y)
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
47
4549
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
48 #define FF_COLOR_RGB 0 /**< RGB color space */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
49 #define FF_COLOR_GRAY 1 /**< gray color space */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
50 #define FF_COLOR_YUV 2 /**< YUV color space. 16 <= Y <= 235, 16 <= U, V <= 240 */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
51 #define FF_COLOR_YUV_JPEG 3 /**< YUV color space. 0 <= Y <= 255, 0 <= U, V <= 255 */
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
52
4549
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
53 #define FF_PIXEL_PLANAR 0 /**< each channel has one component in AVPicture */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
54 #define FF_PIXEL_PACKED 1 /**< only one components containing all the channels */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
55 #define FF_PIXEL_PALETTE 2 /**< one components containing indexes for a palette */
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
56
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
57 typedef struct PixFmtInfo {
4549
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
58 uint8_t nb_channels; /**< number of channels (including alpha) */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
59 uint8_t color_type; /**< color type (see FF_COLOR_xxx constants) */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
60 uint8_t pixel_type; /**< pixel storage type (see FF_PIXEL_xxx constants) */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
61 uint8_t is_alpha : 1; /**< true if alpha can be specified */
48442cb0ebfa add doxygen docs for avpicture_fill()
gpoirier
parents: 4517
diff changeset
62 uint8_t depth; /**< bit depth of the color components */
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
63 } PixFmtInfo;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
64
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
65 /* this table gives more information about formats */
3420
54814e15aa3d Mark some read-only datastructures as const.
diego
parents: 3266
diff changeset
66 static const PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
67 /* YUV formats */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
68 [PIX_FMT_YUV420P] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
69 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
70 .color_type = FF_COLOR_YUV,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
71 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
72 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
73 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
74 [PIX_FMT_YUV422P] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
75 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
76 .color_type = FF_COLOR_YUV,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
77 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
78 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
79 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
80 [PIX_FMT_YUV444P] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
81 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
82 .color_type = FF_COLOR_YUV,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
83 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
84 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
85 },
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
86 [PIX_FMT_YUYV422] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
87 .nb_channels = 1,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
88 .color_type = FF_COLOR_YUV,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
89 .pixel_type = FF_PIXEL_PACKED,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
90 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
91 },
2137
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
92 [PIX_FMT_UYVY422] = {
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
93 .nb_channels = 1,
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
94 .color_type = FF_COLOR_YUV,
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
95 .pixel_type = FF_PIXEL_PACKED,
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
96 .depth = 8,
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
97 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
98 [PIX_FMT_YUV410P] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
99 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
100 .color_type = FF_COLOR_YUV,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
101 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
102 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
103 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
104 [PIX_FMT_YUV411P] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
105 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
106 .color_type = FF_COLOR_YUV,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
107 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
108 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
109 },
5363
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
110 [PIX_FMT_YUV440P] = {
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
111 .nb_channels = 3,
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
112 .color_type = FF_COLOR_YUV,
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
113 .pixel_type = FF_PIXEL_PLANAR,
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
114 .depth = 8,
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
115 },
10136
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
116 [PIX_FMT_YUV420P16LE] = {
9519
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
117 .nb_channels = 3,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
118 .color_type = FF_COLOR_YUV,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
119 .pixel_type = FF_PIXEL_PLANAR,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
120 .depth = 16,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
121 },
10136
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
122 [PIX_FMT_YUV422P16LE] = {
9519
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
123 .nb_channels = 3,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
124 .color_type = FF_COLOR_YUV,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
125 .pixel_type = FF_PIXEL_PLANAR,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
126 .depth = 16,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
127 },
10136
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
128 [PIX_FMT_YUV444P16LE] = {
9519
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
129 .nb_channels = 3,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
130 .color_type = FF_COLOR_YUV,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
131 .pixel_type = FF_PIXEL_PLANAR,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
132 .depth = 16,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
133 },
10136
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
134 [PIX_FMT_YUV420P16BE] = {
9519
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
135 .nb_channels = 3,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
136 .color_type = FF_COLOR_YUV,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
137 .pixel_type = FF_PIXEL_PLANAR,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
138 .depth = 16,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
139 },
10136
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
140 [PIX_FMT_YUV422P16BE] = {
9519
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
141 .nb_channels = 3,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
142 .color_type = FF_COLOR_YUV,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
143 .pixel_type = FF_PIXEL_PLANAR,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
144 .depth = 16,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
145 },
10136
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
146 [PIX_FMT_YUV444P16BE] = {
9519
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
147 .nb_channels = 3,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
148 .color_type = FF_COLOR_YUV,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
149 .pixel_type = FF_PIXEL_PLANAR,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
150 .depth = 16,
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
151 },
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
152
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
153
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
154 /* YUV formats with alpha plane */
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
155 [PIX_FMT_YUVA420P] = {
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
156 .nb_channels = 4,
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
157 .color_type = FF_COLOR_YUV,
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
158 .pixel_type = FF_PIXEL_PLANAR,
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
159 .depth = 8,
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
160 },
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
161
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
162 /* JPEG YUV */
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
163 [PIX_FMT_YUVJ420P] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
164 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
165 .color_type = FF_COLOR_YUV_JPEG,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
166 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
167 .depth = 8,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
168 },
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
169 [PIX_FMT_YUVJ422P] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
170 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
171 .color_type = FF_COLOR_YUV_JPEG,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
172 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
173 .depth = 8,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
174 },
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
175 [PIX_FMT_YUVJ444P] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
176 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
177 .color_type = FF_COLOR_YUV_JPEG,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
178 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
179 .depth = 8,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
180 },
5363
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
181 [PIX_FMT_YUVJ440P] = {
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
182 .nb_channels = 3,
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
183 .color_type = FF_COLOR_YUV_JPEG,
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
184 .pixel_type = FF_PIXEL_PLANAR,
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
185 .depth = 8,
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
186 },
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
187
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
188 /* RGB formats */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
189 [PIX_FMT_RGB24] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
190 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
191 .color_type = FF_COLOR_RGB,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
192 .pixel_type = FF_PIXEL_PACKED,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
193 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
194 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
195 [PIX_FMT_BGR24] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
196 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
197 .color_type = FF_COLOR_RGB,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
198 .pixel_type = FF_PIXEL_PACKED,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
199 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
200 },
9245
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
201 [PIX_FMT_ARGB] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
202 .nb_channels = 4, .is_alpha = 1,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
203 .color_type = FF_COLOR_RGB,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
204 .pixel_type = FF_PIXEL_PACKED,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
205 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
206 },
9001
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
207 [PIX_FMT_RGB48BE] = {
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
208 .nb_channels = 3,
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
209 .color_type = FF_COLOR_RGB,
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
210 .pixel_type = FF_PIXEL_PACKED,
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
211 .depth = 16,
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
212 },
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
213 [PIX_FMT_RGB48LE] = {
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
214 .nb_channels = 3,
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
215 .color_type = FF_COLOR_RGB,
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
216 .pixel_type = FF_PIXEL_PACKED,
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
217 .depth = 16,
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
218 },
9223
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
219 [PIX_FMT_RGB565BE] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
220 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
221 .color_type = FF_COLOR_RGB,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
222 .pixel_type = FF_PIXEL_PACKED,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
223 .depth = 5,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
224 },
9223
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
225 [PIX_FMT_RGB565LE] = {
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
226 .nb_channels = 3,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
227 .color_type = FF_COLOR_RGB,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
228 .pixel_type = FF_PIXEL_PACKED,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
229 .depth = 5,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
230 },
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
231 [PIX_FMT_RGB555BE] = {
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
232 .nb_channels = 3,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
233 .color_type = FF_COLOR_RGB,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
234 .pixel_type = FF_PIXEL_PACKED,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
235 .depth = 5,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
236 },
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
237 [PIX_FMT_RGB555LE] = {
4208
45e0102824fb Remove alpha channel from RGB555
alex
parents: 4207
diff changeset
238 .nb_channels = 3,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
239 .color_type = FF_COLOR_RGB,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
240 .pixel_type = FF_PIXEL_PACKED,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
241 .depth = 5,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
242 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
243
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
244 /* gray / mono formats */
4066
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
245 [PIX_FMT_GRAY16BE] = {
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
246 .nb_channels = 1,
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
247 .color_type = FF_COLOR_GRAY,
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
248 .pixel_type = FF_PIXEL_PLANAR,
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
249 .depth = 16,
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
250 },
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
251 [PIX_FMT_GRAY16LE] = {
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
252 .nb_channels = 1,
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
253 .color_type = FF_COLOR_GRAY,
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
254 .pixel_type = FF_PIXEL_PLANAR,
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
255 .depth = 16,
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
256 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
257 [PIX_FMT_GRAY8] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
258 .nb_channels = 1,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
259 .color_type = FF_COLOR_GRAY,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
260 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
261 .depth = 8,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
262 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
263 [PIX_FMT_MONOWHITE] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
264 .nb_channels = 1,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
265 .color_type = FF_COLOR_GRAY,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
266 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
267 .depth = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
268 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
269 [PIX_FMT_MONOBLACK] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
270 .nb_channels = 1,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
271 .color_type = FF_COLOR_GRAY,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
272 .pixel_type = FF_PIXEL_PLANAR,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
273 .depth = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
274 },
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
275
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
276 /* paletted formats */
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
277 [PIX_FMT_PAL8] = {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
278 .nb_channels = 4, .is_alpha = 1,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
279 .color_type = FF_COLOR_RGB,
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
280 .pixel_type = FF_PIXEL_PALETTE,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
281 .depth = 8,
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
282 },
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
283 [PIX_FMT_UYYVYY411] = {
2309
550ae8914fd3 * Introducing IIDC1394 grabbing interface.
romansh
parents: 2179
diff changeset
284 .nb_channels = 1,
550ae8914fd3 * Introducing IIDC1394 grabbing interface.
romansh
parents: 2179
diff changeset
285 .color_type = FF_COLOR_YUV,
550ae8914fd3 * Introducing IIDC1394 grabbing interface.
romansh
parents: 2179
diff changeset
286 .pixel_type = FF_PIXEL_PACKED,
550ae8914fd3 * Introducing IIDC1394 grabbing interface.
romansh
parents: 2179
diff changeset
287 .depth = 8,
550ae8914fd3 * Introducing IIDC1394 grabbing interface.
romansh
parents: 2179
diff changeset
288 },
9245
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
289 [PIX_FMT_ABGR] = {
3646
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
290 .nb_channels = 4, .is_alpha = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
291 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
292 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
293 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
294 },
9223
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
295 [PIX_FMT_BGR565BE] = {
3646
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
296 .nb_channels = 3,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
297 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
298 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
299 .depth = 5,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
300 },
9223
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
301 [PIX_FMT_BGR565LE] = {
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
302 .nb_channels = 3,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
303 .color_type = FF_COLOR_RGB,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
304 .pixel_type = FF_PIXEL_PACKED,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
305 .depth = 5,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
306 },
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
307 [PIX_FMT_BGR555BE] = {
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
308 .nb_channels = 3,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
309 .color_type = FF_COLOR_RGB,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
310 .pixel_type = FF_PIXEL_PACKED,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
311 .depth = 5,
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
312 },
53f2c0f6e71d Change the RGB5X5/BGR5X5 pixel format defines so that we have little
stefano
parents: 9222
diff changeset
313 [PIX_FMT_BGR555LE] = {
4207
bc9de4875ebd BGR555 has never been working as alpha supporting format. Remove the false setting.
alex
parents: 4201
diff changeset
314 .nb_channels = 3,
3646
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
315 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
316 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
317 .depth = 5,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
318 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
319 [PIX_FMT_RGB8] = {
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
320 .nb_channels = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
321 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
322 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
323 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
324 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
325 [PIX_FMT_RGB4] = {
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
326 .nb_channels = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
327 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
328 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
329 .depth = 4,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
330 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
331 [PIX_FMT_RGB4_BYTE] = {
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
332 .nb_channels = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
333 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
334 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
335 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
336 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
337 [PIX_FMT_BGR8] = {
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
338 .nb_channels = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
339 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
340 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
341 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
342 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
343 [PIX_FMT_BGR4] = {
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
344 .nb_channels = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
345 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
346 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
347 .depth = 4,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
348 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
349 [PIX_FMT_BGR4_BYTE] = {
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
350 .nb_channels = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
351 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
352 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
353 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
354 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
355 [PIX_FMT_NV12] = {
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
356 .nb_channels = 2,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
357 .color_type = FF_COLOR_YUV,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
358 .pixel_type = FF_PIXEL_PLANAR,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
359 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
360 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
361 [PIX_FMT_NV21] = {
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
362 .nb_channels = 2,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
363 .color_type = FF_COLOR_YUV,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
364 .pixel_type = FF_PIXEL_PLANAR,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
365 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
366 },
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
367
9245
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
368 [PIX_FMT_BGRA] = {
3646
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
369 .nb_channels = 4, .is_alpha = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
370 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
371 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
372 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
373 },
9245
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
374 [PIX_FMT_RGBA] = {
3646
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
375 .nb_channels = 4, .is_alpha = 1,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
376 .color_type = FF_COLOR_RGB,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
377 .pixel_type = FF_PIXEL_PACKED,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
378 .depth = 8,
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
379 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
380 };
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
381
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
382 void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift)
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
383 {
10573
ac49ab818d4d Use av_pix_fmt_descriptors in avcodec_get_chroma_sub_sample(), rather
stefano
parents: 10572
diff changeset
384 *h_shift = av_pix_fmt_descriptors[pix_fmt].log2_chroma_w;
ac49ab818d4d Use av_pix_fmt_descriptors in avcodec_get_chroma_sub_sample(), rather
stefano
parents: 10572
diff changeset
385 *v_shift = av_pix_fmt_descriptors[pix_fmt].log2_chroma_h;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
386 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
387
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
388 const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt)
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
389 {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
390 if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB)
7463
5515e19b9137 Add graceful error handling to avcodec_get_pix_fmt_name() and avcodec_get_pix_fmt().
pross
parents: 6963
diff changeset
391 return NULL;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
392 else
10579
dacdec913c5b Make avcodec_get_pix_fmt_name() use av_pix_fmt_descriptors rather than
stefano
parents: 10577
diff changeset
393 return av_pix_fmt_descriptors[pix_fmt].name;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
394 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
395
11059
e1bc53867092 Implement av_get_pix_fmt(), and deprecate avcodec_get_pix_fmt().
stefano
parents: 10682
diff changeset
396 #if LIBAVCODEC_VERSION_MAJOR < 53
9222
e314914641bc Extend the behavior of avcodec_get_pix_fmt(), if it cannot find a
stefano
parents: 9221
diff changeset
397 enum PixelFormat avcodec_get_pix_fmt(const char *name)
e314914641bc Extend the behavior of avcodec_get_pix_fmt(), if it cannot find a
stefano
parents: 9221
diff changeset
398 {
11059
e1bc53867092 Implement av_get_pix_fmt(), and deprecate avcodec_get_pix_fmt().
stefano
parents: 10682
diff changeset
399 return av_get_pix_fmt(name);
9222
e314914641bc Extend the behavior of avcodec_get_pix_fmt(), if it cannot find a
stefano
parents: 9221
diff changeset
400 }
11059
e1bc53867092 Implement av_get_pix_fmt(), and deprecate avcodec_get_pix_fmt().
stefano
parents: 10682
diff changeset
401 #endif
9222
e314914641bc Extend the behavior of avcodec_get_pix_fmt(), if it cannot find a
stefano
parents: 9221
diff changeset
402
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
403 void avcodec_pix_fmt_string (char *buf, int buf_size, enum PixelFormat pix_fmt)
5084
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
404 {
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
405 /* print header */
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
406 if (pix_fmt < 0)
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
407 snprintf (buf, buf_size,
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
408 "name " " nb_channels" " depth" " is_alpha"
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
409 );
6911
0e2576b1e753 Do not read from prior the array, fix CID 127.
michael
parents: 6750
diff changeset
410 else{
0e2576b1e753 Do not read from prior the array, fix CID 127.
michael
parents: 6750
diff changeset
411 PixFmtInfo info= pix_fmt_info[pix_fmt];
0e2576b1e753 Do not read from prior the array, fix CID 127.
michael
parents: 6750
diff changeset
412
0e2576b1e753 Do not read from prior the array, fix CID 127.
michael
parents: 6750
diff changeset
413 char is_alpha_char= info.is_alpha ? 'y' : 'n';
0e2576b1e753 Do not read from prior the array, fix CID 127.
michael
parents: 6750
diff changeset
414
5084
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
415 snprintf (buf, buf_size,
10277
ddd69069dfa5 simplify format string for writing pix_fmt string.
jbr
parents: 10271
diff changeset
416 "%-11s %5d %9d %6c",
10583
96d1d05cfd37 Use pixel formats names defined in av_pix_fmt_descriptors rather than
stefano
parents: 10582
diff changeset
417 av_pix_fmt_descriptors[pix_fmt].name,
5084
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
418 info.nb_channels,
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
419 info.depth,
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
420 is_alpha_char
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
421 );
6911
0e2576b1e753 Do not read from prior the array, fix CID 127.
michael
parents: 6750
diff changeset
422 }
5084
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
423 }
9930b7031cb2 Add support for listing the supported pixel formats using the option
benoit
parents: 5077
diff changeset
424
9011
90c99bda19f5 Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents: 9007
diff changeset
425 int ff_is_hwaccel_pix_fmt(enum PixelFormat pix_fmt)
90c99bda19f5 Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents: 9007
diff changeset
426 {
10572
a21b640dba50 Use av_pix_fmt_descriptors in ff_is_hwaccel_pix_fmt() rather than
stefano
parents: 10569
diff changeset
427 return av_pix_fmt_descriptors[pix_fmt].flags & PIX_FMT_HWACCEL;
9011
90c99bda19f5 Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents: 9007
diff changeset
428 }
90c99bda19f5 Approved hunks for VAAPI / our new shiny hwaccel API
michael
parents: 9007
diff changeset
429
8748
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
430 int ff_set_systematic_pal(uint32_t pal[256], enum PixelFormat pix_fmt){
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
431 int i;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
432
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
433 for(i=0; i<256; i++){
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
434 int r,g,b;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
435
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
436 switch(pix_fmt) {
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
437 case PIX_FMT_RGB8:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
438 r= (i>>5 )*36;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
439 g= ((i>>2)&7)*36;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
440 b= (i&3 )*85;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
441 break;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
442 case PIX_FMT_BGR8:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
443 b= (i>>6 )*85;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
444 g= ((i>>3)&7)*36;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
445 r= (i&7 )*36;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
446 break;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
447 case PIX_FMT_RGB4_BYTE:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
448 r= (i>>3 )*255;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
449 g= ((i>>1)&3)*85;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
450 b= (i&1 )*255;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
451 break;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
452 case PIX_FMT_BGR4_BYTE:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
453 b= (i>>3 )*255;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
454 g= ((i>>1)&3)*85;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
455 r= (i&1 )*255;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
456 break;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
457 case PIX_FMT_GRAY8:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
458 r=b=g= i;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
459 break;
8788
5e9e735cd793 Add a default (error) for the switch in case of an unsupported PIX_FMT.
gpoirier
parents: 8748
diff changeset
460 default:
5e9e735cd793 Add a default (error) for the switch in case of an unsupported PIX_FMT.
gpoirier
parents: 8748
diff changeset
461 return -1;
8748
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
462 }
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
463 pal[i] = b + (g<<8) + (r<<16);
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
464 }
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
465
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
466 return 0;
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
467 }
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
468
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
469 int ff_fill_linesize(AVPicture *picture, enum PixelFormat pix_fmt, int width)
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
470 {
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
471 int w2;
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
472 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
473
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
474 memset(picture->linesize, 0, sizeof(picture->linesize));
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2366
diff changeset
475
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
476 switch(pix_fmt) {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
477 case PIX_FMT_YUV420P:
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
478 case PIX_FMT_YUV422P:
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
479 case PIX_FMT_YUV444P:
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
480 case PIX_FMT_YUV410P:
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
481 case PIX_FMT_YUV411P:
5363
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
482 case PIX_FMT_YUV440P:
1203
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
483 case PIX_FMT_YUVJ420P:
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
484 case PIX_FMT_YUVJ422P:
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
485 case PIX_FMT_YUVJ444P:
5363
1a25f2f6316e add YUV440P and YUVJ440P support
benoit
parents: 5355
diff changeset
486 case PIX_FMT_YUVJ440P:
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
487 w2 = (width + (1 << desc->log2_chroma_w) - 1) >> desc->log2_chroma_w;
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
488 picture->linesize[0] = width;
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
489 picture->linesize[1] = w2;
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
490 picture->linesize[2] = w2;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
491 break;
10136
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
492 case PIX_FMT_YUV420P16LE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
493 case PIX_FMT_YUV422P16LE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
494 case PIX_FMT_YUV444P16LE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
495 case PIX_FMT_YUV420P16BE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
496 case PIX_FMT_YUV422P16BE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
497 case PIX_FMT_YUV444P16BE:
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
498 w2 = (width + (1 << desc->log2_chroma_w) - 1) >> desc->log2_chroma_w;
9519
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
499 picture->linesize[0] = 2*width;
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
500 picture->linesize[1] = 2*w2;
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
501 picture->linesize[2] = 2*w2;
d42979883bb1 Add 420,422 and 444 planar 16bit per component pix formats.
michael
parents: 9483
diff changeset
502 break;
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
503 case PIX_FMT_YUVA420P:
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
504 w2 = (width + (1 << desc->log2_chroma_w) - 1) >> desc->log2_chroma_w;
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
505 picture->linesize[0] = width;
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
506 picture->linesize[1] = w2;
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
507 picture->linesize[2] = w2;
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
508 picture->linesize[3] = width;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
509 break;
3646
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
510 case PIX_FMT_NV12:
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
511 case PIX_FMT_NV21:
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
512 w2 = (width + (1 << desc->log2_chroma_w) - 1) >> desc->log2_chroma_w;
3646
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
513 picture->linesize[0] = width;
10569
7a8b35405591 Fix nv12/nv21 handling. linesize for plane 1 should account for both chroma
ramiro
parents: 10546
diff changeset
514 picture->linesize[1] = 2 * w2;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
515 break;
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
516 case PIX_FMT_RGB24:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
517 case PIX_FMT_BGR24:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
518 picture->linesize[0] = width * 3;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
519 break;
9245
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
520 case PIX_FMT_ARGB:
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
521 case PIX_FMT_ABGR:
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
522 case PIX_FMT_RGBA:
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
523 case PIX_FMT_BGRA:
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
524 picture->linesize[0] = width * 4;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
525 break;
9001
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
526 case PIX_FMT_RGB48BE:
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
527 case PIX_FMT_RGB48LE:
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
528 picture->linesize[0] = width * 6;
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
529 break;
4066
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
530 case PIX_FMT_GRAY16BE:
a3f06c7a0bff 16-bit grayscale support
kostya
parents: 3947
diff changeset
531 case PIX_FMT_GRAY16LE:
10043
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
532 case PIX_FMT_BGR555BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
533 case PIX_FMT_BGR555LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
534 case PIX_FMT_BGR565BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
535 case PIX_FMT_BGR565LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
536 case PIX_FMT_RGB555BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
537 case PIX_FMT_RGB555LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
538 case PIX_FMT_RGB565BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
539 case PIX_FMT_RGB565LE:
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
540 case PIX_FMT_YUYV422:
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
541 picture->linesize[0] = width * 2;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
542 break;
2137
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
543 case PIX_FMT_UYVY422:
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
544 picture->linesize[0] = width * 2;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
545 break;
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
546 case PIX_FMT_UYYVYY411:
2309
550ae8914fd3 * Introducing IIDC1394 grabbing interface.
romansh
parents: 2179
diff changeset
547 picture->linesize[0] = width + width/2;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
548 break;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
549 case PIX_FMT_RGB4:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
550 case PIX_FMT_BGR4:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
551 picture->linesize[0] = width / 2;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
552 break;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
553 case PIX_FMT_MONOWHITE:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
554 case PIX_FMT_MONOBLACK:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
555 picture->linesize[0] = (width + 7) >> 3;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
556 break;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
557 case PIX_FMT_PAL8:
8748
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
558 case PIX_FMT_RGB8:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
559 case PIX_FMT_BGR8:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
560 case PIX_FMT_RGB4_BYTE:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
561 case PIX_FMT_BGR4_BYTE:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
562 case PIX_FMT_GRAY8:
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
563 picture->linesize[0] = width;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
564 break;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
565 default:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
566 return -1;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
567 }
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
568 return 0;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
569 }
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
570
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
571 int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, enum PixelFormat pix_fmt,
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
572 int height)
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
573 {
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
574 int size, h2, size2;
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
575 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
576
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
577 size = picture->linesize[0] * height;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
578 switch(pix_fmt) {
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
579 case PIX_FMT_YUV420P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
580 case PIX_FMT_YUV422P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
581 case PIX_FMT_YUV444P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
582 case PIX_FMT_YUV410P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
583 case PIX_FMT_YUV411P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
584 case PIX_FMT_YUV440P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
585 case PIX_FMT_YUVJ420P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
586 case PIX_FMT_YUVJ422P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
587 case PIX_FMT_YUVJ444P:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
588 case PIX_FMT_YUVJ440P:
10136
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
589 case PIX_FMT_YUV420P16LE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
590 case PIX_FMT_YUV422P16LE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
591 case PIX_FMT_YUV444P16LE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
592 case PIX_FMT_YUV420P16BE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
593 case PIX_FMT_YUV422P16BE:
399b5d6b5439 Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
ramiro
parents: 10043
diff changeset
594 case PIX_FMT_YUV444P16BE:
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
595 h2 = (height + (1 << desc->log2_chroma_h) - 1) >> desc->log2_chroma_h;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
596 size2 = picture->linesize[1] * h2;
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
597 picture->data[0] = ptr;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
598 picture->data[1] = picture->data[0] + size;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
599 picture->data[2] = picture->data[1] + size2;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
600 picture->data[3] = NULL;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
601 return size + 2 * size2;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
602 case PIX_FMT_YUVA420P:
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
603 h2 = (height + (1 << desc->log2_chroma_h) - 1) >> desc->log2_chroma_h;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
604 size2 = picture->linesize[1] * h2;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
605 picture->data[0] = ptr;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
606 picture->data[1] = picture->data[0] + size;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
607 picture->data[2] = picture->data[1] + size2;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
608 picture->data[3] = picture->data[1] + size2 + size2;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
609 return 2 * size + 2 * size2;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
610 case PIX_FMT_NV12:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
611 case PIX_FMT_NV21:
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
612 h2 = (height + (1 << desc->log2_chroma_h) - 1) >> desc->log2_chroma_h;
10569
7a8b35405591 Fix nv12/nv21 handling. linesize for plane 1 should account for both chroma
ramiro
parents: 10546
diff changeset
613 size2 = picture->linesize[1] * h2;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
614 picture->data[0] = ptr;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
615 picture->data[1] = picture->data[0] + size;
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
616 picture->data[2] = NULL;
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
617 picture->data[3] = NULL;
10569
7a8b35405591 Fix nv12/nv21 handling. linesize for plane 1 should account for both chroma
ramiro
parents: 10546
diff changeset
618 return size + size2;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
619 case PIX_FMT_RGB24:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
620 case PIX_FMT_BGR24:
9245
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
621 case PIX_FMT_ARGB:
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
622 case PIX_FMT_ABGR:
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
623 case PIX_FMT_RGBA:
b5d1395879a0 Make the pixel formats which were defined as macros:
stefano
parents: 9242
diff changeset
624 case PIX_FMT_BGRA:
9001
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
625 case PIX_FMT_RGB48BE:
ec04c3c5a3e5 Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
pross
parents: 8788
diff changeset
626 case PIX_FMT_RGB48LE:
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
627 case PIX_FMT_GRAY16BE:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
628 case PIX_FMT_GRAY16LE:
10043
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
629 case PIX_FMT_BGR555BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
630 case PIX_FMT_BGR555LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
631 case PIX_FMT_BGR565BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
632 case PIX_FMT_BGR565LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
633 case PIX_FMT_RGB555BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
634 case PIX_FMT_RGB555LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
635 case PIX_FMT_RGB565BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
636 case PIX_FMT_RGB565LE:
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
637 case PIX_FMT_YUYV422:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
638 case PIX_FMT_UYVY422:
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
639 case PIX_FMT_UYYVYY411:
3646
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
640 case PIX_FMT_RGB4:
e324e5ce41a1 Minimal support for the new pixel formats in libavcodec
lucabe
parents: 3589
diff changeset
641 case PIX_FMT_BGR4:
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
642 case PIX_FMT_MONOWHITE:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
643 case PIX_FMT_MONOBLACK:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
644 picture->data[0] = ptr;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
645 picture->data[1] = NULL;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
646 picture->data[2] = NULL;
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
647 picture->data[3] = NULL;
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
648 return size;
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
649 case PIX_FMT_PAL8:
8748
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
650 case PIX_FMT_RGB8:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
651 case PIX_FMT_BGR8:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
652 case PIX_FMT_RGB4_BYTE:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
653 case PIX_FMT_BGR4_BYTE:
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
654 case PIX_FMT_GRAY8:
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
655 size2 = (size + 3) & ~3;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
656 picture->data[0] = ptr;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
657 picture->data[1] = ptr + size2; /* palette is stored here as 256 32 bit words */
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
658 picture->data[2] = NULL;
5706
3e8764a25c53 add support for yuva420p colorspace (yuv420p + alpha)
aurel
parents: 5363
diff changeset
659 picture->data[3] = NULL;
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
660 return size2 + 256 * 4;
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
661 default:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
662 picture->data[0] = NULL;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
663 picture->data[1] = NULL;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
664 picture->data[2] = NULL;
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
665 picture->data[3] = NULL;
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
666 return -1;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
667 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
668 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
669
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
670 int avpicture_fill(AVPicture *picture, uint8_t *ptr,
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
671 enum PixelFormat pix_fmt, int width, int height)
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
672 {
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
673
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
674 if(avcodec_check_dimensions(NULL, width, height))
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
675 return -1;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
676
6357
3f86370d3f63 My commit in r11942 broke compilation.
vitor
parents: 6356
diff changeset
677 if (ff_fill_linesize(picture, pix_fmt, width))
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
678 return -1;
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
679
6357
3f86370d3f63 My commit in r11942 broke compilation.
vitor
parents: 6356
diff changeset
680 return ff_fill_pointer(picture, ptr, pix_fmt, height);
6356
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
681 }
afa99894d8d9 Split avpicture_fill() in two functions. This will be
vitor
parents: 6350
diff changeset
682
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
683 int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width, int height,
1231
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
684 unsigned char *dest, int dest_size)
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
685 {
3420
54814e15aa3d Mark some read-only datastructures as const.
diego
parents: 3266
diff changeset
686 const PixFmtInfo* pf = &pix_fmt_info[pix_fmt];
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
687 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
9070
87f496299f09 Fix avpicture_layout to not chroma shift the alpha plane when outputting YUVA420P
sdrik
parents: 9061
diff changeset
688 int i, j, w, ow, h, oh, data_planes;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
689 const unsigned char* s;
1231
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
690 int size = avpicture_get_size(pix_fmt, width, height);
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
691
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2366
diff changeset
692 if (size > dest_size || size < 0)
1231
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
693 return -1;
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
694
1243
5d2376294fbf * fixing a bug in avpicture_layout (PAL8 wasn't handled properly)
romansh
parents: 1231
diff changeset
695 if (pf->pixel_type == FF_PIXEL_PACKED || pf->pixel_type == FF_PIXEL_PALETTE) {
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
696 if (pix_fmt == PIX_FMT_YUYV422 ||
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
697 pix_fmt == PIX_FMT_UYVY422 ||
10043
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
698 pix_fmt == PIX_FMT_BGR565BE ||
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
699 pix_fmt == PIX_FMT_BGR565LE ||
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
700 pix_fmt == PIX_FMT_BGR555BE ||
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
701 pix_fmt == PIX_FMT_BGR555LE ||
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
702 pix_fmt == PIX_FMT_RGB565BE ||
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
703 pix_fmt == PIX_FMT_RGB565LE ||
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
704 pix_fmt == PIX_FMT_RGB555BE ||
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
705 pix_fmt == PIX_FMT_RGB555LE)
2137
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
706 w = width * 2;
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
707 else if (pix_fmt == PIX_FMT_UYYVYY411)
10546
ramiro
parents: 10540
diff changeset
708 w = width + width/2;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
709 else if (pix_fmt == PIX_FMT_PAL8)
10546
ramiro
parents: 10540
diff changeset
710 w = width;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
711 else
10546
ramiro
parents: 10540
diff changeset
712 w = width * (pf->depth * pf->nb_channels / 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
713
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
714 data_planes = 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
715 h = height;
1231
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
716 } else {
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
717 data_planes = pf->nb_channels;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
718 w = (width*pf->depth + 7)/8;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
719 h = height;
1231
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
720 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
721
9070
87f496299f09 Fix avpicture_layout to not chroma shift the alpha plane when outputting YUVA420P
sdrik
parents: 9061
diff changeset
722 ow = w;
87f496299f09 Fix avpicture_layout to not chroma shift the alpha plane when outputting YUVA420P
sdrik
parents: 9061
diff changeset
723 oh = h;
87f496299f09 Fix avpicture_layout to not chroma shift the alpha plane when outputting YUVA420P
sdrik
parents: 9061
diff changeset
724
1231
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
725 for (i=0; i<data_planes; i++) {
10546
ramiro
parents: 10540
diff changeset
726 if (i == 1) {
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
727 w = ((width >> desc->log2_chroma_w) * pf->depth + 7) / 8;
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
728 h = height >> desc->log2_chroma_h;
10569
7a8b35405591 Fix nv12/nv21 handling. linesize for plane 1 should account for both chroma
ramiro
parents: 10546
diff changeset
729 if (pix_fmt == PIX_FMT_NV12 || pix_fmt == PIX_FMT_NV21)
7a8b35405591 Fix nv12/nv21 handling. linesize for plane 1 should account for both chroma
ramiro
parents: 10546
diff changeset
730 w <<= 1;
10546
ramiro
parents: 10540
diff changeset
731 } else if (i == 3) {
ramiro
parents: 10540
diff changeset
732 w = ow;
ramiro
parents: 10540
diff changeset
733 h = oh;
ramiro
parents: 10540
diff changeset
734 }
ramiro
parents: 10540
diff changeset
735 s = src->data[i];
ramiro
parents: 10540
diff changeset
736 for(j=0; j<h; j++) {
ramiro
parents: 10540
diff changeset
737 memcpy(dest, s, w);
ramiro
parents: 10540
diff changeset
738 dest += w;
ramiro
parents: 10540
diff changeset
739 s += src->linesize[i];
ramiro
parents: 10540
diff changeset
740 }
1231
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
741 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
742
1243
5d2376294fbf * fixing a bug in avpicture_layout (PAL8 wasn't handled properly)
romansh
parents: 1231
diff changeset
743 if (pf->pixel_type == FF_PIXEL_PALETTE)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
744 memcpy((unsigned char *)(((size_t)dest + 3) & ~3), src->data[1], 256 * 4);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
745
1231
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
746 return size;
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
747 }
b88dfc4bbf8c * introducing new public interface in imgconvert.c
romansh
parents: 1209
diff changeset
748
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
749 int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height)
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
750 {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
751 AVPicture dummy_pict;
9217
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
752 if(avcodec_check_dimensions(NULL, width, height))
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
753 return -1;
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
754 switch (pix_fmt) {
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
755 case PIX_FMT_RGB8:
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
756 case PIX_FMT_BGR8:
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
757 case PIX_FMT_RGB4_BYTE:
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
758 case PIX_FMT_BGR4_BYTE:
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
759 case PIX_FMT_GRAY8:
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
760 // do not include palette for these pseudo-paletted formats
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
761 return width * height;
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
762 }
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
763 return avpicture_fill(&dummy_pict, NULL, pix_fmt, width, height);
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
764 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
765
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
766 int avcodec_get_pix_fmt_loss(enum PixelFormat dst_pix_fmt, enum PixelFormat src_pix_fmt,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
767 int has_alpha)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
768 {
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
769 const PixFmtInfo *pf, *ps;
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
770 const AVPixFmtDescriptor *src_desc = &av_pix_fmt_descriptors[src_pix_fmt];
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
771 const AVPixFmtDescriptor *dst_desc = &av_pix_fmt_descriptors[dst_pix_fmt];
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
772 int loss;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
773
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
774 ps = &pix_fmt_info[src_pix_fmt];
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
775
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
776 /* compute loss */
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
777 loss = 0;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
778 pf = &pix_fmt_info[dst_pix_fmt];
1206
fd676abc754c loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents: 1205
diff changeset
779 if (pf->depth < ps->depth ||
10043
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
780 ((dst_pix_fmt == PIX_FMT_RGB555BE || dst_pix_fmt == PIX_FMT_RGB555LE) &&
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
781 (src_pix_fmt == PIX_FMT_RGB565BE || src_pix_fmt == PIX_FMT_RGB565LE)))
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
782 loss |= FF_LOSS_DEPTH;
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
783 if (dst_desc->log2_chroma_w > src_desc->log2_chroma_w ||
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
784 dst_desc->log2_chroma_h > src_desc->log2_chroma_h)
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
785 loss |= FF_LOSS_RESOLUTION;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
786 switch(pf->color_type) {
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
787 case FF_COLOR_RGB:
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
788 if (ps->color_type != FF_COLOR_RGB &&
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
789 ps->color_type != FF_COLOR_GRAY)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
790 loss |= FF_LOSS_COLORSPACE;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
791 break;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
792 case FF_COLOR_GRAY:
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
793 if (ps->color_type != FF_COLOR_GRAY)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
794 loss |= FF_LOSS_COLORSPACE;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
795 break;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
796 case FF_COLOR_YUV:
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
797 if (ps->color_type != FF_COLOR_YUV)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
798 loss |= FF_LOSS_COLORSPACE;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
799 break;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
800 case FF_COLOR_YUV_JPEG:
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
801 if (ps->color_type != FF_COLOR_YUV_JPEG &&
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
802 ps->color_type != FF_COLOR_YUV &&
1206
fd676abc754c loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents: 1205
diff changeset
803 ps->color_type != FF_COLOR_GRAY)
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
804 loss |= FF_LOSS_COLORSPACE;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
805 break;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
806 default:
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
807 /* fail safe test */
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
808 if (ps->color_type != pf->color_type)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
809 loss |= FF_LOSS_COLORSPACE;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
810 break;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
811 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
812 if (pf->color_type == FF_COLOR_GRAY &&
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
813 ps->color_type != FF_COLOR_GRAY)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
814 loss |= FF_LOSS_CHROMA;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
815 if (!pf->is_alpha && (ps->is_alpha && has_alpha))
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
816 loss |= FF_LOSS_ALPHA;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
817 if (pf->pixel_type == FF_PIXEL_PALETTE &&
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
818 (ps->pixel_type != FF_PIXEL_PALETTE && ps->color_type != FF_COLOR_GRAY))
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
819 loss |= FF_LOSS_COLORQUANT;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
820 return loss;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
821 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
822
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
823 static int avg_bits_per_pixel(enum PixelFormat pix_fmt)
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
824 {
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
825 int bits;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
826 const PixFmtInfo *pf;
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
827 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
828
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
829 pf = &pix_fmt_info[pix_fmt];
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
830 switch(pf->pixel_type) {
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
831 case FF_PIXEL_PACKED:
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
832 switch(pix_fmt) {
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
833 case PIX_FMT_YUYV422:
2137
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
834 case PIX_FMT_UYVY422:
10043
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
835 case PIX_FMT_RGB565BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
836 case PIX_FMT_RGB565LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
837 case PIX_FMT_RGB555BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
838 case PIX_FMT_RGB555LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
839 case PIX_FMT_BGR565BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
840 case PIX_FMT_BGR565LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
841 case PIX_FMT_BGR555BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
842 case PIX_FMT_BGR555LE:
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
843 bits = 16;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
844 break;
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
845 case PIX_FMT_UYYVYY411:
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
846 bits = 12;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
847 break;
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
848 default:
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
849 bits = pf->depth * pf->nb_channels;
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
850 break;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
851 }
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
852 break;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
853 case FF_PIXEL_PLANAR:
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
854 if (desc->log2_chroma_w == 0 && desc->log2_chroma_h == 0) {
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
855 bits = pf->depth * pf->nb_channels;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
856 } else {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
857 bits = pf->depth + ((2 * pf->depth) >>
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
858 (desc->log2_chroma_w + desc->log2_chroma_h));
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
859 }
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
860 break;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
861 case FF_PIXEL_PALETTE:
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
862 bits = 8;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
863 break;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
864 default:
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
865 bits = -1;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
866 break;
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
867 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
868 return bits;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
869 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
870
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
871 static enum PixelFormat avcodec_find_best_pix_fmt1(int64_t pix_fmt_mask,
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
872 enum PixelFormat src_pix_fmt,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
873 int has_alpha,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
874 int loss_mask)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
875 {
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
876 int dist, i, loss, min_dist;
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
877 enum PixelFormat dst_pix_fmt;
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
878
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
879 /* find exact color match with smallest size */
10682
aa8bebc96764 Use PIX_FMT_NONE for -1 when enum PixelFormat is expected (fixes two icc warnings).
cehoyos
parents: 10640
diff changeset
880 dst_pix_fmt = PIX_FMT_NONE;
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
881 min_dist = 0x7fffffff;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
882 for(i = 0;i < PIX_FMT_NB; i++) {
8321
e9db9859de6c Prevent shift overflow, patch by Anders Gr«Ónberg, galileo.m2 gmail com.
diego
parents: 8316
diff changeset
883 if (pix_fmt_mask & (1ULL << i)) {
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
884 loss = avcodec_get_pix_fmt_loss(i, src_pix_fmt, has_alpha) & loss_mask;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
885 if (loss == 0) {
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
886 dist = avg_bits_per_pixel(i);
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
887 if (dist < min_dist) {
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
888 min_dist = dist;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
889 dst_pix_fmt = i;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
890 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
891 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
892 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
893 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
894 return dst_pix_fmt;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
895 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
896
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
897 enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelFormat src_pix_fmt,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
898 int has_alpha, int *loss_ptr)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
899 {
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
900 enum PixelFormat dst_pix_fmt;
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
901 int loss_mask, i;
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
902 static const int loss_mask_order[] = {
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
903 ~0, /* no loss first */
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
904 ~FF_LOSS_ALPHA,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
905 ~FF_LOSS_RESOLUTION,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
906 ~(FF_LOSS_COLORSPACE | FF_LOSS_RESOLUTION),
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
907 ~FF_LOSS_COLORQUANT,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
908 ~FF_LOSS_DEPTH,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
909 0,
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
910 };
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
911
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
912 /* try with successive loss */
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
913 i = 0;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
914 for(;;) {
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
915 loss_mask = loss_mask_order[i++];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
916 dst_pix_fmt = avcodec_find_best_pix_fmt1(pix_fmt_mask, src_pix_fmt,
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
917 has_alpha, loss_mask);
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
918 if (dst_pix_fmt >= 0)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
919 goto found;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
920 if (loss_mask == 0)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
921 break;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
922 }
10682
aa8bebc96764 Use PIX_FMT_NONE for -1 when enum PixelFormat is expected (fixes two icc warnings).
cehoyos
parents: 10640
diff changeset
923 return PIX_FMT_NONE;
1202
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
924 found:
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
925 if (loss_ptr)
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
926 *loss_ptr = avcodec_get_pix_fmt_loss(dst_pix_fmt, src_pix_fmt, has_alpha);
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
927 return dst_pix_fmt;
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
928 }
8b49a7ee4e4e YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents: 1199
diff changeset
929
3245
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
930 void ff_img_copy_plane(uint8_t *dst, int dst_wrap,
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
931 const uint8_t *src, int src_wrap,
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
932 int width, int height)
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
933 {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
934 if((!dst) || (!src))
2785
c8d53188048d segfault fix
michael
parents: 2422
diff changeset
935 return;
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
936 for(;height > 0; height--) {
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
937 memcpy(dst, src, width);
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
938 dst += dst_wrap;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
939 src += src_wrap;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
940 }
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
941 }
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
942
6358
6aa3024c07c5 This should not be part of the public API
vitor
parents: 6357
diff changeset
943 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
944 {
6347
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
945 int bits;
3420
54814e15aa3d Mark some read-only datastructures as const.
diego
parents: 3266
diff changeset
946 const PixFmtInfo *pf = &pix_fmt_info[pix_fmt];
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
947 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
948
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
949 pf = &pix_fmt_info[pix_fmt];
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
950 switch(pf->pixel_type) {
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
951 case FF_PIXEL_PACKED:
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
952 switch(pix_fmt) {
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
953 case PIX_FMT_YUYV422:
2137
ef47c0b1ff28 UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents: 1593
diff changeset
954 case PIX_FMT_UYVY422:
10043
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
955 case PIX_FMT_RGB565BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
956 case PIX_FMT_RGB565LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
957 case PIX_FMT_RGB555BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
958 case PIX_FMT_RGB555LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
959 case PIX_FMT_BGR565BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
960 case PIX_FMT_BGR565LE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
961 case PIX_FMT_BGR555BE:
5d5562aa94df Use RGB5x5LE, RGB5x5BE, BGR5x5LE and BGR5x5BE instead of their native
cehoyos
parents: 9985
diff changeset
962 case PIX_FMT_BGR555LE:
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
963 bits = 16;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
964 break;
4494
ce643a22f049 Replace deprecated PIX_FMT names by the newer variants.
diego
parents: 4359
diff changeset
965 case PIX_FMT_UYYVYY411:
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
966 bits = 12;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
967 break;
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
968 default:
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
969 bits = pf->depth * pf->nb_channels;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
970 break;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
971 }
6347
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
972 return (width * bits + 7) >> 3;
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
973 break;
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
974 case FF_PIXEL_PLANAR:
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
975 if (plane == 1 || plane == 2)
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
976 width= -((-width)>>desc->log2_chroma_w);
6347
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
977
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
978 return (width * pf->depth + 7) >> 3;
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
979 break;
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
980 case FF_PIXEL_PALETTE:
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
981 if (plane == 0)
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
982 return width;
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
983 break;
6347
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
984 }
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
985
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
986 return -1;
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
987 }
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
988
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
989 void av_picture_copy(AVPicture *dst, const AVPicture *src,
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
990 enum PixelFormat pix_fmt, int width, int height)
6347
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
991 {
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
992 int i;
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
993 const PixFmtInfo *pf = &pix_fmt_info[pix_fmt];
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
994 const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
6347
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
995
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
996 switch(pf->pixel_type) {
e65c0ac23ea5 Factor bytewidth determination in its own function
vitor
parents: 6198
diff changeset
997 case FF_PIXEL_PACKED:
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
998 case FF_PIXEL_PLANAR:
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
999 for(i = 0; i < pf->nb_channels; i++) {
8087
661cd381d996 Remove unused variable, patch by Art Clarke, aclarke vlideshow com.
diego
parents: 8083
diff changeset
1000 int h;
6358
6aa3024c07c5 This should not be part of the public API
vitor
parents: 6357
diff changeset
1001 int bwidth = ff_get_plane_bytewidth(pix_fmt, width, i);
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1002 h = height;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1003 if (i == 1 || i == 2) {
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
1004 h= -((-height)>>desc->log2_chroma_h);
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1005 }
3245
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1006 ff_img_copy_plane(dst->data[i], dst->linesize[i],
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1007 src->data[i], src->linesize[i],
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1008 bwidth, h);
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1009 }
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1010 break;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1011 case FF_PIXEL_PALETTE:
3245
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1012 ff_img_copy_plane(dst->data[0], dst->linesize[0],
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1013 src->data[0], src->linesize[0],
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1014 width, height);
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1015 /* copy the palette */
10510
26fcf45bb486 Fix palette copying in av_picture_copy(). Previous code worked only if
vitor
parents: 10509
diff changeset
1016 memcpy(dst->data[1], src->data[1], 4*256);
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1017 break;
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1018 }
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1019 }
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1020
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1021 /* 2x2 -> 1x1 */
3245
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1022 void ff_shrink22(uint8_t *dst, int dst_wrap,
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1023 const uint8_t *src, int src_wrap,
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1024 int width, int height)
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1025 {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1026 int w;
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1027 const uint8_t *s1, *s2;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1028 uint8_t *d;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1029
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1030 for(;height > 0; height--) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1031 s1 = src;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1032 s2 = s1 + src_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1033 d = dst;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1034 for(w = width;w >= 4; w-=4) {
1206
fd676abc754c loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents: 1205
diff changeset
1035 d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 2;
fd676abc754c loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents: 1205
diff changeset
1036 d[1] = (s1[2] + s1[3] + s2[2] + s2[3] + 2) >> 2;
fd676abc754c loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents: 1205
diff changeset
1037 d[2] = (s1[4] + s1[5] + s2[4] + s2[5] + 2) >> 2;
fd676abc754c loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents: 1205
diff changeset
1038 d[3] = (s1[6] + s1[7] + s2[6] + s2[7] + 2) >> 2;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1039 s1 += 8;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1040 s2 += 8;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1041 d += 4;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1042 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1043 for(;w > 0; w--) {
1206
fd676abc754c loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents: 1205
diff changeset
1044 d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 2;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1045 s1 += 2;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1046 s2 += 2;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1047 d++;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1048 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1049 src += 2 * src_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1050 dst += dst_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1051 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1052 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1053
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1054 /* 4x4 -> 1x1 */
3245
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1055 void ff_shrink44(uint8_t *dst, int dst_wrap,
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1056 const uint8_t *src, int src_wrap,
576
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1057 int width, int height)
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1058 {
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1059 int w;
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1060 const uint8_t *s1, *s2, *s3, *s4;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1061 uint8_t *d;
576
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1062
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1063 for(;height > 0; height--) {
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1064 s1 = src;
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1065 s2 = s1 + src_wrap;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1066 s3 = s2 + src_wrap;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1067 s4 = s3 + src_wrap;
576
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1068 d = dst;
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1069 for(w = width;w > 0; w--) {
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1070 d[0] = (s1[0] + s1[1] + s1[2] + s1[3] +
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1071 s2[0] + s2[1] + s2[2] + s2[3] +
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1072 s3[0] + s3[1] + s3[2] + s3[3] +
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1073 s4[0] + s4[1] + s4[2] + s4[3] + 8) >> 4;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1074 s1 += 4;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1075 s2 += 4;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1076 s3 += 4;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1077 s4 += 4;
576
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1078 d++;
9aa5f0d0124e YUV410P to YUV420P patch by Fran«®ois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
1079 }
1205
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1080 src += 4 * src_wrap;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1081 dst += dst_wrap;
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1082 }
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1083 }
c2672cdf2d2a added all missing UV conversions
bellard
parents: 1204
diff changeset
1084
3245
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1085 /* 8x8 -> 1x1 */
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1086 void ff_shrink88(uint8_t *dst, int dst_wrap,
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1087 const uint8_t *src, int src_wrap,
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1088 int width, int height)
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1089 {
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1090 int w, i;
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1091
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1092 for(;height > 0; height--) {
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1093 for(w = width;w > 0; w--) {
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1094 int tmp=0;
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1095 for(i=0; i<8; i++){
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1096 tmp += src[0] + src[1] + src[2] + src[3] + src[4] + src[5] + src[6] + src[7];
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1097 src += src_wrap;
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1098 }
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1099 *(dst++) = (tmp + 32)>>6;
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1100 src += 8 - 8*src_wrap;
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1101 }
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1102 src += 8*src_wrap - 8*width;
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1103 dst += dst_wrap - width;
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1104 }
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1105 }
c2c29be6282e remove mpegvideo.c img resample dependancy
michael
parents: 3179
diff changeset
1106
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1107
1508
5a43bc31c2eb recommit of
michael
parents: 1488
diff changeset
1108 int avpicture_alloc(AVPicture *picture,
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
1109 enum PixelFormat pix_fmt, int width, int height)
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1110 {
3266
3b785e80ce3e make "size" variable in avpicture_alloc signed, since avpicture_get_size
reimar
parents: 3257
diff changeset
1111 int size;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1112 void *ptr;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1113
9217
53ec03e7ba40 Fix avpicture_get_size for non-paletted formats with a helper palette
reimar
parents: 9191
diff changeset
1114 size = avpicture_fill(picture, NULL, pix_fmt, width, height);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2366
diff changeset
1115 if(size<0)
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2366
diff changeset
1116 goto fail;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1117 ptr = av_malloc(size);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1118 if (!ptr)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1119 goto fail;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1120 avpicture_fill(picture, ptr, pix_fmt, width, height);
8748
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
1121 if(picture->data[1] && !picture->data[2])
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
1122 ff_set_systematic_pal((uint32_t*)picture->data[1], pix_fmt);
eaa08ce79f9a Ensure that the palette is set in data[1] for all 8bit formats.
michael
parents: 8718
diff changeset
1123
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1124 return 0;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1125 fail:
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1126 memset(picture, 0, sizeof(AVPicture));
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1127 return -1;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1128 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1129
1508
5a43bc31c2eb recommit of
michael
parents: 1488
diff changeset
1130 void avpicture_free(AVPicture *picture)
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1131 {
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 1028
diff changeset
1132 av_free(picture->data[0]);
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1133 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1134
1203
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
1135 /* return true if yuv planar */
3420
54814e15aa3d Mark some read-only datastructures as const.
diego
parents: 3266
diff changeset
1136 static inline int is_yuv_planar(const PixFmtInfo *ps)
1203
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
1137 {
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
1138 return (ps->color_type == FF_COLOR_YUV ||
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
1139 ps->color_type == FF_COLOR_YUV_JPEG) &&
1204
e55580ae9969 almost exhaustive image conversion support
bellard
parents: 1203
diff changeset
1140 ps->pixel_type == FF_PIXEL_PLANAR;
1203
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
1141 }
80c73b9b0ba2 accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents: 1202
diff changeset
1142
4624
6a900f539e2c Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img"
takis
parents: 4593
diff changeset
1143 int av_picture_crop(AVPicture *dst, const AVPicture *src,
9902
9bdf9fe9018c Fix argument type mismatches for av_picture_crop and av_picture_fill
mru
parents: 9519
diff changeset
1144 enum PixelFormat pix_fmt, int top_band, int left_band)
3179
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1145 {
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1146 int y_shift;
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1147 int x_shift;
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1148
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1149 if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB || !is_yuv_planar(&pix_fmt_info[pix_fmt]))
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1150 return -1;
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1151
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
1152 y_shift = av_pix_fmt_descriptors[pix_fmt].log2_chroma_h;
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
1153 x_shift = av_pix_fmt_descriptors[pix_fmt].log2_chroma_w;
3179
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1154
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1155 dst->data[0] = src->data[0] + (top_band * src->linesize[0]) + left_band;
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1156 dst->data[1] = src->data[1] + ((top_band >> y_shift) * src->linesize[1]) + (left_band >> x_shift);
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1157 dst->data[2] = src->data[2] + ((top_band >> y_shift) * src->linesize[2]) + (left_band >> x_shift);
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1158
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1159 dst->linesize[0] = src->linesize[0];
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1160 dst->linesize[1] = src->linesize[1];
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1161 dst->linesize[2] = src->linesize[2];
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1162 return 0;
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1163 }
870bbd067df8 Fix cropping, depending on enc pix fmt
bcoudurier
parents: 3036
diff changeset
1164
4624
6a900f539e2c Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img"
takis
parents: 4593
diff changeset
1165 int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width,
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
1166 enum PixelFormat pix_fmt, int padtop, int padbottom, int padleft, int padright,
4358
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1167 int *color)
3257
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1168 {
4359
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1169 uint8_t *optr;
3257
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1170 int y_shift;
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1171 int x_shift;
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1172 int yheight;
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1173 int i, y;
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1174
4358
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1175 if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB ||
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1176 !is_yuv_planar(&pix_fmt_info[pix_fmt])) return -1;
3257
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1177
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1178 for (i = 0; i < 3; i++) {
10577
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
1179 x_shift = i ? av_pix_fmt_descriptors[pix_fmt].log2_chroma_w : 0;
db54dba1f21c Remove x_chroma_shift and y_chroma_shift fields from PixFmtInfo, use
stefano
parents: 10573
diff changeset
1180 y_shift = i ? av_pix_fmt_descriptors[pix_fmt].log2_chroma_h : 0;
3257
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1181
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1182 if (padtop || padleft) {
4358
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1183 memset(dst->data[i], color[i],
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1184 dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift));
3257
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1185 }
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1186
4359
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1187 if (padleft || padright) {
4358
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1188 optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1189 (dst->linesize[i] - (padright >> x_shift));
3257
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1190 yheight = (height - 1 - (padtop + padbottom)) >> y_shift;
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1191 for (y = 0; y < yheight; y++) {
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1192 memset(optr, color[i], (padleft + padright) >> x_shift);
4359
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1193 optr += dst->linesize[i];
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1194 }
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1195 }
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1196
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1197 if (src) { /* first line */
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1198 uint8_t *iptr = src->data[i];
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1199 optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1200 (padleft >> x_shift);
6963
cc2c5a21a0eb memcpy considering output width, not src linesize, fix segv with av_picture_pad
bcoudurier
parents: 6911
diff changeset
1201 memcpy(optr, iptr, (width - padleft - padright) >> x_shift);
4359
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1202 iptr += src->linesize[i];
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1203 optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) +
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1204 (dst->linesize[i] - (padright >> x_shift));
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1205 yheight = (height - 1 - (padtop + padbottom)) >> y_shift;
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1206 for (y = 0; y < yheight; y++) {
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1207 memset(optr, color[i], (padleft + padright) >> x_shift);
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1208 memcpy(optr + ((padleft + padright) >> x_shift), iptr,
6963
cc2c5a21a0eb memcpy considering output width, not src linesize, fix segv with av_picture_pad
bcoudurier
parents: 6911
diff changeset
1209 (width - padleft - padright) >> x_shift);
4359
d276d6eed6a0 Avoid branches in the loop and solve a gcc warning
lu_zero
parents: 4358
diff changeset
1210 iptr += src->linesize[i];
3257
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1211 optr += dst->linesize[i];
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1212 }
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1213 }
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1214
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1215 if (padbottom || padright) {
4358
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1216 optr = dst->data[i] + dst->linesize[i] *
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1217 ((height - padbottom) >> y_shift) - (padright >> x_shift);
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1218 memset(optr, color[i],dst->linesize[i] *
0924cc1db086 Cosmetics
lu_zero
parents: 4208
diff changeset
1219 (padbottom >> y_shift) + (padright >> x_shift));
3257
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1220 }
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1221 }
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1222 return 0;
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1223 }
63f61b09dcee Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents: 3245
diff changeset
1224
1208
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1225 /* NOTE: we scan all the pixels to have an exact information */
1488
766a2f4edbea avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents: 1425
diff changeset
1226 static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
1208
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1227 {
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1228 const unsigned char *p;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1229 int src_wrap, ret, x, y;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1230 unsigned int a;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1231 uint32_t *palette = (uint32_t *)src->data[1];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
1232
1208
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1233 p = src->data[0];
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1234 src_wrap = src->linesize[0] - width;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1235 ret = 0;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1236 for(y=0;y<height;y++) {
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1237 for(x=0;x<width;x++) {
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1238 a = palette[p[0]] >> 24;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1239 if (a == 0x00) {
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1240 ret |= FF_ALPHA_TRANSP;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1241 } else if (a != 0xff) {
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1242 ret |= FF_ALPHA_SEMI_TRANSP;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1243 }
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1244 p++;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1245 }
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1246 p += src_wrap;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1247 }
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1248 return ret;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1249 }
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1250
1488
766a2f4edbea avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents: 1425
diff changeset
1251 int img_get_alpha_info(const AVPicture *src,
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
1252 enum PixelFormat pix_fmt, int width, int height)
1208
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1253 {
3420
54814e15aa3d Mark some read-only datastructures as const.
diego
parents: 3266
diff changeset
1254 const PixFmtInfo *pf = &pix_fmt_info[pix_fmt];
1208
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1255 int ret;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1256
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1257 /* no alpha can be represented in format */
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1258 if (!pf->is_alpha)
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1259 return 0;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1260 switch(pix_fmt) {
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1261 case PIX_FMT_PAL8:
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1262 ret = get_alpha_info_pal8(src, width, height);
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1263 break;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1264 default:
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1265 /* we do not know, so everything is indicated */
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1266 ret = FF_ALPHA_TRANSP | FF_ALPHA_SEMI_TRANSP;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1267 break;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1268 }
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1269 return ret;
0f37976aa436 added img_get_alpha_info()
bellard
parents: 1207
diff changeset
1270 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1271
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
1272 #if HAVE_MMX
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1273 #define DEINT_INPLACE_LINE_LUM \
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1274 movd_m2r(lum_m4[0],mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1275 movd_m2r(lum_m3[0],mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1276 movd_m2r(lum_m2[0],mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1277 movd_m2r(lum_m1[0],mm3);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1278 movd_m2r(lum[0],mm4);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1279 punpcklbw_r2r(mm7,mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1280 movd_r2m(mm2,lum_m4[0]);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1281 punpcklbw_r2r(mm7,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1282 punpcklbw_r2r(mm7,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1283 punpcklbw_r2r(mm7,mm3);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1284 punpcklbw_r2r(mm7,mm4);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1285 paddw_r2r(mm3,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1286 psllw_i2r(1,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1287 paddw_r2r(mm4,mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1288 psllw_i2r(2,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1289 paddw_r2r(mm6,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1290 paddw_r2r(mm2,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1291 psubusw_r2r(mm0,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1292 psrlw_i2r(3,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1293 packuswb_r2r(mm7,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1294 movd_r2m(mm1,lum_m2[0]);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1295
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1296 #define DEINT_LINE_LUM \
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1297 movd_m2r(lum_m4[0],mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1298 movd_m2r(lum_m3[0],mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1299 movd_m2r(lum_m2[0],mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1300 movd_m2r(lum_m1[0],mm3);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1301 movd_m2r(lum[0],mm4);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1302 punpcklbw_r2r(mm7,mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1303 punpcklbw_r2r(mm7,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1304 punpcklbw_r2r(mm7,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1305 punpcklbw_r2r(mm7,mm3);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1306 punpcklbw_r2r(mm7,mm4);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1307 paddw_r2r(mm3,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1308 psllw_i2r(1,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1309 paddw_r2r(mm4,mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1310 psllw_i2r(2,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1311 paddw_r2r(mm6,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1312 paddw_r2r(mm2,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1313 psubusw_r2r(mm0,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1314 psrlw_i2r(3,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1315 packuswb_r2r(mm7,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1316 movd_r2m(mm1,dst[0]);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1317 #endif
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1318
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1319 /* filter parameters: [-1 4 2 4 -1] // 8 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2785
diff changeset
1320 static void deinterlace_line(uint8_t *dst,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1321 const uint8_t *lum_m4, const uint8_t *lum_m3,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1322 const uint8_t *lum_m2, const uint8_t *lum_m1,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1323 const uint8_t *lum,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1324 int size)
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1325 {
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
1326 #if !HAVE_MMX
4176
23da44e8fd05 rename cropTbl -> ff_cropTbl
mru
parents: 4088
diff changeset
1327 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1328 int sum;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1329
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1330 for(;size > 0;size--) {
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1331 sum = -lum_m4[0];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1332 sum += lum_m3[0] << 2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1333 sum += lum_m2[0] << 1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1334 sum += lum_m1[0] << 2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1335 sum += -lum[0];
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1336 dst[0] = cm[(sum + 4) >> 3];
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1337 lum_m4++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1338 lum_m3++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1339 lum_m2++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1340 lum_m1++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1341 lum++;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1342 dst++;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1343 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1344 #else
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1345
1044
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1346 {
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1347 pxor_r2r(mm7,mm7);
8316
589f9a71df95 Get rid of mmx_t.
aurel
parents: 8087
diff changeset
1348 movq_m2r(ff_pw_4,mm6);
1044
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1349 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1350 for (;size > 3; size-=4) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1351 DEINT_LINE_LUM
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1352 lum_m4+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1353 lum_m3+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1354 lum_m2+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1355 lum_m1+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1356 lum+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1357 dst+=4;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1358 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1359 #endif
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1360 }
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1361 static void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3, uint8_t *lum_m2, uint8_t *lum_m1, uint8_t *lum,
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1362 int size)
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1363 {
8590
7a463923ecd1 Change semantic of CONFIG_*, HAVE_* and ARCH_*.
aurel
parents: 8522
diff changeset
1364 #if !HAVE_MMX
4176
23da44e8fd05 rename cropTbl -> ff_cropTbl
mru
parents: 4088
diff changeset
1365 uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1366 int sum;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1367
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1368 for(;size > 0;size--) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1369 sum = -lum_m4[0];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1370 sum += lum_m3[0] << 2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1371 sum += lum_m2[0] << 1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1372 lum_m4[0]=lum_m2[0];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1373 sum += lum_m1[0] << 2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1374 sum += -lum[0];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1375 lum_m2[0] = cm[(sum + 4) >> 3];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1376 lum_m4++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1377 lum_m3++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1378 lum_m2++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1379 lum_m1++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1380 lum++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1381 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1382 #else
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1383
1044
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1384 {
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1385 pxor_r2r(mm7,mm7);
8316
589f9a71df95 Get rid of mmx_t.
aurel
parents: 8087
diff changeset
1386 movq_m2r(ff_pw_4,mm6);
1044
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1387 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1388 for (;size > 3; size-=4) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1389 DEINT_INPLACE_LINE_LUM
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1390 lum_m4+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1391 lum_m3+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1392 lum_m2+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1393 lum_m1+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1394 lum+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1395 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1396 #endif
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1397 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1398
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1399 /* deinterlacing : 2 temporal taps, 3 spatial taps linear filter. The
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1400 top field is copied as is, but the bottom field is deinterlaced
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1401 against the top field. */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1402 static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap,
1488
766a2f4edbea avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents: 1425
diff changeset
1403 const uint8_t *src1, int src_wrap,
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1404 int width, int height)
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1405 {
1488
766a2f4edbea avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents: 1425
diff changeset
1406 const uint8_t *src_m2, *src_m1, *src_0, *src_p1, *src_p2;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1407 int y;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1408
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1409 src_m2 = src1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1410 src_m1 = src1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1411 src_0=&src_m1[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1412 src_p1=&src_0[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1413 src_p2=&src_p1[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1414 for(y=0;y<(height-2);y+=2) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1415 memcpy(dst,src_m1,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1416 dst += dst_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1417 deinterlace_line(dst,src_m2,src_m1,src_0,src_p1,src_p2,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1418 src_m2 = src_0;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1419 src_m1 = src_p1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1420 src_0 = src_p2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1421 src_p1 += 2*src_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1422 src_p2 += 2*src_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1423 dst += dst_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1424 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1425 memcpy(dst,src_m1,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1426 dst += dst_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1427 /* do last line */
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1428 deinterlace_line(dst,src_m2,src_m1,src_0,src_0,src_0,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1429 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1430
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1431 static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
1432 int width, int height)
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1433 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1434 uint8_t *src_m1, *src_0, *src_p1, *src_p2;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1435 int y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1436 uint8_t *buf;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1437 buf = (uint8_t*)av_malloc(width);
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1438
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1439 src_m1 = src1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1440 memcpy(buf,src_m1,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1441 src_0=&src_m1[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1442 src_p1=&src_0[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1443 src_p2=&src_p1[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1444 for(y=0;y<(height-2);y+=2) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1445 deinterlace_line_inplace(buf,src_m1,src_0,src_p1,src_p2,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1446 src_m1 = src_p1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1447 src_0 = src_p2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1448 src_p1 += 2*src_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1449 src_p2 += 2*src_wrap;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1450 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1451 /* do last line */
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1452 deinterlace_line_inplace(buf,src_m1,src_0,src_0,src_0,width);
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 315
diff changeset
1453 av_free(buf);
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1454 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1455
1488
766a2f4edbea avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents: 1425
diff changeset
1456 int avpicture_deinterlace(AVPicture *dst, const AVPicture *src,
9221
a15ec86bf752 Globally prefer enum PixelFormat over int when it makes sense.
stefano
parents: 9217
diff changeset
1457 enum PixelFormat pix_fmt, int width, int height)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1458 {
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1459 int i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1460
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1461 if (pix_fmt != PIX_FMT_YUV420P &&
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1462 pix_fmt != PIX_FMT_YUV422P &&
1425
f53d31c5eac9 * ffmpeg was *silently* rejecting to deinterlace NTSC DV. The problem
romansh
parents: 1353
diff changeset
1463 pix_fmt != PIX_FMT_YUV444P &&
5810
3e5e2bafe35c Enable avpicture_deinterlace() for PIX_FMT_GRAY8.
cehoyos
parents: 5735
diff changeset
1464 pix_fmt != PIX_FMT_YUV411P &&
3e5e2bafe35c Enable avpicture_deinterlace() for PIX_FMT_GRAY8.
cehoyos
parents: 5735
diff changeset
1465 pix_fmt != PIX_FMT_GRAY8)
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1466 return -1;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1467 if ((width & 3) != 0 || (height & 3) != 0)
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1468 return -1;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1469
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1470 for(i=0;i<3;i++) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1471 if (i == 1) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1472 switch(pix_fmt) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1473 case PIX_FMT_YUV420P:
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1474 width >>= 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1475 height >>= 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1476 break;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1477 case PIX_FMT_YUV422P:
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1478 width >>= 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1479 break;
1425
f53d31c5eac9 * ffmpeg was *silently* rejecting to deinterlace NTSC DV. The problem
romansh
parents: 1353
diff changeset
1480 case PIX_FMT_YUV411P:
f53d31c5eac9 * ffmpeg was *silently* rejecting to deinterlace NTSC DV. The problem
romansh
parents: 1353
diff changeset
1481 width >>= 2;
f53d31c5eac9 * ffmpeg was *silently* rejecting to deinterlace NTSC DV. The problem
romansh
parents: 1353
diff changeset
1482 break;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1483 default:
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1484 break;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1485 }
5810
3e5e2bafe35c Enable avpicture_deinterlace() for PIX_FMT_GRAY8.
cehoyos
parents: 5735
diff changeset
1486 if (pix_fmt == PIX_FMT_GRAY8) {
3e5e2bafe35c Enable avpicture_deinterlace() for PIX_FMT_GRAY8.
cehoyos
parents: 5735
diff changeset
1487 break;
3e5e2bafe35c Enable avpicture_deinterlace() for PIX_FMT_GRAY8.
cehoyos
parents: 5735
diff changeset
1488 }
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1489 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1490 if (src == dst) {
1488
766a2f4edbea avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents: 1425
diff changeset
1491 deinterlace_bottom_field_inplace(dst->data[i], dst->linesize[i],
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1492 width, height);
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1493 } else {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1494 deinterlace_bottom_field(dst->data[i],dst->linesize[i],
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1495 src->data[i], src->linesize[i],
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1496 width, height);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1497 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1498 }
5735
8b211f34a3eb Use emms_c() instead of ifdef
andoma
parents: 5706
diff changeset
1499 emms_c();
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1500 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1501 }
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 429
diff changeset
1502