Mercurial > libavcodec.hg
annotate imgconvert.c @ 3536:545a15c19c91 libavcodec
sse & sse2 implementations of vorbis channel coupling.
9% faster vorbis (on a K8).
| author | lorenm |
|---|---|
| date | Thu, 03 Aug 2006 03:18:47 +0000 |
| parents | 54814e15aa3d |
| children | 33d29a80bcac |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * Misc image convertion routines | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
3 * Copyright (c) 2001, 2002, 2003 Fabrice Bellard. |
| 0 | 4 * |
| 429 | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Lesser General Public | |
| 7 * License as published by the Free Software Foundation; either | |
| 8 * version 2 of the License, or (at your option) any later version. | |
| 0 | 9 * |
| 429 | 10 * This library is distributed in the hope that it will be useful, |
| 0 | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 429 | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Lesser General Public License for more details. | |
| 0 | 14 * |
| 429 | 15 * You should have received a copy of the GNU Lesser General Public |
| 16 * License along with this library; if not, write to the Free Software | |
|
3036
0b546eab515d
Update licensing information: The FSF changed postal address.
diego
parents:
2979
diff
changeset
|
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 */ |
| 1106 | 19 |
| 20 /** | |
| 1108 | 21 * @file imgconvert.c |
| 1106 | 22 * Misc image convertion routines. |
| 23 */ | |
| 24 | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
25 /* TODO: |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
26 * - 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
|
27 * - move all api to slice based system |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
28 * - 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
|
29 */ |
| 1106 | 30 |
| 0 | 31 #include "avcodec.h" |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
32 #include "dsputil.h" |
| 0 | 33 |
| 17 | 34 #ifdef USE_FASTMEMCPY |
| 35 #include "fastmemcpy.h" | |
| 36 #endif | |
| 801 | 37 |
| 38 #ifdef HAVE_MMX | |
| 39 #include "i386/mmx.h" | |
| 40 #endif | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
41 |
| 1204 | 42 #define xglue(x, y) x ## y |
| 43 #define glue(x, y) xglue(x, y) | |
| 44 | |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
45 #define FF_COLOR_RGB 0 /* RGB color space */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
46 #define FF_COLOR_GRAY 1 /* gray color space */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
47 #define FF_COLOR_YUV 2 /* YUV color space. 16 <= Y <= 235, 16 <= U, V <= 240 */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
48 #define FF_COLOR_YUV_JPEG 3 /* YUV color space. 0 <= Y <= 255, 0 <= U, V <= 255 */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
49 |
| 1204 | 50 #define FF_PIXEL_PLANAR 0 /* each channel has one component in AVPicture */ |
| 51 #define FF_PIXEL_PACKED 1 /* only one components containing all the channels */ | |
| 52 #define FF_PIXEL_PALETTE 2 /* one components containing indexes for a palette */ | |
| 53 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
54 typedef struct PixFmtInfo { |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
55 const char *name; |
| 1204 | 56 uint8_t nb_channels; /* number of channels (including alpha) */ |
| 57 uint8_t color_type; /* color type (see FF_COLOR_xxx constants) */ | |
| 58 uint8_t pixel_type; /* pixel storage type (see FF_PIXEL_xxx constants) */ | |
| 1064 | 59 uint8_t is_alpha : 1; /* true if alpha can be specified */ |
| 1204 | 60 uint8_t x_chroma_shift; /* X chroma subsampling factor is 2 ^ shift */ |
| 61 uint8_t y_chroma_shift; /* Y chroma subsampling factor is 2 ^ shift */ | |
| 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 | 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] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
69 .name = "yuv420p", |
| 1204 | 70 .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
|
71 .color_type = FF_COLOR_YUV, |
| 1204 | 72 .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
|
73 .depth = 8, |
| 2967 | 74 .x_chroma_shift = 1, .y_chroma_shift = 1, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
75 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
76 [PIX_FMT_YUV422P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
77 .name = "yuv422p", |
| 1204 | 78 .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
|
79 .color_type = FF_COLOR_YUV, |
| 1204 | 80 .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
|
81 .depth = 8, |
| 2967 | 82 .x_chroma_shift = 1, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
83 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
84 [PIX_FMT_YUV444P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
85 .name = "yuv444p", |
| 1204 | 86 .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
|
87 .color_type = FF_COLOR_YUV, |
| 1204 | 88 .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
|
89 .depth = 8, |
| 2967 | 90 .x_chroma_shift = 0, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
91 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
92 [PIX_FMT_YUV422] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
93 .name = "yuv422", |
| 1204 | 94 .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
|
95 .color_type = FF_COLOR_YUV, |
| 1204 | 96 .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
|
97 .depth = 8, |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
98 .x_chroma_shift = 1, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
99 }, |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
100 [PIX_FMT_UYVY422] = { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
101 .name = "uyvy422", |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
102 .nb_channels = 1, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
103 .color_type = FF_COLOR_YUV, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
104 .pixel_type = FF_PIXEL_PACKED, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
105 .depth = 8, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
106 .x_chroma_shift = 1, .y_chroma_shift = 0, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
107 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
108 [PIX_FMT_YUV410P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
109 .name = "yuv410p", |
| 1204 | 110 .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
|
111 .color_type = FF_COLOR_YUV, |
| 1204 | 112 .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
|
113 .depth = 8, |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
114 .x_chroma_shift = 2, .y_chroma_shift = 2, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
115 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
116 [PIX_FMT_YUV411P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
117 .name = "yuv411p", |
| 1204 | 118 .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
|
119 .color_type = FF_COLOR_YUV, |
| 1204 | 120 .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
|
121 .depth = 8, |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
122 .x_chroma_shift = 2, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
123 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
124 |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
125 /* JPEG YUV */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
126 [PIX_FMT_YUVJ420P] = { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
127 .name = "yuvj420p", |
| 1204 | 128 .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
|
129 .color_type = FF_COLOR_YUV_JPEG, |
| 1204 | 130 .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
|
131 .depth = 8, |
| 2967 | 132 .x_chroma_shift = 1, .y_chroma_shift = 1, |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
133 }, |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
134 [PIX_FMT_YUVJ422P] = { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
135 .name = "yuvj422p", |
| 1204 | 136 .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
|
137 .color_type = FF_COLOR_YUV_JPEG, |
| 1204 | 138 .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
|
139 .depth = 8, |
| 2967 | 140 .x_chroma_shift = 1, .y_chroma_shift = 0, |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
141 }, |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
142 [PIX_FMT_YUVJ444P] = { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
143 .name = "yuvj444p", |
| 1204 | 144 .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
|
145 .color_type = FF_COLOR_YUV_JPEG, |
| 1204 | 146 .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
|
147 .depth = 8, |
| 2967 | 148 .x_chroma_shift = 0, .y_chroma_shift = 0, |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
149 }, |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
150 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
151 /* RGB formats */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
152 [PIX_FMT_RGB24] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
153 .name = "rgb24", |
| 1204 | 154 .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
|
155 .color_type = FF_COLOR_RGB, |
| 1204 | 156 .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
|
157 .depth = 8, |
| 1593 | 158 .x_chroma_shift = 0, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
159 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
160 [PIX_FMT_BGR24] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
161 .name = "bgr24", |
| 1204 | 162 .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
|
163 .color_type = FF_COLOR_RGB, |
| 1204 | 164 .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
|
165 .depth = 8, |
| 1593 | 166 .x_chroma_shift = 0, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
167 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
168 [PIX_FMT_RGBA32] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
169 .name = "rgba32", |
| 1204 | 170 .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
|
171 .color_type = FF_COLOR_RGB, |
| 1204 | 172 .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
|
173 .depth = 8, |
| 1593 | 174 .x_chroma_shift = 0, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
175 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
176 [PIX_FMT_RGB565] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
177 .name = "rgb565", |
| 1204 | 178 .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
|
179 .color_type = FF_COLOR_RGB, |
| 1204 | 180 .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
|
181 .depth = 5, |
| 1593 | 182 .x_chroma_shift = 0, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
183 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
184 [PIX_FMT_RGB555] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
185 .name = "rgb555", |
| 1204 | 186 .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
|
187 .color_type = FF_COLOR_RGB, |
| 1204 | 188 .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
|
189 .depth = 5, |
| 1593 | 190 .x_chroma_shift = 0, .y_chroma_shift = 0, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
191 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
192 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
193 /* gray / mono formats */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
194 [PIX_FMT_GRAY8] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
195 .name = "gray", |
| 1204 | 196 .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
|
197 .color_type = FF_COLOR_GRAY, |
| 1204 | 198 .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
|
199 .depth = 8, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
200 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
201 [PIX_FMT_MONOWHITE] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
202 .name = "monow", |
| 1204 | 203 .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
|
204 .color_type = FF_COLOR_GRAY, |
| 1204 | 205 .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
|
206 .depth = 1, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
207 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
208 [PIX_FMT_MONOBLACK] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
209 .name = "monob", |
| 1204 | 210 .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
|
211 .color_type = FF_COLOR_GRAY, |
| 1204 | 212 .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
|
213 .depth = 1, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
214 }, |
| 1055 | 215 |
| 216 /* paletted formats */ | |
| 217 [PIX_FMT_PAL8] = { | |
| 218 .name = "pal8", | |
| 1204 | 219 .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
|
220 .color_type = FF_COLOR_RGB, |
| 1204 | 221 .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
|
222 .depth = 8, |
| 1055 | 223 }, |
|
2179
34eaf41657d5
enrtries for PIX_FMT_XVMC_MPEG2_MC and PIX_FMT_XVMC_MPEG2_IDCT patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2137
diff
changeset
|
224 [PIX_FMT_XVMC_MPEG2_MC] = { |
|
34eaf41657d5
enrtries for PIX_FMT_XVMC_MPEG2_MC and PIX_FMT_XVMC_MPEG2_IDCT patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2137
diff
changeset
|
225 .name = "xvmcmc", |
|
34eaf41657d5
enrtries for PIX_FMT_XVMC_MPEG2_MC and PIX_FMT_XVMC_MPEG2_IDCT patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2137
diff
changeset
|
226 }, |
|
34eaf41657d5
enrtries for PIX_FMT_XVMC_MPEG2_MC and PIX_FMT_XVMC_MPEG2_IDCT patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2137
diff
changeset
|
227 [PIX_FMT_XVMC_MPEG2_IDCT] = { |
|
34eaf41657d5
enrtries for PIX_FMT_XVMC_MPEG2_MC and PIX_FMT_XVMC_MPEG2_IDCT patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2137
diff
changeset
|
228 .name = "xvmcidct", |
|
34eaf41657d5
enrtries for PIX_FMT_XVMC_MPEG2_MC and PIX_FMT_XVMC_MPEG2_IDCT patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
2137
diff
changeset
|
229 }, |
| 2309 | 230 [PIX_FMT_UYVY411] = { |
| 231 .name = "uyvy411", | |
| 232 .nb_channels = 1, | |
| 233 .color_type = FF_COLOR_YUV, | |
| 234 .pixel_type = FF_PIXEL_PACKED, | |
| 235 .depth = 8, | |
| 236 .x_chroma_shift = 2, .y_chroma_shift = 0, | |
| 237 }, | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
238 }; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
239 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
240 void avcodec_get_chroma_sub_sample(int pix_fmt, int *h_shift, int *v_shift) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
241 { |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
242 *h_shift = pix_fmt_info[pix_fmt].x_chroma_shift; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
243 *v_shift = pix_fmt_info[pix_fmt].y_chroma_shift; |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
244 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
245 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
246 const char *avcodec_get_pix_fmt_name(int pix_fmt) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
247 { |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
248 if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
249 return "???"; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
250 else |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
251 return pix_fmt_info[pix_fmt].name; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
252 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
253 |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
254 enum PixelFormat avcodec_get_pix_fmt(const char* name) |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
255 { |
| 2967 | 256 int i; |
| 257 | |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
258 for (i=0; i < PIX_FMT_NB; i++) |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
259 if (!strcmp(pix_fmt_info[i].name, name)) |
| 2979 | 260 break; |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
261 return i; |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
262 } |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
263 |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
264 /* Picture field are filled with 'ptr' addresses. Also return size */ |
| 1064 | 265 int avpicture_fill(AVPicture *picture, uint8_t *ptr, |
| 2979 | 266 int 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
|
267 { |
|
1047
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
268 int size, w2, h2, size2; |
| 3420 | 269 const PixFmtInfo *pinfo; |
| 2967 | 270 |
| 2422 | 271 if(avcodec_check_dimensions(NULL, width, height)) |
| 272 goto fail; | |
| 273 | |
|
1047
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
274 pinfo = &pix_fmt_info[pix_fmt]; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
275 size = width * height; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
276 switch(pix_fmt) { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
277 case PIX_FMT_YUV420P: |
|
1047
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
278 case PIX_FMT_YUV422P: |
|
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
279 case PIX_FMT_YUV444P: |
|
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
280 case PIX_FMT_YUV410P: |
|
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
281 case PIX_FMT_YUV411P: |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
282 case PIX_FMT_YUVJ420P: |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
283 case PIX_FMT_YUVJ422P: |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
284 case PIX_FMT_YUVJ444P: |
|
1047
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
285 w2 = (width + (1 << pinfo->x_chroma_shift) - 1) >> pinfo->x_chroma_shift; |
|
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
286 h2 = (height + (1 << pinfo->y_chroma_shift) - 1) >> pinfo->y_chroma_shift; |
|
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
287 size2 = w2 * h2; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
288 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
|
289 picture->data[1] = picture->data[0] + size; |
|
1047
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
290 picture->data[2] = picture->data[1] + size2; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
291 picture->linesize[0] = width; |
|
1047
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
292 picture->linesize[1] = w2; |
|
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
293 picture->linesize[2] = w2; |
|
3f316a471019
handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents:
1044
diff
changeset
|
294 return size + 2 * size2; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
295 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
|
296 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
|
297 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
|
298 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
|
299 picture->data[2] = NULL; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
300 picture->linesize[0] = width * 3; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
301 return size * 3; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
302 case PIX_FMT_RGBA32: |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
303 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
|
304 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
|
305 picture->data[2] = NULL; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
306 picture->linesize[0] = width * 4; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
307 return size * 4; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
308 case PIX_FMT_RGB555: |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
309 case PIX_FMT_RGB565: |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
310 case PIX_FMT_YUV422: |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
311 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
|
312 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
|
313 picture->data[2] = NULL; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
314 picture->linesize[0] = width * 2; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
315 return size * 2; |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
316 case PIX_FMT_UYVY422: |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
317 picture->data[0] = ptr; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
318 picture->data[1] = NULL; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
319 picture->data[2] = NULL; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
320 picture->linesize[0] = width * 2; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
321 return size * 2; |
| 2309 | 322 case PIX_FMT_UYVY411: |
| 323 picture->data[0] = ptr; | |
| 324 picture->data[1] = NULL; | |
| 325 picture->data[2] = NULL; | |
| 326 picture->linesize[0] = width + width/2; | |
| 327 return size + size/2; | |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
328 case PIX_FMT_GRAY8: |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
329 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
|
330 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
|
331 picture->data[2] = NULL; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
332 picture->linesize[0] = width; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
333 return size; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
334 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
|
335 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
|
336 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
|
337 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
|
338 picture->data[2] = NULL; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
339 picture->linesize[0] = (width + 7) >> 3; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
340 return picture->linesize[0] * height; |
| 1055 | 341 case PIX_FMT_PAL8: |
| 342 size2 = (size + 3) & ~3; | |
| 343 picture->data[0] = ptr; | |
| 344 picture->data[1] = ptr + size2; /* palette is stored here as 256 32 bit words */ | |
| 345 picture->data[2] = NULL; | |
| 346 picture->linesize[0] = width; | |
| 347 picture->linesize[1] = 4; | |
| 348 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
|
349 default: |
| 2422 | 350 fail: |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
351 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
|
352 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
|
353 picture->data[2] = NULL; |
| 1055 | 354 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
|
355 return -1; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
356 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
357 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
358 |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
359 int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height, |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
360 unsigned char *dest, int dest_size) |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
361 { |
| 3420 | 362 const PixFmtInfo* pf = &pix_fmt_info[pix_fmt]; |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
363 int i, j, w, h, data_planes; |
| 2967 | 364 const unsigned char* s; |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
365 int size = avpicture_get_size(pix_fmt, width, height); |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
366 |
| 2422 | 367 if (size > dest_size || size < 0) |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
368 return -1; |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
369 |
|
1243
5d2376294fbf
* fixing a bug in avpicture_layout (PAL8 wasn't handled properly)
romansh
parents:
1231
diff
changeset
|
370 if (pf->pixel_type == FF_PIXEL_PACKED || pf->pixel_type == FF_PIXEL_PALETTE) { |
| 2967 | 371 if (pix_fmt == PIX_FMT_YUV422 || |
| 372 pix_fmt == PIX_FMT_UYVY422 || | |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
373 pix_fmt == PIX_FMT_RGB565 || |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
374 pix_fmt == PIX_FMT_RGB555) |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
375 w = width * 2; |
| 2979 | 376 else if (pix_fmt == PIX_FMT_UYVY411) |
| 377 w = width + width/2; | |
| 378 else if (pix_fmt == PIX_FMT_PAL8) | |
| 379 w = width; | |
| 380 else | |
| 381 w = width * (pf->depth * pf->nb_channels / 8); | |
| 2967 | 382 |
| 2979 | 383 data_planes = 1; |
| 384 h = height; | |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
385 } else { |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
386 data_planes = pf->nb_channels; |
| 2979 | 387 w = (width*pf->depth + 7)/8; |
| 388 h = height; | |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
389 } |
| 2967 | 390 |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
391 for (i=0; i<data_planes; i++) { |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
392 if (i == 1) { |
| 2979 | 393 w = width >> pf->x_chroma_shift; |
| 394 h = height >> pf->y_chroma_shift; | |
| 395 } | |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
396 s = src->data[i]; |
| 2979 | 397 for(j=0; j<h; j++) { |
| 398 memcpy(dest, s, w); | |
| 399 dest += w; | |
| 400 s += src->linesize[i]; | |
| 401 } | |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
402 } |
| 2967 | 403 |
|
1243
5d2376294fbf
* fixing a bug in avpicture_layout (PAL8 wasn't handled properly)
romansh
parents:
1231
diff
changeset
|
404 if (pf->pixel_type == FF_PIXEL_PALETTE) |
| 2979 | 405 memcpy((unsigned char *)(((size_t)dest + 3) & ~3), src->data[1], 256 * 4); |
| 2967 | 406 |
|
1231
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
407 return size; |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
408 } |
|
b88dfc4bbf8c
* introducing new public interface in imgconvert.c
romansh
parents:
1209
diff
changeset
|
409 |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
410 int avpicture_get_size(int pix_fmt, int width, int height) |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
411 { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
412 AVPicture dummy_pict; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
413 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
|
414 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
415 |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
416 /** |
| 2967 | 417 * compute the loss when converting from a pixel format to another |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
418 */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
419 int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int 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
|
420 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
|
421 { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
422 const PixFmtInfo *pf, *ps; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
423 int loss; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
424 |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
425 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
|
426 pf = &pix_fmt_info[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
|
427 |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
428 /* compute loss */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
429 loss = 0; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
430 pf = &pix_fmt_info[dst_pix_fmt]; |
|
1206
fd676abc754c
loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents:
1205
diff
changeset
|
431 if (pf->depth < ps->depth || |
|
fd676abc754c
loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents:
1205
diff
changeset
|
432 (dst_pix_fmt == PIX_FMT_RGB555 && src_pix_fmt == PIX_FMT_RGB565)) |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
433 loss |= FF_LOSS_DEPTH; |
|
1206
fd676abc754c
loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents:
1205
diff
changeset
|
434 if (pf->x_chroma_shift > ps->x_chroma_shift || |
|
fd676abc754c
loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents:
1205
diff
changeset
|
435 pf->y_chroma_shift > ps->y_chroma_shift) |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
436 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
|
437 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
|
438 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
|
439 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
|
440 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
|
441 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
|
442 break; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
443 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
|
444 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
|
445 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
|
446 break; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
447 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
|
448 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
|
449 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
|
450 break; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
451 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
|
452 if (ps->color_type != FF_COLOR_YUV_JPEG && |
| 2967 | 453 ps->color_type != FF_COLOR_YUV && |
|
1206
fd676abc754c
loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents:
1205
diff
changeset
|
454 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
|
455 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
|
456 break; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
457 default: |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
458 /* 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
|
459 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
|
460 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
|
461 break; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
462 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
463 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
|
464 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
|
465 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
|
466 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
|
467 loss |= FF_LOSS_ALPHA; |
| 2967 | 468 if (pf->pixel_type == FF_PIXEL_PALETTE && |
| 1204 | 469 (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
|
470 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
|
471 return loss; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
472 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
473 |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
474 static int avg_bits_per_pixel(int pix_fmt) |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
475 { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
476 int bits; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
477 const PixFmtInfo *pf; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
478 |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
479 pf = &pix_fmt_info[pix_fmt]; |
| 1204 | 480 switch(pf->pixel_type) { |
| 481 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
|
482 switch(pix_fmt) { |
| 1204 | 483 case PIX_FMT_YUV422: |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
484 case PIX_FMT_UYVY422: |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
485 case PIX_FMT_RGB565: |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
486 case PIX_FMT_RGB555: |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
487 bits = 16; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
488 break; |
| 2979 | 489 case PIX_FMT_UYVY411: |
| 490 bits = 12; | |
| 491 break; | |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
492 default: |
| 1204 | 493 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
|
494 break; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
495 } |
| 1204 | 496 break; |
| 497 case FF_PIXEL_PLANAR: | |
| 498 if (pf->x_chroma_shift == 0 && pf->y_chroma_shift == 0) { | |
| 499 bits = pf->depth * pf->nb_channels; | |
| 500 } else { | |
| 2967 | 501 bits = pf->depth + ((2 * pf->depth) >> |
| 1204 | 502 (pf->x_chroma_shift + pf->y_chroma_shift)); |
| 503 } | |
| 504 break; | |
| 505 case FF_PIXEL_PALETTE: | |
| 506 bits = 8; | |
| 507 break; | |
| 508 default: | |
| 509 bits = -1; | |
| 510 break; | |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
511 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
512 return bits; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
513 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
514 |
| 2967 | 515 static int avcodec_find_best_pix_fmt1(int pix_fmt_mask, |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
516 int 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
|
517 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
|
518 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
|
519 { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
520 int dist, i, loss, min_dist, 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
|
521 |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
522 /* find exact color match with smallest size */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
523 dst_pix_fmt = -1; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
524 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
|
525 for(i = 0;i < PIX_FMT_NB; i++) { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
526 if (pix_fmt_mask & (1 << i)) { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
527 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
|
528 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
|
529 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
|
530 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
|
531 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
|
532 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
|
533 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
534 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
535 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
536 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
537 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
|
538 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
539 |
| 2967 | 540 /** |
| 541 * find best pixel format to convert to. Return -1 if none found | |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
542 */ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
543 int avcodec_find_best_pix_fmt(int pix_fmt_mask, int 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
|
544 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
|
545 { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
546 int dst_pix_fmt, loss_mask, i; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
547 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
|
548 ~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
|
549 ~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
|
550 ~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
|
551 ~(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
|
552 ~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
|
553 ~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
|
554 0, |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
555 }; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
556 |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
557 /* 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
|
558 i = 0; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
559 for(;;) { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
560 loss_mask = loss_mask_order[i++]; |
| 2967 | 561 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
|
562 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
|
563 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
|
564 goto found; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
565 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
|
566 break; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
567 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
568 return -1; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
569 found: |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
570 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
|
571 *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
|
572 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
|
573 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
574 |
| 3245 | 575 void ff_img_copy_plane(uint8_t *dst, int dst_wrap, |
| 1205 | 576 const uint8_t *src, int src_wrap, |
| 577 int width, int height) | |
| 1204 | 578 { |
| 2967 | 579 if((!dst) || (!src)) |
| 2785 | 580 return; |
| 1204 | 581 for(;height > 0; height--) { |
| 582 memcpy(dst, src, width); | |
| 583 dst += dst_wrap; | |
| 584 src += src_wrap; | |
| 585 } | |
| 586 } | |
| 587 | |
| 1208 | 588 /** |
| 589 * Copy image 'src' to 'dst'. | |
| 590 */ | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
591 void img_copy(AVPicture *dst, const AVPicture *src, |
| 1204 | 592 int pix_fmt, int width, int height) |
| 593 { | |
| 594 int bwidth, bits, i; | |
| 3420 | 595 const PixFmtInfo *pf = &pix_fmt_info[pix_fmt]; |
| 2967 | 596 |
| 1204 | 597 pf = &pix_fmt_info[pix_fmt]; |
| 598 switch(pf->pixel_type) { | |
| 599 case FF_PIXEL_PACKED: | |
| 600 switch(pix_fmt) { | |
| 601 case PIX_FMT_YUV422: | |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
602 case PIX_FMT_UYVY422: |
| 1204 | 603 case PIX_FMT_RGB565: |
| 604 case PIX_FMT_RGB555: | |
| 605 bits = 16; | |
| 606 break; | |
| 2979 | 607 case PIX_FMT_UYVY411: |
| 608 bits = 12; | |
| 609 break; | |
| 1204 | 610 default: |
| 611 bits = pf->depth * pf->nb_channels; | |
| 612 break; | |
| 613 } | |
| 614 bwidth = (width * bits + 7) >> 3; | |
| 3245 | 615 ff_img_copy_plane(dst->data[0], dst->linesize[0], |
| 1204 | 616 src->data[0], src->linesize[0], |
| 617 bwidth, height); | |
| 618 break; | |
| 619 case FF_PIXEL_PLANAR: | |
| 620 for(i = 0; i < pf->nb_channels; i++) { | |
| 621 int w, h; | |
| 622 w = width; | |
| 623 h = height; | |
| 624 if (i == 1 || i == 2) { | |
| 625 w >>= pf->x_chroma_shift; | |
| 626 h >>= pf->y_chroma_shift; | |
| 627 } | |
| 628 bwidth = (w * pf->depth + 7) >> 3; | |
| 3245 | 629 ff_img_copy_plane(dst->data[i], dst->linesize[i], |
| 1204 | 630 src->data[i], src->linesize[i], |
| 631 bwidth, h); | |
| 632 } | |
| 633 break; | |
| 634 case FF_PIXEL_PALETTE: | |
| 3245 | 635 ff_img_copy_plane(dst->data[0], dst->linesize[0], |
| 1204 | 636 src->data[0], src->linesize[0], |
| 637 width, height); | |
| 638 /* copy the palette */ | |
| 3245 | 639 ff_img_copy_plane(dst->data[1], dst->linesize[1], |
| 1204 | 640 src->data[1], src->linesize[1], |
| 641 4, 256); | |
| 642 break; | |
| 643 } | |
| 644 } | |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
645 |
| 0 | 646 /* XXX: totally non optimized */ |
| 647 | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
648 static void yuv422_to_yuv420p(AVPicture *dst, const AVPicture *src, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
649 int width, int height) |
| 0 | 650 { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
651 const uint8_t *p, *p1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
652 uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1; |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
653 int w; |
| 2967 | 654 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
655 p1 = src->data[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
656 lum1 = dst->data[0]; |
| 1207 | 657 cb1 = dst->data[1]; |
| 658 cr1 = dst->data[2]; | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
659 |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
660 for(;height >= 1; height -= 2) { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
661 p = p1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
662 lum = lum1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
663 cb = cb1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
664 cr = cr1; |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
665 for(w = width; w >= 2; w -= 2) { |
|
1028
e76fb91de4cc
reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents:
1023
diff
changeset
|
666 lum[0] = p[0]; |
|
e76fb91de4cc
reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents:
1023
diff
changeset
|
667 cb[0] = p[1]; |
|
e76fb91de4cc
reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents:
1023
diff
changeset
|
668 lum[1] = p[2]; |
|
e76fb91de4cc
reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents:
1023
diff
changeset
|
669 cr[0] = p[3]; |
| 0 | 670 p += 4; |
| 671 lum += 2; | |
| 672 cb++; | |
| 673 cr++; | |
| 674 } | |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
675 if (w) { |
|
1028
e76fb91de4cc
reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents:
1023
diff
changeset
|
676 lum[0] = p[0]; |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
677 cb[0] = p[1]; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
678 cr[0] = p[3]; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
679 cb++; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
680 cr++; |
| 0 | 681 } |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
682 p1 += src->linesize[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
683 lum1 += dst->linesize[0]; |
|
1353
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
684 if (height>1) { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
685 p = p1; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
686 lum = lum1; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
687 for(w = width; w >= 2; w -= 2) { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
688 lum[0] = p[0]; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
689 lum[1] = p[2]; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
690 p += 4; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
691 lum += 2; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
692 } |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
693 if (w) { |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
694 lum[0] = p[0]; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
695 } |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
696 p1 += src->linesize[0]; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
697 lum1 += dst->linesize[0]; |
|
cfc80b3a4ada
flash video (flv) support patch by (Garrick Meeker <gmeeker at theoryllc dot com>)
michaelni
parents:
1282
diff
changeset
|
698 } |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
699 cb1 += dst->linesize[1]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
700 cr1 += dst->linesize[2]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
701 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
702 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
703 |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
704 static void uyvy422_to_yuv420p(AVPicture *dst, const AVPicture *src, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
705 int width, int height) |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
706 { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
707 const uint8_t *p, *p1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
708 uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
709 int w; |
| 2967 | 710 |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
711 p1 = src->data[0]; |
| 2967 | 712 |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
713 lum1 = dst->data[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
714 cb1 = dst->data[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
715 cr1 = dst->data[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
716 |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
717 for(;height >= 1; height -= 2) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
718 p = p1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
719 lum = lum1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
720 cb = cb1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
721 cr = cr1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
722 for(w = width; w >= 2; w -= 2) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
723 lum[0] = p[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
724 cb[0] = p[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
725 lum[1] = p[3]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
726 cr[0] = p[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
727 p += 4; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
728 lum += 2; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
729 cb++; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
730 cr++; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
731 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
732 if (w) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
733 lum[0] = p[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
734 cb[0] = p[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
735 cr[0] = p[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
736 cb++; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
737 cr++; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
738 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
739 p1 += src->linesize[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
740 lum1 += dst->linesize[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
741 if (height>1) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
742 p = p1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
743 lum = lum1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
744 for(w = width; w >= 2; w -= 2) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
745 lum[0] = p[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
746 lum[1] = p[3]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
747 p += 4; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
748 lum += 2; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
749 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
750 if (w) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
751 lum[0] = p[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
752 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
753 p1 += src->linesize[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
754 lum1 += dst->linesize[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
755 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
756 cb1 += dst->linesize[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
757 cr1 += dst->linesize[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
758 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
759 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
760 |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
761 |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
762 static void uyvy422_to_yuv422p(AVPicture *dst, const AVPicture *src, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
763 int width, int height) |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
764 { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
765 const uint8_t *p, *p1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
766 uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
767 int w; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
768 |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
769 p1 = src->data[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
770 lum1 = dst->data[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
771 cb1 = dst->data[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
772 cr1 = dst->data[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
773 for(;height > 0; height--) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
774 p = p1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
775 lum = lum1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
776 cb = cb1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
777 cr = cr1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
778 for(w = width; w >= 2; w -= 2) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
779 lum[0] = p[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
780 cb[0] = p[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
781 lum[1] = p[3]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
782 cr[0] = p[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
783 p += 4; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
784 lum += 2; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
785 cb++; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
786 cr++; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
787 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
788 p1 += src->linesize[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
789 lum1 += dst->linesize[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
790 cb1 += dst->linesize[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
791 cr1 += dst->linesize[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
792 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
793 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
794 |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
795 |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
796 static void yuv422_to_yuv422p(AVPicture *dst, const AVPicture *src, |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
797 int width, int height) |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
798 { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
799 const uint8_t *p, *p1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
800 uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
801 int w; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
802 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
803 p1 = src->data[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
804 lum1 = dst->data[0]; |
| 1207 | 805 cb1 = dst->data[1]; |
| 806 cr1 = dst->data[2]; | |
| 807 for(;height > 0; height--) { | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
808 p = p1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
809 lum = lum1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
810 cb = cb1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
811 cr = cr1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
812 for(w = width; w >= 2; w -= 2) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
813 lum[0] = p[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
814 cb[0] = p[1]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
815 lum[1] = p[2]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
816 cr[0] = p[3]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
817 p += 4; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
818 lum += 2; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
819 cb++; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
820 cr++; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
821 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
822 p1 += src->linesize[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
823 lum1 += dst->linesize[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
824 cb1 += dst->linesize[1]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
825 cr1 += dst->linesize[2]; |
| 0 | 826 } |
| 827 } | |
| 828 | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
829 static void yuv422p_to_yuv422(AVPicture *dst, const AVPicture *src, |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
830 int width, int height) |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
831 { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
832 uint8_t *p, *p1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
833 const uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
834 int w; |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
835 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
836 p1 = dst->data[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
837 lum1 = src->data[0]; |
| 1207 | 838 cb1 = src->data[1]; |
| 839 cr1 = src->data[2]; | |
| 840 for(;height > 0; height--) { | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
841 p = p1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
842 lum = lum1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
843 cb = cb1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
844 cr = cr1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
845 for(w = width; w >= 2; w -= 2) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
846 p[0] = lum[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
847 p[1] = cb[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
848 p[2] = lum[1]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
849 p[3] = cr[0]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
850 p += 4; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
851 lum += 2; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
852 cb++; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
853 cr++; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
854 } |
| 1207 | 855 p1 += dst->linesize[0]; |
| 856 lum1 += src->linesize[0]; | |
| 857 cb1 += src->linesize[1]; | |
| 858 cr1 += src->linesize[2]; | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
859 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
860 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
861 |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
862 static void yuv422p_to_uyvy422(AVPicture *dst, const AVPicture *src, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
863 int width, int height) |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
864 { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
865 uint8_t *p, *p1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
866 const uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
867 int w; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
868 |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
869 p1 = dst->data[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
870 lum1 = src->data[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
871 cb1 = src->data[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
872 cr1 = src->data[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
873 for(;height > 0; height--) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
874 p = p1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
875 lum = lum1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
876 cb = cb1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
877 cr = cr1; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
878 for(w = width; w >= 2; w -= 2) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
879 p[1] = lum[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
880 p[0] = cb[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
881 p[3] = lum[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
882 p[2] = cr[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
883 p += 4; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
884 lum += 2; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
885 cb++; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
886 cr++; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
887 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
888 p1 += dst->linesize[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
889 lum1 += src->linesize[0]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
890 cb1 += src->linesize[1]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
891 cr1 += src->linesize[2]; |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
892 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
893 } |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
894 |
| 2309 | 895 static void uyvy411_to_yuv411p(AVPicture *dst, const AVPicture *src, |
| 896 int width, int height) | |
| 897 { | |
| 898 const uint8_t *p, *p1; | |
| 899 uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1; | |
| 900 int w; | |
| 901 | |
| 902 p1 = src->data[0]; | |
| 903 lum1 = dst->data[0]; | |
| 904 cb1 = dst->data[1]; | |
| 905 cr1 = dst->data[2]; | |
| 906 for(;height > 0; height--) { | |
| 907 p = p1; | |
| 908 lum = lum1; | |
| 909 cb = cb1; | |
| 910 cr = cr1; | |
| 911 for(w = width; w >= 4; w -= 4) { | |
| 912 cb[0] = p[0]; | |
| 2979 | 913 lum[0] = p[1]; |
| 2309 | 914 lum[1] = p[2]; |
| 915 cr[0] = p[3]; | |
| 2979 | 916 lum[2] = p[4]; |
| 917 lum[3] = p[5]; | |
| 2309 | 918 p += 6; |
| 919 lum += 4; | |
| 920 cb++; | |
| 921 cr++; | |
| 922 } | |
| 923 p1 += src->linesize[0]; | |
| 924 lum1 += dst->linesize[0]; | |
| 925 cb1 += dst->linesize[1]; | |
| 926 cr1 += dst->linesize[2]; | |
| 927 } | |
| 928 } | |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
929 |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
930 |
|
2326
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
931 static void yuv420p_to_yuv422(AVPicture *dst, const AVPicture *src, |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
932 int width, int height) |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
933 { |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
934 int w, h; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
935 uint8_t *line1, *line2, *linesrc = dst->data[0]; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
936 uint8_t *lum1, *lum2, *lumsrc = src->data[0]; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
937 uint8_t *cb1, *cb2 = src->data[1]; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
938 uint8_t *cr1, *cr2 = src->data[2]; |
| 2967 | 939 |
|
2326
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
940 for(h = height / 2; h--;) { |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
941 line1 = linesrc; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
942 line2 = linesrc + dst->linesize[0]; |
| 2967 | 943 |
|
2326
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
944 lum1 = lumsrc; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
945 lum2 = lumsrc + src->linesize[0]; |
| 2967 | 946 |
|
2326
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
947 cb1 = cb2; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
948 cr1 = cr2; |
| 2967 | 949 |
|
2326
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
950 for(w = width / 2; w--;) { |
| 2967 | 951 *line1++ = *lum1++; *line2++ = *lum2++; |
| 952 *line1++ = *line2++ = *cb1++; | |
| 953 *line1++ = *lum1++; *line2++ = *lum2++; | |
|
2326
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
954 *line1++ = *line2++ = *cr1++; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
955 } |
| 2967 | 956 |
|
2326
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
957 linesrc += dst->linesize[0] * 2; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
958 lumsrc += src->linesize[0] * 2; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
959 cb2 += src->linesize[1]; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
960 cr2 += src->linesize[2]; |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
961 } |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
962 } |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
963 |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
964 static void yuv420p_to_uyvy422(AVPicture *dst, const AVPicture *src, |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
965 int width, int height) |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
966 { |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
967 int w, h; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
968 uint8_t *line1, *line2, *linesrc = dst->data[0]; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
969 uint8_t *lum1, *lum2, *lumsrc = src->data[0]; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
970 uint8_t *cb1, *cb2 = src->data[1]; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
971 uint8_t *cr1, *cr2 = src->data[2]; |
| 2967 | 972 |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
973 for(h = height / 2; h--;) { |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
974 line1 = linesrc; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
975 line2 = linesrc + dst->linesize[0]; |
| 2967 | 976 |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
977 lum1 = lumsrc; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
978 lum2 = lumsrc + src->linesize[0]; |
| 2967 | 979 |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
980 cb1 = cb2; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
981 cr1 = cr2; |
| 2967 | 982 |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
983 for(w = width / 2; w--;) { |
| 2967 | 984 *line1++ = *line2++ = *cb1++; |
| 985 *line1++ = *lum1++; *line2++ = *lum2++; | |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
986 *line1++ = *line2++ = *cr1++; |
| 2967 | 987 *line1++ = *lum1++; *line2++ = *lum2++; |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
988 } |
| 2967 | 989 |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
990 linesrc += dst->linesize[0] * 2; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
991 lumsrc += src->linesize[0] * 2; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
992 cb2 += src->linesize[1]; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
993 cr2 += src->linesize[2]; |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
994 } |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
995 } |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
996 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
997 #define SCALEBITS 10 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
998 #define ONE_HALF (1 << (SCALEBITS - 1)) |
| 2979 | 999 #define FIX(x) ((int) ((x) * (1<<SCALEBITS) + 0.5)) |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1000 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1001 #define YUV_TO_RGB1_CCIR(cb1, cr1)\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1002 {\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1003 cb = (cb1) - 128;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1004 cr = (cr1) - 128;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1005 r_add = FIX(1.40200*255.0/224.0) * cr + ONE_HALF;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1006 g_add = - FIX(0.34414*255.0/224.0) * cb - FIX(0.71414*255.0/224.0) * cr + \ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1007 ONE_HALF;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1008 b_add = FIX(1.77200*255.0/224.0) * cb + ONE_HALF;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1009 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1010 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1011 #define YUV_TO_RGB2_CCIR(r, g, b, y1)\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1012 {\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1013 y = ((y1) - 16) * FIX(255.0/219.0);\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1014 r = cm[(y + r_add) >> SCALEBITS];\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1015 g = cm[(y + g_add) >> SCALEBITS];\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1016 b = cm[(y + b_add) >> SCALEBITS];\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1017 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1018 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1019 #define YUV_TO_RGB1(cb1, cr1)\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1020 {\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1021 cb = (cb1) - 128;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1022 cr = (cr1) - 128;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1023 r_add = FIX(1.40200) * cr + ONE_HALF;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1024 g_add = - FIX(0.34414) * cb - FIX(0.71414) * cr + ONE_HALF;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1025 b_add = FIX(1.77200) * cb + ONE_HALF;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1026 } |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1027 |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1028 #define YUV_TO_RGB2(r, g, b, y1)\ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1029 {\ |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1030 y = (y1) << SCALEBITS;\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1031 r = cm[(y + r_add) >> SCALEBITS];\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1032 g = cm[(y + g_add) >> SCALEBITS];\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1033 b = cm[(y + b_add) >> SCALEBITS];\ |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1034 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1035 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1036 #define Y_CCIR_TO_JPEG(y)\ |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1037 cm[((y) * FIX(255.0/219.0) + (ONE_HALF - 16 * FIX(255.0/219.0))) >> SCALEBITS] |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1038 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1039 #define Y_JPEG_TO_CCIR(y)\ |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1040 (((y) * FIX(219.0/255.0) + (ONE_HALF + (16 << SCALEBITS))) >> SCALEBITS) |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1041 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1042 #define C_CCIR_TO_JPEG(y)\ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1043 cm[(((y) - 128) * FIX(127.0/112.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS] |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1044 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1045 /* NOTE: the clamp is really necessary! */ |
| 1282 | 1046 static inline int C_JPEG_TO_CCIR(int y) { |
| 1047 y = (((y - 128) * FIX(112.0/127.0) + (ONE_HALF + (128 << SCALEBITS))) >> SCALEBITS); | |
| 1048 if (y < 16) | |
| 2979 | 1049 y = 16; |
| 1282 | 1050 return y; |
| 1051 } | |
| 1052 | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1053 |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1054 #define RGB_TO_Y(r, g, b) \ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1055 ((FIX(0.29900) * (r) + FIX(0.58700) * (g) + \ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1056 FIX(0.11400) * (b) + ONE_HALF) >> SCALEBITS) |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1057 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1058 #define RGB_TO_U(r1, g1, b1, shift)\ |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1059 (((- FIX(0.16874) * r1 - FIX(0.33126) * g1 + \ |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1060 FIX(0.50000) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1061 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1062 #define RGB_TO_V(r1, g1, b1, shift)\ |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1063 (((FIX(0.50000) * r1 - FIX(0.41869) * g1 - \ |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1064 FIX(0.08131) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1065 |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1066 #define RGB_TO_Y_CCIR(r, g, b) \ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1067 ((FIX(0.29900*219.0/255.0) * (r) + FIX(0.58700*219.0/255.0) * (g) + \ |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1068 FIX(0.11400*219.0/255.0) * (b) + (ONE_HALF + (16 << SCALEBITS))) >> SCALEBITS) |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1069 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1070 #define RGB_TO_U_CCIR(r1, g1, b1, shift)\ |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1071 (((- FIX(0.16874*224.0/255.0) * r1 - FIX(0.33126*224.0/255.0) * g1 + \ |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1072 FIX(0.50000*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1073 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1074 #define RGB_TO_V_CCIR(r1, g1, b1, shift)\ |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1075 (((FIX(0.50000*224.0/255.0) * r1 - FIX(0.41869*224.0/255.0) * g1 - \ |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1076 FIX(0.08131*224.0/255.0) * b1 + (ONE_HALF << shift) - 1) >> (SCALEBITS + shift)) + 128) |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1077 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1078 static uint8_t y_ccir_to_jpeg[256]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1079 static uint8_t y_jpeg_to_ccir[256]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1080 static uint8_t c_ccir_to_jpeg[256]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1081 static uint8_t c_jpeg_to_ccir[256]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1082 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1083 /* init various conversion tables */ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1084 static void img_convert_init(void) |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1085 { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1086 int i; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1087 uint8_t *cm = cropTbl + MAX_NEG_CROP; |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1088 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1089 for(i = 0;i < 256; i++) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1090 y_ccir_to_jpeg[i] = Y_CCIR_TO_JPEG(i); |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1091 y_jpeg_to_ccir[i] = Y_JPEG_TO_CCIR(i); |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1092 c_ccir_to_jpeg[i] = C_CCIR_TO_JPEG(i); |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1093 c_jpeg_to_ccir[i] = C_JPEG_TO_CCIR(i); |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1094 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1095 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1096 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1097 /* apply to each pixel the given table */ |
| 2967 | 1098 static void img_apply_table(uint8_t *dst, int dst_wrap, |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1099 const uint8_t *src, int src_wrap, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1100 int width, int height, const uint8_t *table1) |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1101 { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1102 int n; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1103 const uint8_t *s; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1104 uint8_t *d; |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1105 const uint8_t *table; |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1106 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1107 table = table1; |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1108 for(;height > 0; height--) { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1109 s = src; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1110 d = dst; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1111 n = width; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1112 while (n >= 4) { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1113 d[0] = table[s[0]]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1114 d[1] = table[s[1]]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1115 d[2] = table[s[2]]; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1116 d[3] = table[s[3]]; |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1117 d += 4; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1118 s += 4; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1119 n -= 4; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1120 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1121 while (n > 0) { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1122 d[0] = table[s[0]]; |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1123 d++; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1124 s++; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1125 n--; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1126 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1127 dst += dst_wrap; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1128 src += src_wrap; |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1129 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1130 } |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
1131 |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1132 /* XXX: use generic filter ? */ |
| 1205 | 1133 /* XXX: in most cases, the sampling position is incorrect */ |
| 1134 | |
| 1135 /* 4x1 -> 1x1 */ | |
| 2967 | 1136 static void shrink41(uint8_t *dst, int dst_wrap, |
| 1205 | 1137 const uint8_t *src, int src_wrap, |
| 1138 int width, int height) | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1139 { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1140 int w; |
| 1205 | 1141 const uint8_t *s; |
| 1142 uint8_t *d; | |
| 1143 | |
| 1144 for(;height > 0; height--) { | |
| 1145 s = src; | |
| 1146 d = dst; | |
| 1147 for(w = width;w > 0; w--) { | |
| 1148 d[0] = (s[0] + s[1] + s[2] + s[3] + 2) >> 2; | |
| 1149 s += 4; | |
| 1150 d++; | |
| 1151 } | |
| 1152 src += src_wrap; | |
| 1153 dst += dst_wrap; | |
| 1154 } | |
| 1155 } | |
| 1156 | |
| 1157 /* 2x1 -> 1x1 */ | |
| 2967 | 1158 static void shrink21(uint8_t *dst, int dst_wrap, |
| 1205 | 1159 const uint8_t *src, int src_wrap, |
| 1160 int width, int height) | |
| 1161 { | |
| 1162 int w; | |
| 1163 const uint8_t *s; | |
| 1164 uint8_t *d; | |
| 1165 | |
| 1166 for(;height > 0; height--) { | |
| 1167 s = src; | |
| 1168 d = dst; | |
| 1169 for(w = width;w > 0; w--) { | |
| 1170 d[0] = (s[0] + s[1]) >> 1; | |
| 1171 s += 2; | |
| 1172 d++; | |
| 1173 } | |
| 1174 src += src_wrap; | |
| 1175 dst += dst_wrap; | |
| 1176 } | |
| 1177 } | |
| 1178 | |
| 1179 /* 1x2 -> 1x1 */ | |
| 2967 | 1180 static void shrink12(uint8_t *dst, int dst_wrap, |
| 1205 | 1181 const uint8_t *src, int src_wrap, |
| 1182 int width, int height) | |
| 1183 { | |
| 1184 int w; | |
| 1185 uint8_t *d; | |
| 1186 const uint8_t *s1, *s2; | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1187 |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1188 for(;height > 0; height--) { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1189 s1 = src; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1190 s2 = s1 + src_wrap; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1191 d = dst; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1192 for(w = width;w >= 4; w-=4) { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1193 d[0] = (s1[0] + s2[0]) >> 1; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1194 d[1] = (s1[1] + s2[1]) >> 1; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1195 d[2] = (s1[2] + s2[2]) >> 1; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1196 d[3] = (s1[3] + s2[3]) >> 1; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1197 s1 += 4; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1198 s2 += 4; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1199 d += 4; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1200 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1201 for(;w > 0; w--) { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1202 d[0] = (s1[0] + s2[0]) >> 1; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1203 s1++; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1204 s2++; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1205 d++; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1206 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1207 src += 2 * src_wrap; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1208 dst += dst_wrap; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1209 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1210 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1211 |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1212 /* 2x2 -> 1x1 */ |
| 3245 | 1213 void ff_shrink22(uint8_t *dst, int dst_wrap, |
| 1205 | 1214 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
|
1215 int width, int height) |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1216 { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1217 int w; |
| 1205 | 1218 const uint8_t *s1, *s2; |
| 1219 uint8_t *d; | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1220 |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1221 for(;height > 0; height--) { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1222 s1 = src; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1223 s2 = s1 + src_wrap; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1224 d = dst; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1225 for(w = width;w >= 4; w-=4) { |
|
1206
fd676abc754c
loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents:
1205
diff
changeset
|
1226 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
|
1227 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
|
1228 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
|
1229 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
|
1230 s1 += 8; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1231 s2 += 8; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1232 d += 4; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1233 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1234 for(;w > 0; w--) { |
|
1206
fd676abc754c
loss fixes (thanks to Daniel Serpell) - shrink22 fix
bellard
parents:
1205
diff
changeset
|
1235 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
|
1236 s1 += 2; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1237 s2 += 2; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1238 d++; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1239 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1240 src += 2 * src_wrap; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1241 dst += dst_wrap; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1242 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1243 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1244 |
| 1205 | 1245 /* 4x4 -> 1x1 */ |
| 3245 | 1246 void ff_shrink44(uint8_t *dst, int dst_wrap, |
| 1205 | 1247 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
|
1248 int width, int height) |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1249 { |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1250 int w; |
| 1205 | 1251 const uint8_t *s1, *s2, *s3, *s4; |
| 1252 uint8_t *d; | |
|
576
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1253 |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1254 for(;height > 0; height--) { |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1255 s1 = src; |
| 1205 | 1256 s2 = s1 + src_wrap; |
| 1257 s3 = s2 + src_wrap; | |
| 1258 s4 = s3 + src_wrap; | |
|
576
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1259 d = dst; |
| 1205 | 1260 for(w = width;w > 0; w--) { |
| 1261 d[0] = (s1[0] + s1[1] + s1[2] + s1[3] + | |
| 1262 s2[0] + s2[1] + s2[2] + s2[3] + | |
| 1263 s3[0] + s3[1] + s3[2] + s3[3] + | |
| 1264 s4[0] + s4[1] + s4[2] + s4[3] + 8) >> 4; | |
| 1265 s1 += 4; | |
| 1266 s2 += 4; | |
| 1267 s3 += 4; | |
| 1268 s4 += 4; | |
|
576
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1269 d++; |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1270 } |
| 1205 | 1271 src += 4 * src_wrap; |
| 1272 dst += dst_wrap; | |
| 1273 } | |
| 1274 } | |
| 1275 | |
| 3245 | 1276 /* 8x8 -> 1x1 */ |
| 1277 void ff_shrink88(uint8_t *dst, int dst_wrap, | |
| 1278 const uint8_t *src, int src_wrap, | |
| 1279 int width, int height) | |
| 1280 { | |
| 1281 int w, i; | |
| 1282 | |
| 1283 for(;height > 0; height--) { | |
| 1284 for(w = width;w > 0; w--) { | |
| 1285 int tmp=0; | |
| 1286 for(i=0; i<8; i++){ | |
| 1287 tmp += src[0] + src[1] + src[2] + src[3] + src[4] + src[5] + src[6] + src[7]; | |
| 1288 src += src_wrap; | |
| 1289 } | |
| 1290 *(dst++) = (tmp + 32)>>6; | |
| 1291 src += 8 - 8*src_wrap; | |
| 1292 } | |
| 1293 src += 8*src_wrap - 8*width; | |
| 1294 dst += dst_wrap - width; | |
| 1295 } | |
| 1296 } | |
| 1297 | |
| 1205 | 1298 static void grow21_line(uint8_t *dst, const uint8_t *src, |
| 1299 int width) | |
| 1300 { | |
| 1301 int w; | |
| 1302 const uint8_t *s1; | |
| 1303 uint8_t *d; | |
| 1304 | |
| 1305 s1 = src; | |
| 1306 d = dst; | |
| 1307 for(w = width;w >= 4; w-=4) { | |
| 1308 d[1] = d[0] = s1[0]; | |
| 1309 d[3] = d[2] = s1[1]; | |
| 1310 s1 += 2; | |
| 1311 d += 4; | |
| 1312 } | |
| 1313 for(;w >= 2; w -= 2) { | |
| 1314 d[1] = d[0] = s1[0]; | |
| 1315 s1 ++; | |
| 1316 d += 2; | |
| 1317 } | |
| 1318 /* only needed if width is not a multiple of two */ | |
| 1319 /* XXX: veryfy that */ | |
| 1320 if (w) { | |
| 1321 d[0] = s1[0]; | |
| 1322 } | |
| 1323 } | |
| 1324 | |
| 1325 static void grow41_line(uint8_t *dst, const uint8_t *src, | |
| 1326 int width) | |
| 1327 { | |
| 1328 int w, v; | |
| 1329 const uint8_t *s1; | |
| 1330 uint8_t *d; | |
| 1331 | |
| 1332 s1 = src; | |
| 1333 d = dst; | |
| 1334 for(w = width;w >= 4; w-=4) { | |
| 1335 v = s1[0]; | |
| 1336 d[0] = v; | |
| 1337 d[1] = v; | |
| 1338 d[2] = v; | |
| 1339 d[3] = v; | |
| 1340 s1 ++; | |
| 1341 d += 4; | |
| 1342 } | |
| 1343 } | |
| 1344 | |
| 1345 /* 1x1 -> 2x1 */ | |
| 1346 static void grow21(uint8_t *dst, int dst_wrap, | |
| 1347 const uint8_t *src, int src_wrap, | |
| 1348 int width, int height) | |
| 1349 { | |
| 1350 for(;height > 0; height--) { | |
| 1351 grow21_line(dst, src, width); | |
| 1352 src += src_wrap; | |
| 1353 dst += dst_wrap; | |
| 1354 } | |
| 1355 } | |
| 1356 | |
| 1357 /* 1x1 -> 2x2 */ | |
| 1358 static void grow22(uint8_t *dst, int dst_wrap, | |
| 1359 const uint8_t *src, int src_wrap, | |
| 1360 int width, int height) | |
| 1361 { | |
| 1362 for(;height > 0; height--) { | |
| 1363 grow21_line(dst, src, width); | |
|
576
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1364 if (height%2) |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1365 src += src_wrap; |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1366 dst += dst_wrap; |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1367 } |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1368 } |
|
9aa5f0d0124e
YUV410P to YUV420P patch by Fran?ois Revol <revol at free dot fr>
michaelni
parents:
440
diff
changeset
|
1369 |
| 1205 | 1370 /* 1x1 -> 4x1 */ |
| 1371 static void grow41(uint8_t *dst, int dst_wrap, | |
| 1372 const uint8_t *src, int src_wrap, | |
| 1373 int width, int height) | |
| 1374 { | |
| 1375 for(;height > 0; height--) { | |
| 1376 grow41_line(dst, src, width); | |
| 1377 src += src_wrap; | |
| 1378 dst += dst_wrap; | |
| 1379 } | |
| 1380 } | |
| 1381 | |
| 1382 /* 1x1 -> 4x4 */ | |
| 1383 static void grow44(uint8_t *dst, int dst_wrap, | |
| 1384 const uint8_t *src, int src_wrap, | |
| 1385 int width, int height) | |
| 1386 { | |
| 1387 for(;height > 0; height--) { | |
| 1388 grow41_line(dst, src, width); | |
| 1389 if ((height & 3) == 1) | |
| 1390 src += src_wrap; | |
| 1391 dst += dst_wrap; | |
| 1392 } | |
| 1393 } | |
| 1394 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1395 /* 1x2 -> 2x1 */ |
| 2967 | 1396 static void conv411(uint8_t *dst, int dst_wrap, |
| 1205 | 1397 const uint8_t *src, int src_wrap, |
|
736
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1398 int width, int height) |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1399 { |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1400 int w, c; |
| 1205 | 1401 const uint8_t *s1, *s2; |
| 1402 uint8_t *d; | |
|
736
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1403 |
| 1166 | 1404 width>>=1; |
| 1405 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1406 for(;height > 0; height--) { |
|
736
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1407 s1 = src; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1408 s2 = src + src_wrap; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1409 d = dst; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1410 for(w = width;w > 0; w--) { |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1411 c = (s1[0] + s2[0]) >> 1; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1412 d[0] = c; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1413 d[1] = c; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1414 s1++; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1415 s2++; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1416 d += 2; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1417 } |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1418 src += src_wrap * 2; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1419 dst += dst_wrap; |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1420 } |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1421 } |
|
918756bffda2
minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents:
583
diff
changeset
|
1422 |
| 1204 | 1423 /* XXX: add jpeg quantize code */ |
| 1424 | |
| 1425 #define TRANSP_INDEX (6*6*6) | |
| 1426 | |
| 1427 /* this is maybe slow, but allows for extensions */ | |
| 1428 static inline unsigned char gif_clut_index(uint8_t r, uint8_t g, uint8_t b) | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1429 { |
| 1204 | 1430 return ((((r)/47)%6)*6*6+(((g)/47)%6)*6+(((b)/47)%6)); |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1431 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1432 |
| 1204 | 1433 static void build_rgb_palette(uint8_t *palette, int has_alpha) |
| 1434 { | |
| 1435 uint32_t *pal; | |
| 1436 static const uint8_t pal_value[6] = { 0x00, 0x33, 0x66, 0x99, 0xcc, 0xff }; | |
| 1437 int i, r, g, b; | |
| 1438 | |
| 1439 pal = (uint32_t *)palette; | |
| 1440 i = 0; | |
| 1441 for(r = 0; r < 6; r++) { | |
| 1442 for(g = 0; g < 6; g++) { | |
| 1443 for(b = 0; b < 6; b++) { | |
| 2967 | 1444 pal[i++] = (0xff << 24) | (pal_value[r] << 16) | |
| 1204 | 1445 (pal_value[g] << 8) | pal_value[b]; |
| 1446 } | |
| 1447 } | |
| 1448 } | |
| 1449 if (has_alpha) | |
| 1450 pal[i++] = 0; | |
| 1451 while (i < 256) | |
| 1452 pal[i++] = 0xff000000; | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1453 } |
| 583 | 1454 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1455 /* copy bit n to bits 0 ... n - 1 */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1456 static inline unsigned int bitcopy_n(unsigned int a, int n) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1457 { |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1458 int mask; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1459 mask = (1 << n) - 1; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1460 return (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1461 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1462 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1463 /* rgb555 handling */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1464 |
| 1204 | 1465 #define RGB_NAME rgb555 |
| 1466 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1467 #define RGB_IN(r, g, b, s)\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1468 {\ |
| 1064 | 1469 unsigned int v = ((const uint16_t *)(s))[0];\ |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1470 r = bitcopy_n(v >> (10 - 3), 3);\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1471 g = bitcopy_n(v >> (5 - 3), 3);\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1472 b = bitcopy_n(v << 3, 3);\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1473 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1474 |
| 1204 | 1475 #define RGBA_IN(r, g, b, a, s)\ |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1476 {\ |
| 1204 | 1477 unsigned int v = ((const uint16_t *)(s))[0];\ |
| 1478 r = bitcopy_n(v >> (10 - 3), 3);\ | |
| 1479 g = bitcopy_n(v >> (5 - 3), 3);\ | |
| 1480 b = bitcopy_n(v << 3, 3);\ | |
| 1209 | 1481 a = (-(v >> 15)) & 0xff;\ |
| 1204 | 1482 } |
| 1483 | |
| 1484 #define RGBA_OUT(d, r, g, b, a)\ | |
| 1485 {\ | |
| 1486 ((uint16_t *)(d))[0] = ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3) | \ | |
| 1487 ((a << 8) & 0x8000);\ | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1488 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1489 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1490 #define BPP 2 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1491 |
| 1204 | 1492 #include "imgconvert_template.h" |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1493 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1494 /* rgb565 handling */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1495 |
| 1204 | 1496 #define RGB_NAME rgb565 |
| 1497 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1498 #define RGB_IN(r, g, b, s)\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1499 {\ |
| 1064 | 1500 unsigned int v = ((const uint16_t *)(s))[0];\ |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1501 r = bitcopy_n(v >> (11 - 3), 3);\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1502 g = bitcopy_n(v >> (5 - 2), 2);\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1503 b = bitcopy_n(v << 3, 3);\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1504 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1505 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1506 #define RGB_OUT(d, r, g, b)\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1507 {\ |
| 1064 | 1508 ((uint16_t *)(d))[0] = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);\ |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1509 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1510 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1511 #define BPP 2 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1512 |
| 1204 | 1513 #include "imgconvert_template.h" |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1514 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1515 /* bgr24 handling */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1516 |
| 1204 | 1517 #define RGB_NAME bgr24 |
| 1518 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1519 #define RGB_IN(r, g, b, s)\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1520 {\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1521 b = (s)[0];\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1522 g = (s)[1];\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1523 r = (s)[2];\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1524 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1525 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1526 #define RGB_OUT(d, r, g, b)\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1527 {\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1528 (d)[0] = b;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1529 (d)[1] = g;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1530 (d)[2] = r;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1531 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1532 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1533 #define BPP 3 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1534 |
| 1204 | 1535 #include "imgconvert_template.h" |
| 583 | 1536 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1537 #undef RGB_IN |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1538 #undef RGB_OUT |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1539 #undef BPP |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1540 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1541 /* rgb24 handling */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1542 |
| 1204 | 1543 #define RGB_NAME rgb24 |
| 1544 #define FMT_RGB24 | |
| 1545 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1546 #define RGB_IN(r, g, b, s)\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1547 {\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1548 r = (s)[0];\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1549 g = (s)[1];\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1550 b = (s)[2];\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1551 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1552 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1553 #define RGB_OUT(d, r, g, b)\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1554 {\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1555 (d)[0] = r;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1556 (d)[1] = g;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1557 (d)[2] = b;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1558 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1559 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1560 #define BPP 3 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1561 |
| 1204 | 1562 #include "imgconvert_template.h" |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1563 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1564 /* rgba32 handling */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1565 |
| 1204 | 1566 #define RGB_NAME rgba32 |
| 1567 #define FMT_RGBA32 | |
| 1568 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1569 #define RGB_IN(r, g, b, s)\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1570 {\ |
| 1064 | 1571 unsigned int v = ((const uint32_t *)(s))[0];\ |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1572 r = (v >> 16) & 0xff;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1573 g = (v >> 8) & 0xff;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1574 b = v & 0xff;\ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1575 } |
| 583 | 1576 |
| 1204 | 1577 #define RGBA_IN(r, g, b, a, s)\ |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1578 {\ |
| 1204 | 1579 unsigned int v = ((const uint32_t *)(s))[0];\ |
| 1580 a = (v >> 24) & 0xff;\ | |
| 1581 r = (v >> 16) & 0xff;\ | |
| 1582 g = (v >> 8) & 0xff;\ | |
| 1583 b = v & 0xff;\ | |
| 1584 } | |
| 1585 | |
| 1586 #define RGBA_OUT(d, r, g, b, a)\ | |
| 1587 {\ | |
| 1588 ((uint32_t *)(d))[0] = (a << 24) | (r << 16) | (g << 8) | b;\ | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1589 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1590 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1591 #define BPP 4 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1592 |
| 1204 | 1593 #include "imgconvert_template.h" |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1594 |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
1595 static void mono_to_gray(AVPicture *dst, const AVPicture *src, |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1596 int width, int height, int xor_mask) |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1597 { |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1598 const unsigned char *p; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1599 unsigned char *q; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1600 int v, dst_wrap, src_wrap; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1601 int y, w; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1602 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1603 p = src->data[0]; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1604 src_wrap = src->linesize[0] - ((width + 7) >> 3); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1605 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1606 q = dst->data[0]; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1607 dst_wrap = dst->linesize[0] - width; |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1608 for(y=0;y<height;y++) { |
| 2967 | 1609 w = width; |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1610 while (w >= 8) { |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1611 v = *p++ ^ xor_mask; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1612 q[0] = -(v >> 7); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1613 q[1] = -((v >> 6) & 1); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1614 q[2] = -((v >> 5) & 1); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1615 q[3] = -((v >> 4) & 1); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1616 q[4] = -((v >> 3) & 1); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1617 q[5] = -((v >> 2) & 1); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1618 q[6] = -((v >> 1) & 1); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1619 q[7] = -((v >> 0) & 1); |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1620 w -= 8; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1621 q += 8; |
| 583 | 1622 } |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1623 if (w > 0) { |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1624 v = *p++ ^ xor_mask; |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1625 do { |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1626 q[0] = -((v >> 7) & 1); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1627 q++; |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1628 v <<= 1; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1629 } while (--w); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1630 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1631 p += src_wrap; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1632 q += dst_wrap; |
| 583 | 1633 } |
| 1634 } | |
| 1635 | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
1636 static void monowhite_to_gray(AVPicture *dst, const AVPicture *src, |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1637 int width, int height) |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1638 { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1639 mono_to_gray(dst, src, width, height, 0xff); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1640 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1641 |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
1642 static void monoblack_to_gray(AVPicture *dst, const AVPicture *src, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1643 int width, int height) |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1644 { |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1645 mono_to_gray(dst, src, width, height, 0x00); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1646 } |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1647 |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
1648 static void gray_to_mono(AVPicture *dst, const AVPicture *src, |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1649 int width, int height, int xor_mask) |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1650 { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1651 int n; |
| 1064 | 1652 const uint8_t *s; |
| 1653 uint8_t *d; | |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1654 int j, b, v, n1, src_wrap, dst_wrap, y; |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1655 |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1656 s = src->data[0]; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1657 src_wrap = src->linesize[0] - width; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1658 |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1659 d = dst->data[0]; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1660 dst_wrap = dst->linesize[0] - ((width + 7) >> 3); |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1661 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1662 for(y=0;y<height;y++) { |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1663 n = width; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1664 while (n >= 8) { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1665 v = 0; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1666 for(j=0;j<8;j++) { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1667 b = s[0]; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1668 s++; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1669 v = (v << 1) | (b >> 7); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1670 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1671 d[0] = v ^ xor_mask; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1672 d++; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1673 n -= 8; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1674 } |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1675 if (n > 0) { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1676 n1 = n; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1677 v = 0; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1678 while (n > 0) { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1679 b = s[0]; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1680 s++; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1681 v = (v << 1) | (b >> 7); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1682 n--; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1683 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1684 d[0] = (v << (8 - (n1 & 7))) ^ xor_mask; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1685 d++; |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1686 } |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1687 s += src_wrap; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1688 d += dst_wrap; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1689 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1690 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1691 |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
1692 static void gray_to_monowhite(AVPicture *dst, const AVPicture *src, |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1693 int width, int height) |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1694 { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1695 gray_to_mono(dst, src, width, height, 0xff); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1696 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1697 |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
1698 static void gray_to_monoblack(AVPicture *dst, const AVPicture *src, |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1699 int width, int height) |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1700 { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1701 gray_to_mono(dst, src, width, height, 0x00); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1702 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1703 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1704 typedef struct ConvertEntry { |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
1705 void (*convert)(AVPicture *dst, |
| 2979 | 1706 const AVPicture *src, int width, int height); |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1707 } ConvertEntry; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1708 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1709 /* Add each new convertion function in this table. In order to be able |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1710 to convert from any format to any format, the following constraints |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1711 must be satisfied: |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1712 |
| 2967 | 1713 - all FF_COLOR_RGB formats must convert to and from PIX_FMT_RGB24 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1714 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1715 - all FF_COLOR_GRAY formats must convert to and from PIX_FMT_GRAY8 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1716 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1717 - all FF_COLOR_RGB formats with alpha must convert to and from PIX_FMT_RGBA32 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1718 |
| 1205 | 1719 - PIX_FMT_YUV444P and PIX_FMT_YUVJ444P must convert to and from |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1720 PIX_FMT_RGB24. |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1721 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1722 - PIX_FMT_422 must convert to and from PIX_FMT_422P. |
| 1205 | 1723 |
| 1724 The other conversion functions are just optimisations for common cases. | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1725 */ |
| 3420 | 1726 static const ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = { |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1727 [PIX_FMT_YUV420P] = { |
|
2326
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
1728 [PIX_FMT_YUV422] = { |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
1729 .convert = yuv420p_to_yuv422, |
|
fe1986d6230f
YUV420P to YUV422 conversion routine by (Danny Laarmans <dlaarmans at androme dot com>)
michael
parents:
2320
diff
changeset
|
1730 }, |
| 2967 | 1731 [PIX_FMT_RGB555] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1732 .convert = yuv420p_to_rgb555 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1733 }, |
| 2967 | 1734 [PIX_FMT_RGB565] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1735 .convert = yuv420p_to_rgb565 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1736 }, |
| 2967 | 1737 [PIX_FMT_BGR24] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1738 .convert = yuv420p_to_bgr24 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1739 }, |
| 2967 | 1740 [PIX_FMT_RGB24] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1741 .convert = yuv420p_to_rgb24 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1742 }, |
| 2967 | 1743 [PIX_FMT_RGBA32] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1744 .convert = yuv420p_to_rgba32 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1745 }, |
| 2979 | 1746 [PIX_FMT_UYVY422] = { |
|
2366
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
1747 .convert = yuv420p_to_uyvy422, |
|
270666128b07
YUV420P to UYVY422 conversion patch by (Luca Abeni <lucabe72 >< email >< it>)
michael
parents:
2326
diff
changeset
|
1748 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1749 }, |
| 2967 | 1750 [PIX_FMT_YUV422P] = { |
| 1751 [PIX_FMT_YUV422] = { | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1752 .convert = yuv422p_to_yuv422, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1753 }, |
| 2967 | 1754 [PIX_FMT_UYVY422] = { |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
1755 .convert = yuv422p_to_uyvy422, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
1756 }, |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1757 }, |
| 2967 | 1758 [PIX_FMT_YUV444P] = { |
| 1759 [PIX_FMT_RGB24] = { | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1760 .convert = yuv444p_to_rgb24 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1761 }, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1762 }, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1763 [PIX_FMT_YUVJ420P] = { |
| 2967 | 1764 [PIX_FMT_RGB555] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1765 .convert = yuvj420p_to_rgb555 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1766 }, |
| 2967 | 1767 [PIX_FMT_RGB565] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1768 .convert = yuvj420p_to_rgb565 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1769 }, |
| 2967 | 1770 [PIX_FMT_BGR24] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1771 .convert = yuvj420p_to_bgr24 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1772 }, |
| 2967 | 1773 [PIX_FMT_RGB24] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1774 .convert = yuvj420p_to_rgb24 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1775 }, |
| 2967 | 1776 [PIX_FMT_RGBA32] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1777 .convert = yuvj420p_to_rgba32 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1778 }, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1779 }, |
| 2967 | 1780 [PIX_FMT_YUVJ444P] = { |
| 1781 [PIX_FMT_RGB24] = { | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1782 .convert = yuvj444p_to_rgb24 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1783 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1784 }, |
| 2967 | 1785 [PIX_FMT_YUV422] = { |
| 1786 [PIX_FMT_YUV420P] = { | |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1787 .convert = yuv422_to_yuv420p, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1788 }, |
| 2967 | 1789 [PIX_FMT_YUV422P] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1790 .convert = yuv422_to_yuv422p, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1791 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1792 }, |
| 2967 | 1793 [PIX_FMT_UYVY422] = { |
| 1794 [PIX_FMT_YUV420P] = { | |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
1795 .convert = uyvy422_to_yuv420p, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
1796 }, |
| 2967 | 1797 [PIX_FMT_YUV422P] = { |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
1798 .convert = uyvy422_to_yuv422p, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
1799 }, |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
1800 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1801 [PIX_FMT_RGB24] = { |
| 2967 | 1802 [PIX_FMT_YUV420P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1803 .convert = rgb24_to_yuv420p |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1804 }, |
| 2967 | 1805 [PIX_FMT_RGB565] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1806 .convert = rgb24_to_rgb565 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1807 }, |
| 2967 | 1808 [PIX_FMT_RGB555] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1809 .convert = rgb24_to_rgb555 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1810 }, |
| 2967 | 1811 [PIX_FMT_RGBA32] = { |
| 1204 | 1812 .convert = rgb24_to_rgba32 |
| 1813 }, | |
| 2967 | 1814 [PIX_FMT_BGR24] = { |
| 1204 | 1815 .convert = rgb24_to_bgr24 |
| 1816 }, | |
| 2967 | 1817 [PIX_FMT_GRAY8] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1818 .convert = rgb24_to_gray |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1819 }, |
| 1204 | 1820 [PIX_FMT_PAL8] = { |
| 1055 | 1821 .convert = rgb24_to_pal8 |
| 1822 }, | |
| 2967 | 1823 [PIX_FMT_YUV444P] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1824 .convert = rgb24_to_yuv444p |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1825 }, |
| 2967 | 1826 [PIX_FMT_YUVJ420P] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1827 .convert = rgb24_to_yuvj420p |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1828 }, |
| 2967 | 1829 [PIX_FMT_YUVJ444P] = { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1830 .convert = rgb24_to_yuvj444p |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1831 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1832 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1833 [PIX_FMT_RGBA32] = { |
| 2967 | 1834 [PIX_FMT_RGB24] = { |
| 1204 | 1835 .convert = rgba32_to_rgb24 |
| 1836 }, | |
| 2967 | 1837 [PIX_FMT_RGB555] = { |
| 1204 | 1838 .convert = rgba32_to_rgb555 |
| 1839 }, | |
| 2967 | 1840 [PIX_FMT_PAL8] = { |
| 1204 | 1841 .convert = rgba32_to_pal8 |
| 1842 }, | |
| 2967 | 1843 [PIX_FMT_YUV420P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1844 .convert = rgba32_to_yuv420p |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1845 }, |
| 2967 | 1846 [PIX_FMT_GRAY8] = { |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1847 .convert = rgba32_to_gray |
|
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1848 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1849 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1850 [PIX_FMT_BGR24] = { |
| 2967 | 1851 [PIX_FMT_RGB24] = { |
| 1204 | 1852 .convert = bgr24_to_rgb24 |
| 1853 }, | |
| 2967 | 1854 [PIX_FMT_YUV420P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1855 .convert = bgr24_to_yuv420p |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1856 }, |
| 2967 | 1857 [PIX_FMT_GRAY8] = { |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1858 .convert = bgr24_to_gray |
|
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1859 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1860 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1861 [PIX_FMT_RGB555] = { |
| 2967 | 1862 [PIX_FMT_RGB24] = { |
| 1204 | 1863 .convert = rgb555_to_rgb24 |
| 1864 }, | |
| 2967 | 1865 [PIX_FMT_RGBA32] = { |
| 1204 | 1866 .convert = rgb555_to_rgba32 |
| 1867 }, | |
| 2967 | 1868 [PIX_FMT_YUV420P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1869 .convert = rgb555_to_yuv420p |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1870 }, |
| 2967 | 1871 [PIX_FMT_GRAY8] = { |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1872 .convert = rgb555_to_gray |
|
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1873 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1874 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1875 [PIX_FMT_RGB565] = { |
| 2967 | 1876 [PIX_FMT_RGB24] = { |
| 1204 | 1877 .convert = rgb565_to_rgb24 |
| 1878 }, | |
| 2967 | 1879 [PIX_FMT_YUV420P] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1880 .convert = rgb565_to_yuv420p |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1881 }, |
| 2967 | 1882 [PIX_FMT_GRAY8] = { |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1883 .convert = rgb565_to_gray |
|
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1884 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1885 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1886 [PIX_FMT_GRAY8] = { |
| 2967 | 1887 [PIX_FMT_RGB555] = { |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1888 .convert = gray_to_rgb555 |
|
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1889 }, |
| 2967 | 1890 [PIX_FMT_RGB565] = { |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1891 .convert = gray_to_rgb565 |
|
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1892 }, |
| 2967 | 1893 [PIX_FMT_RGB24] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1894 .convert = gray_to_rgb24 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1895 }, |
| 2967 | 1896 [PIX_FMT_BGR24] = { |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1897 .convert = gray_to_bgr24 |
|
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1898 }, |
| 2967 | 1899 [PIX_FMT_RGBA32] = { |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1900 .convert = gray_to_rgba32 |
|
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
1901 }, |
| 2967 | 1902 [PIX_FMT_MONOWHITE] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1903 .convert = gray_to_monowhite |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1904 }, |
| 2967 | 1905 [PIX_FMT_MONOBLACK] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1906 .convert = gray_to_monoblack |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
1907 }, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1908 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1909 [PIX_FMT_MONOWHITE] = { |
| 2967 | 1910 [PIX_FMT_GRAY8] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1911 .convert = monowhite_to_gray |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1912 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1913 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1914 [PIX_FMT_MONOBLACK] = { |
| 2967 | 1915 [PIX_FMT_GRAY8] = { |
|
1014
48349e11c9b2
C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (M?ns Rullg?rd))
michaelni
parents:
993
diff
changeset
|
1916 .convert = monoblack_to_gray |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1917 }, |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1918 }, |
| 1055 | 1919 [PIX_FMT_PAL8] = { |
| 2967 | 1920 [PIX_FMT_RGB555] = { |
| 1055 | 1921 .convert = pal8_to_rgb555 |
| 1922 }, | |
| 2967 | 1923 [PIX_FMT_RGB565] = { |
| 1055 | 1924 .convert = pal8_to_rgb565 |
| 1925 }, | |
| 2967 | 1926 [PIX_FMT_BGR24] = { |
| 1055 | 1927 .convert = pal8_to_bgr24 |
| 1928 }, | |
| 2967 | 1929 [PIX_FMT_RGB24] = { |
| 1055 | 1930 .convert = pal8_to_rgb24 |
| 1931 }, | |
| 2967 | 1932 [PIX_FMT_RGBA32] = { |
| 1055 | 1933 .convert = pal8_to_rgba32 |
| 1934 }, | |
| 1935 }, | |
| 2967 | 1936 [PIX_FMT_UYVY411] = { |
| 1937 [PIX_FMT_YUV411P] = { | |
| 2309 | 1938 .convert = uyvy411_to_yuv411p, |
| 1939 }, | |
| 1940 }, | |
| 1941 | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1942 }; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1943 |
| 1508 | 1944 int avpicture_alloc(AVPicture *picture, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1945 int pix_fmt, int width, int height) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1946 { |
|
3266
3b785e80ce3e
make "size" variable in avpicture_alloc signed, since avpicture_get_size
reimar
parents:
3257
diff
changeset
|
1947 int size; |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1948 void *ptr; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1949 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1950 size = avpicture_get_size(pix_fmt, width, height); |
| 2422 | 1951 if(size<0) |
| 1952 goto fail; | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1953 ptr = av_malloc(size); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1954 if (!ptr) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1955 goto fail; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1956 avpicture_fill(picture, ptr, pix_fmt, width, height); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1957 return 0; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1958 fail: |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1959 memset(picture, 0, sizeof(AVPicture)); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1960 return -1; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1961 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1962 |
| 1508 | 1963 void avpicture_free(AVPicture *picture) |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
1964 { |
|
1031
19de1445beb2
use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents:
1028
diff
changeset
|
1965 av_free(picture->data[0]); |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1966 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
1967 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1968 /* return true if yuv planar */ |
| 3420 | 1969 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
|
1970 { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1971 return (ps->color_type == FF_COLOR_YUV || |
| 2967 | 1972 ps->color_type == FF_COLOR_YUV_JPEG) && |
| 1204 | 1973 ps->pixel_type == FF_PIXEL_PLANAR; |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1974 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
1975 |
| 3179 | 1976 /** |
| 1977 * Crop image top and left side | |
| 1978 */ | |
| 1979 int img_crop(AVPicture *dst, const AVPicture *src, | |
| 1980 int pix_fmt, int top_band, int left_band) | |
| 1981 { | |
| 1982 int y_shift; | |
| 1983 int x_shift; | |
| 1984 | |
| 1985 if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB || !is_yuv_planar(&pix_fmt_info[pix_fmt])) | |
| 1986 return -1; | |
| 1987 | |
| 1988 y_shift = pix_fmt_info[pix_fmt].y_chroma_shift; | |
| 1989 x_shift = pix_fmt_info[pix_fmt].x_chroma_shift; | |
| 1990 | |
| 1991 dst->data[0] = src->data[0] + (top_band * src->linesize[0]) + left_band; | |
| 1992 dst->data[1] = src->data[1] + ((top_band >> y_shift) * src->linesize[1]) + (left_band >> x_shift); | |
| 1993 dst->data[2] = src->data[2] + ((top_band >> y_shift) * src->linesize[2]) + (left_band >> x_shift); | |
| 1994 | |
| 1995 dst->linesize[0] = src->linesize[0]; | |
| 1996 dst->linesize[1] = src->linesize[1]; | |
| 1997 dst->linesize[2] = src->linesize[2]; | |
| 1998 return 0; | |
| 1999 } | |
| 2000 | |
|
3257
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2001 /** |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2002 * Pad image |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2003 */ |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2004 int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2005 int padtop, int padbottom, int padleft, int padright, int *color) |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2006 { |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2007 uint8_t *optr, *iptr; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2008 int y_shift; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2009 int x_shift; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2010 int yheight; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2011 int i, y; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2012 |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2013 if (pix_fmt < 0 || pix_fmt >= PIX_FMT_NB || !is_yuv_planar(&pix_fmt_info[pix_fmt])) |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2014 return -1; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2015 |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2016 for (i = 0; i < 3; i++) { |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2017 x_shift = i ? pix_fmt_info[pix_fmt].x_chroma_shift : 0; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2018 y_shift = i ? pix_fmt_info[pix_fmt].y_chroma_shift : 0; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2019 |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2020 if (padtop || padleft) { |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2021 memset(dst->data[i], color[i], dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift)); |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2022 } |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2023 |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2024 if (padleft || padright || src) { |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2025 if (src) { /* first line */ |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2026 iptr = src->data[i]; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2027 optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) + (padleft >> x_shift); |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2028 memcpy(optr, iptr, src->linesize[i]); |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2029 iptr += src->linesize[i]; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2030 } |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2031 optr = dst->data[i] + dst->linesize[i] * (padtop >> y_shift) + (dst->linesize[i] - (padright >> x_shift)); |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2032 yheight = (height - 1 - (padtop + padbottom)) >> y_shift; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2033 for (y = 0; y < yheight; y++) { |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2034 memset(optr, color[i], (padleft + padright) >> x_shift); |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2035 if (src) { |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2036 memcpy(optr + ((padleft + padright) >> x_shift), iptr, src->linesize[i]); |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2037 iptr += src->linesize[i]; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2038 } |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2039 optr += dst->linesize[i]; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2040 } |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2041 } |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2042 |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2043 if (padbottom || padright) { |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2044 optr = dst->data[i] + dst->linesize[i] * ((height - padbottom) >> y_shift) - (padright >> x_shift); |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2045 memset(optr, color[i], dst->linesize[i] * (padbottom >> y_shift) + (padright >> x_shift)); |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2046 } |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2047 } |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2048 return 0; |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2049 } |
|
63f61b09dcee
Baptiste COUDURIER's padding patch (reworked by me a little bit).
lucabe
parents:
3245
diff
changeset
|
2050 |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2051 /* XXX: always use linesize. Return -1 if not supported */ |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2052 int img_convert(AVPicture *dst, int dst_pix_fmt, |
| 2967 | 2053 const AVPicture *src, int src_pix_fmt, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2054 int src_width, int src_height) |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2055 { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2056 static int inited; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2057 int i, ret, dst_width, dst_height, int_pix_fmt; |
| 3420 | 2058 const PixFmtInfo *src_pix, *dst_pix; |
| 2059 const ConvertEntry *ce; | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2060 AVPicture tmp1, *tmp = &tmp1; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2061 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2062 if (src_pix_fmt < 0 || src_pix_fmt >= PIX_FMT_NB || |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2063 dst_pix_fmt < 0 || dst_pix_fmt >= PIX_FMT_NB) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2064 return -1; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2065 if (src_width <= 0 || src_height <= 0) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2066 return 0; |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
2067 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2068 if (!inited) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2069 inited = 1; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2070 img_convert_init(); |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2071 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2072 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2073 dst_width = src_width; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2074 dst_height = src_height; |
|
1022
d651df667898
added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents:
1020
diff
changeset
|
2075 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2076 dst_pix = &pix_fmt_info[dst_pix_fmt]; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2077 src_pix = &pix_fmt_info[src_pix_fmt]; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2078 if (src_pix_fmt == dst_pix_fmt) { |
| 1204 | 2079 /* no conversion needed: just copy */ |
| 2080 img_copy(dst, src, dst_pix_fmt, dst_width, dst_height); | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2081 return 0; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2082 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2083 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2084 ce = &convert_table[src_pix_fmt][dst_pix_fmt]; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2085 if (ce->convert) { |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
2086 /* specific conversion routine */ |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2087 ce->convert(dst, src, dst_width, dst_height); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2088 return 0; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2089 } |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2090 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2091 /* gray to YUV */ |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2092 if (is_yuv_planar(dst_pix) && |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2093 src_pix_fmt == PIX_FMT_GRAY8) { |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2094 int w, h, y; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2095 uint8_t *d; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2096 |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2097 if (dst_pix->color_type == FF_COLOR_YUV_JPEG) { |
| 3245 | 2098 ff_img_copy_plane(dst->data[0], dst->linesize[0], |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2099 src->data[0], src->linesize[0], |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2100 dst_width, dst_height); |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2101 } else { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2102 img_apply_table(dst->data[0], dst->linesize[0], |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2103 src->data[0], src->linesize[0], |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2104 dst_width, dst_height, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2105 y_jpeg_to_ccir); |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2106 } |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2107 /* fill U and V with 128 */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2108 w = dst_width; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2109 h = dst_height; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2110 w >>= dst_pix->x_chroma_shift; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2111 h >>= dst_pix->y_chroma_shift; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2112 for(i = 1; i <= 2; i++) { |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2113 d = dst->data[i]; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2114 for(y = 0; y< h; y++) { |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2115 memset(d, 128, w); |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2116 d += dst->linesize[i]; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2117 } |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2118 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2119 return 0; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2120 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2121 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2122 /* YUV to gray */ |
| 2967 | 2123 if (is_yuv_planar(src_pix) && |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2124 dst_pix_fmt == PIX_FMT_GRAY8) { |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2125 if (src_pix->color_type == FF_COLOR_YUV_JPEG) { |
| 3245 | 2126 ff_img_copy_plane(dst->data[0], dst->linesize[0], |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2127 src->data[0], src->linesize[0], |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2128 dst_width, dst_height); |
|
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2129 } else { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2130 img_apply_table(dst->data[0], dst->linesize[0], |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2131 src->data[0], src->linesize[0], |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2132 dst_width, dst_height, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2133 y_ccir_to_jpeg); |
|
1202
8b49a7ee4e4e
YUV formats/gray formats are correctly defined - added format loss information - preliminary JPEG YUV formats support
bellard
parents:
1199
diff
changeset
|
2134 } |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2135 return 0; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2136 } |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2137 |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2138 /* YUV to YUV planar */ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2139 if (is_yuv_planar(dst_pix) && is_yuv_planar(src_pix)) { |
| 1205 | 2140 int x_shift, y_shift, w, h, xy_shift; |
| 2967 | 2141 void (*resize_func)(uint8_t *dst, int dst_wrap, |
| 1205 | 2142 const uint8_t *src, int src_wrap, |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2143 int width, int height); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2144 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2145 /* compute chroma size of the smallest dimensions */ |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2146 w = dst_width; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2147 h = dst_height; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2148 if (dst_pix->x_chroma_shift >= src_pix->x_chroma_shift) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2149 w >>= dst_pix->x_chroma_shift; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2150 else |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2151 w >>= src_pix->x_chroma_shift; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2152 if (dst_pix->y_chroma_shift >= src_pix->y_chroma_shift) |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2153 h >>= dst_pix->y_chroma_shift; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2154 else |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2155 h >>= src_pix->y_chroma_shift; |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2156 |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2157 x_shift = (dst_pix->x_chroma_shift - src_pix->x_chroma_shift); |
|
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2158 y_shift = (dst_pix->y_chroma_shift - src_pix->y_chroma_shift); |
| 1205 | 2159 xy_shift = ((x_shift & 0xf) << 4) | (y_shift & 0xf); |
| 2160 /* there must be filters for conversion at least from and to | |
| 2161 YUV444 format */ | |
| 2162 switch(xy_shift) { | |
| 2163 case 0x00: | |
| 3245 | 2164 resize_func = ff_img_copy_plane; |
| 1205 | 2165 break; |
| 2166 case 0x10: | |
| 2167 resize_func = shrink21; | |
| 2168 break; | |
| 2169 case 0x20: | |
| 2170 resize_func = shrink41; | |
| 2171 break; | |
| 2172 case 0x01: | |
| 2173 resize_func = shrink12; | |
| 2174 break; | |
| 2175 case 0x11: | |
| 3245 | 2176 resize_func = ff_shrink22; |
| 1205 | 2177 break; |
| 2178 case 0x22: | |
| 3245 | 2179 resize_func = ff_shrink44; |
| 1205 | 2180 break; |
| 2181 case 0xf0: | |
| 2182 resize_func = grow21; | |
| 2183 break; | |
| 2184 case 0xe0: | |
| 2185 resize_func = grow41; | |
| 2186 break; | |
| 2187 case 0xff: | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2188 resize_func = grow22; |
| 1205 | 2189 break; |
| 2190 case 0xee: | |
| 2191 resize_func = grow44; | |
| 2192 break; | |
| 2193 case 0xf1: | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2194 resize_func = conv411; |
| 1205 | 2195 break; |
| 2196 default: | |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2197 /* currently not handled */ |
| 1205 | 2198 goto no_chroma_filter; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2199 } |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2200 |
| 3245 | 2201 ff_img_copy_plane(dst->data[0], dst->linesize[0], |
| 1204 | 2202 src->data[0], src->linesize[0], |
| 2203 dst_width, dst_height); | |
|
1023
e61be5796027
img_convert() (YUV to YUV) patch by (Max Krasnyansky <maxk at qualcomm dot com>)
michaelni
parents:
1022
diff
changeset
|
2204 |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2205 for(i = 1;i <= 2; i++) |
|
1023
e61be5796027
img_convert() (YUV to YUV) patch by (Max Krasnyansky <maxk at qualcomm dot com>)
michaelni
parents:
1022
diff
changeset
|
2206 resize_func(dst->data[i], dst->linesize[i], |
|
e61be5796027
img_convert() (YUV to YUV) patch by (Max Krasnyansky <maxk at qualcomm dot com>)
michaelni
parents:
1022
diff
changeset
|
2207 src->data[i], src->linesize[i], |
| 1073 | 2208 dst_width>>dst_pix->x_chroma_shift, dst_height>>dst_pix->y_chroma_shift); |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2209 /* if yuv color space conversion is needed, we do it here on |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2210 the destination image */ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2211 if (dst_pix->color_type != src_pix->color_type) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2212 const uint8_t *y_table, *c_table; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2213 if (dst_pix->color_type == FF_COLOR_YUV) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2214 y_table = y_jpeg_to_ccir; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2215 c_table = c_jpeg_to_ccir; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2216 } else { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2217 y_table = y_ccir_to_jpeg; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2218 c_table = c_ccir_to_jpeg; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2219 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2220 img_apply_table(dst->data[0], dst->linesize[0], |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2221 dst->data[0], dst->linesize[0], |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2222 dst_width, dst_height, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2223 y_table); |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2224 |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2225 for(i = 1;i <= 2; i++) |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2226 img_apply_table(dst->data[i], dst->linesize[i], |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2227 dst->data[i], dst->linesize[i], |
| 2967 | 2228 dst_width>>dst_pix->x_chroma_shift, |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2229 dst_height>>dst_pix->y_chroma_shift, |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2230 c_table); |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2231 } |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2232 return 0; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2233 } |
| 1205 | 2234 no_chroma_filter: |
|
989
fe9083c56733
simplified code (need automatic testing) - added primitive new format support.
bellard
parents:
940
diff
changeset
|
2235 |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2236 /* try to use an intermediate format */ |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2237 if (src_pix_fmt == PIX_FMT_YUV422 || |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2238 dst_pix_fmt == PIX_FMT_YUV422) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2239 /* specific case: convert to YUV422P first */ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2240 int_pix_fmt = PIX_FMT_YUV422P; |
|
2137
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
2241 } else if (src_pix_fmt == PIX_FMT_UYVY422 || |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
2242 dst_pix_fmt == PIX_FMT_UYVY422) { |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
2243 /* specific case: convert to YUV422P first */ |
|
ef47c0b1ff28
UYVY support patch by ("Todd.Kirby" <doubleshot at pacbell dot net>)
michael
parents:
1593
diff
changeset
|
2244 int_pix_fmt = PIX_FMT_YUV422P; |
| 2309 | 2245 } else if (src_pix_fmt == PIX_FMT_UYVY411 || |
| 2246 dst_pix_fmt == PIX_FMT_UYVY411) { | |
| 2247 /* specific case: convert to YUV411P first */ | |
| 2248 int_pix_fmt = PIX_FMT_YUV411P; | |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2249 } else if ((src_pix->color_type == FF_COLOR_GRAY && |
| 2967 | 2250 src_pix_fmt != PIX_FMT_GRAY8) || |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2251 (dst_pix->color_type == FF_COLOR_GRAY && |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2252 dst_pix_fmt != PIX_FMT_GRAY8)) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2253 /* gray8 is the normalized format */ |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2254 int_pix_fmt = PIX_FMT_GRAY8; |
| 2967 | 2255 } else if ((is_yuv_planar(src_pix) && |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2256 src_pix_fmt != PIX_FMT_YUV444P && |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2257 src_pix_fmt != PIX_FMT_YUVJ444P)) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2258 /* yuv444 is the normalized format */ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2259 if (src_pix->color_type == FF_COLOR_YUV_JPEG) |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2260 int_pix_fmt = PIX_FMT_YUVJ444P; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2261 else |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2262 int_pix_fmt = PIX_FMT_YUV444P; |
| 2967 | 2263 } else if ((is_yuv_planar(dst_pix) && |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2264 dst_pix_fmt != PIX_FMT_YUV444P && |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2265 dst_pix_fmt != PIX_FMT_YUVJ444P)) { |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2266 /* yuv444 is the normalized format */ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2267 if (dst_pix->color_type == FF_COLOR_YUV_JPEG) |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2268 int_pix_fmt = PIX_FMT_YUVJ444P; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2269 else |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2270 int_pix_fmt = PIX_FMT_YUV444P; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2271 } else { |
|
1203
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2272 /* the two formats are rgb or gray8 or yuv[j]444p */ |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2273 if (src_pix->is_alpha && dst_pix->is_alpha) |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2274 int_pix_fmt = PIX_FMT_RGBA32; |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2275 else |
|
80c73b9b0ba2
accurate YUV to RGB and RGB to YUV conversions - added comments
bellard
parents:
1202
diff
changeset
|
2276 int_pix_fmt = PIX_FMT_RGB24; |
|
993
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2277 } |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2278 if (avpicture_alloc(tmp, int_pix_fmt, dst_width, dst_height) < 0) |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2279 return -1; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2280 ret = -1; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2281 if (img_convert(tmp, int_pix_fmt, |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2282 src, src_pix_fmt, src_width, src_height) < 0) |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2283 goto fail1; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2284 if (img_convert(dst, dst_pix_fmt, |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2285 tmp, int_pix_fmt, dst_width, dst_height) < 0) |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2286 goto fail1; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2287 ret = 0; |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2288 fail1: |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2289 avpicture_free(tmp); |
|
895d3b01c6f4
added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents:
989
diff
changeset
|
2290 return ret; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2291 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2292 |
| 1208 | 2293 /* 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
|
2294 static int get_alpha_info_pal8(const AVPicture *src, int width, int height) |
| 1208 | 2295 { |
| 2296 const unsigned char *p; | |
| 2297 int src_wrap, ret, x, y; | |
| 2298 unsigned int a; | |
| 2299 uint32_t *palette = (uint32_t *)src->data[1]; | |
| 2967 | 2300 |
| 1208 | 2301 p = src->data[0]; |
| 2302 src_wrap = src->linesize[0] - width; | |
| 2303 ret = 0; | |
| 2304 for(y=0;y<height;y++) { | |
| 2305 for(x=0;x<width;x++) { | |
| 2306 a = palette[p[0]] >> 24; | |
| 2307 if (a == 0x00) { | |
| 2308 ret |= FF_ALPHA_TRANSP; | |
| 2309 } else if (a != 0xff) { | |
| 2310 ret |= FF_ALPHA_SEMI_TRANSP; | |
| 2311 } | |
| 2312 p++; | |
| 2313 } | |
| 2314 p += src_wrap; | |
| 2315 } | |
| 2316 return ret; | |
| 2317 } | |
| 2318 | |
| 2319 /** | |
| 2320 * Tell if an image really has transparent alpha values. | |
| 2321 * @return ored mask of FF_ALPHA_xxx constants | |
| 2322 */ | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
2323 int img_get_alpha_info(const AVPicture *src, |
| 2979 | 2324 int pix_fmt, int width, int height) |
| 1208 | 2325 { |
| 3420 | 2326 const PixFmtInfo *pf = &pix_fmt_info[pix_fmt]; |
| 1208 | 2327 int ret; |
| 2328 | |
| 2329 pf = &pix_fmt_info[pix_fmt]; | |
| 2330 /* no alpha can be represented in format */ | |
| 2331 if (!pf->is_alpha) | |
| 2332 return 0; | |
| 2333 switch(pix_fmt) { | |
| 2334 case PIX_FMT_RGBA32: | |
| 2335 ret = get_alpha_info_rgba32(src, width, height); | |
| 2336 break; | |
| 2337 case PIX_FMT_RGB555: | |
| 2338 ret = get_alpha_info_rgb555(src, width, height); | |
| 2339 break; | |
| 2340 case PIX_FMT_PAL8: | |
| 2341 ret = get_alpha_info_pal8(src, width, height); | |
| 2342 break; | |
| 2343 default: | |
| 2344 /* we do not know, so everything is indicated */ | |
| 2345 ret = FF_ALPHA_TRANSP | FF_ALPHA_SEMI_TRANSP; | |
| 2346 break; | |
| 2347 } | |
| 2348 return ret; | |
| 2349 } | |
| 801 | 2350 |
| 2351 #ifdef HAVE_MMX | |
| 2352 #define DEINT_INPLACE_LINE_LUM \ | |
| 2353 movd_m2r(lum_m4[0],mm0);\ | |
| 2354 movd_m2r(lum_m3[0],mm1);\ | |
| 2355 movd_m2r(lum_m2[0],mm2);\ | |
| 2356 movd_m2r(lum_m1[0],mm3);\ | |
| 2357 movd_m2r(lum[0],mm4);\ | |
| 2358 punpcklbw_r2r(mm7,mm0);\ | |
| 2359 movd_r2m(mm2,lum_m4[0]);\ | |
| 2360 punpcklbw_r2r(mm7,mm1);\ | |
| 2361 punpcklbw_r2r(mm7,mm2);\ | |
| 2362 punpcklbw_r2r(mm7,mm3);\ | |
| 2363 punpcklbw_r2r(mm7,mm4);\ | |
| 2364 paddw_r2r(mm3,mm1);\ | |
| 2365 psllw_i2r(1,mm2);\ | |
| 2366 paddw_r2r(mm4,mm0);\ | |
| 2367 psllw_i2r(2,mm1);\ | |
| 2368 paddw_r2r(mm6,mm2);\ | |
| 2369 paddw_r2r(mm2,mm1);\ | |
| 2370 psubusw_r2r(mm0,mm1);\ | |
| 2371 psrlw_i2r(3,mm1);\ | |
| 2372 packuswb_r2r(mm7,mm1);\ | |
| 2373 movd_r2m(mm1,lum_m2[0]); | |
| 2374 | |
| 2375 #define DEINT_LINE_LUM \ | |
| 2376 movd_m2r(lum_m4[0],mm0);\ | |
| 2377 movd_m2r(lum_m3[0],mm1);\ | |
| 2378 movd_m2r(lum_m2[0],mm2);\ | |
| 2379 movd_m2r(lum_m1[0],mm3);\ | |
| 2380 movd_m2r(lum[0],mm4);\ | |
| 2381 punpcklbw_r2r(mm7,mm0);\ | |
| 2382 punpcklbw_r2r(mm7,mm1);\ | |
| 2383 punpcklbw_r2r(mm7,mm2);\ | |
| 2384 punpcklbw_r2r(mm7,mm3);\ | |
| 2385 punpcklbw_r2r(mm7,mm4);\ | |
| 2386 paddw_r2r(mm3,mm1);\ | |
| 2387 psllw_i2r(1,mm2);\ | |
| 2388 paddw_r2r(mm4,mm0);\ | |
| 2389 psllw_i2r(2,mm1);\ | |
| 2390 paddw_r2r(mm6,mm2);\ | |
| 2391 paddw_r2r(mm2,mm1);\ | |
| 2392 psubusw_r2r(mm0,mm1);\ | |
| 2393 psrlw_i2r(3,mm1);\ | |
| 2394 packuswb_r2r(mm7,mm1);\ | |
| 2395 movd_r2m(mm1,dst[0]); | |
| 2396 #endif | |
| 2397 | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2398 /* filter parameters: [-1 4 2 4 -1] // 8 */ |
| 2967 | 2399 static void deinterlace_line(uint8_t *dst, |
| 2979 | 2400 const uint8_t *lum_m4, const uint8_t *lum_m3, |
| 2401 const uint8_t *lum_m2, const uint8_t *lum_m1, | |
| 2402 const uint8_t *lum, | |
| 2403 int size) | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2404 { |
| 801 | 2405 #ifndef HAVE_MMX |
| 1064 | 2406 uint8_t *cm = cropTbl + MAX_NEG_CROP; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2407 int sum; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2408 |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2409 for(;size > 0;size--) { |
| 801 | 2410 sum = -lum_m4[0]; |
| 2411 sum += lum_m3[0] << 2; | |
| 2412 sum += lum_m2[0] << 1; | |
| 2413 sum += lum_m1[0] << 2; | |
| 2414 sum += -lum[0]; | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2415 dst[0] = cm[(sum + 4) >> 3]; |
| 801 | 2416 lum_m4++; |
| 2417 lum_m3++; | |
| 2418 lum_m2++; | |
| 2419 lum_m1++; | |
| 2420 lum++; | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2421 dst++; |
| 801 | 2422 } |
| 2423 #else | |
| 2424 | |
| 1044 | 2425 { |
| 2426 mmx_t rounder; | |
| 2427 rounder.uw[0]=4; | |
| 2428 rounder.uw[1]=4; | |
| 2429 rounder.uw[2]=4; | |
| 2430 rounder.uw[3]=4; | |
| 2431 pxor_r2r(mm7,mm7); | |
| 2432 movq_m2r(rounder,mm6); | |
| 2433 } | |
| 801 | 2434 for (;size > 3; size-=4) { |
| 2435 DEINT_LINE_LUM | |
| 2436 lum_m4+=4; | |
| 2437 lum_m3+=4; | |
| 2438 lum_m2+=4; | |
| 2439 lum_m1+=4; | |
| 2440 lum+=4; | |
| 2441 dst+=4; | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2442 } |
| 801 | 2443 #endif |
| 2444 } | |
| 1064 | 2445 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 | 2446 int size) |
| 2447 { | |
| 2448 #ifndef HAVE_MMX | |
| 1064 | 2449 uint8_t *cm = cropTbl + MAX_NEG_CROP; |
| 801 | 2450 int sum; |
| 2451 | |
| 2452 for(;size > 0;size--) { | |
| 2453 sum = -lum_m4[0]; | |
| 2454 sum += lum_m3[0] << 2; | |
| 2455 sum += lum_m2[0] << 1; | |
| 2456 lum_m4[0]=lum_m2[0]; | |
| 2457 sum += lum_m1[0] << 2; | |
| 2458 sum += -lum[0]; | |
| 2459 lum_m2[0] = cm[(sum + 4) >> 3]; | |
| 2460 lum_m4++; | |
| 2461 lum_m3++; | |
| 2462 lum_m2++; | |
| 2463 lum_m1++; | |
| 2464 lum++; | |
| 2465 } | |
| 2466 #else | |
| 2467 | |
| 1044 | 2468 { |
| 2469 mmx_t rounder; | |
| 2470 rounder.uw[0]=4; | |
| 2471 rounder.uw[1]=4; | |
| 2472 rounder.uw[2]=4; | |
| 2473 rounder.uw[3]=4; | |
| 2474 pxor_r2r(mm7,mm7); | |
| 2475 movq_m2r(rounder,mm6); | |
| 2476 } | |
| 801 | 2477 for (;size > 3; size-=4) { |
| 2478 DEINT_INPLACE_LINE_LUM | |
| 2479 lum_m4+=4; | |
| 2480 lum_m3+=4; | |
| 2481 lum_m2+=4; | |
| 2482 lum_m1+=4; | |
| 2483 lum+=4; | |
| 2484 } | |
| 2485 #endif | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2486 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2487 |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2488 /* 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
|
2489 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
|
2490 against the top field. */ |
| 1064 | 2491 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
|
2492 const uint8_t *src1, int src_wrap, |
| 801 | 2493 int width, int height) |
| 2494 { | |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
2495 const uint8_t *src_m2, *src_m1, *src_0, *src_p1, *src_p2; |
| 801 | 2496 int y; |
| 2497 | |
| 2498 src_m2 = src1; | |
| 2499 src_m1 = src1; | |
| 2500 src_0=&src_m1[src_wrap]; | |
| 2501 src_p1=&src_0[src_wrap]; | |
| 2502 src_p2=&src_p1[src_wrap]; | |
| 2503 for(y=0;y<(height-2);y+=2) { | |
| 2504 memcpy(dst,src_m1,width); | |
| 2505 dst += dst_wrap; | |
| 2506 deinterlace_line(dst,src_m2,src_m1,src_0,src_p1,src_p2,width); | |
| 2507 src_m2 = src_0; | |
| 2508 src_m1 = src_p1; | |
| 2509 src_0 = src_p2; | |
| 2510 src_p1 += 2*src_wrap; | |
| 2511 src_p2 += 2*src_wrap; | |
| 2512 dst += dst_wrap; | |
| 2513 } | |
| 2514 memcpy(dst,src_m1,width); | |
| 2515 dst += dst_wrap; | |
| 2516 /* do last line */ | |
| 2517 deinterlace_line(dst,src_m2,src_m1,src_0,src_0,src_0,width); | |
| 2518 } | |
| 2519 | |
| 1064 | 2520 static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap, |
| 2979 | 2521 int width, int height) |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2522 { |
| 1064 | 2523 uint8_t *src_m1, *src_0, *src_p1, *src_p2; |
| 801 | 2524 int y; |
| 1064 | 2525 uint8_t *buf; |
| 2526 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
|
2527 |
| 801 | 2528 src_m1 = src1; |
| 2529 memcpy(buf,src_m1,width); | |
| 2530 src_0=&src_m1[src_wrap]; | |
| 2531 src_p1=&src_0[src_wrap]; | |
| 2532 src_p2=&src_p1[src_wrap]; | |
| 2533 for(y=0;y<(height-2);y+=2) { | |
| 2534 deinterlace_line_inplace(buf,src_m1,src_0,src_p1,src_p2,width); | |
| 2535 src_m1 = src_p1; | |
| 2536 src_0 = src_p2; | |
| 2537 src_p1 += 2*src_wrap; | |
| 2538 src_p2 += 2*src_wrap; | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2539 } |
| 801 | 2540 /* do last line */ |
| 2541 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
|
2542 av_free(buf); |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2543 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2544 |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2545 |
| 801 | 2546 /* deinterlace - if not supported return -1 */ |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
2547 int avpicture_deinterlace(AVPicture *dst, const AVPicture *src, |
| 0 | 2548 int pix_fmt, int width, int height) |
| 2549 { | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2550 int i; |
| 0 | 2551 |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2552 if (pix_fmt != PIX_FMT_YUV420P && |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2553 pix_fmt != PIX_FMT_YUV422P && |
|
1425
f53d31c5eac9
* ffmpeg was *silently* rejecting to deinterlace NTSC DV. The problem
romansh
parents:
1353
diff
changeset
|
2554 pix_fmt != PIX_FMT_YUV444P && |
| 2979 | 2555 pix_fmt != PIX_FMT_YUV411P) |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2556 return -1; |
| 801 | 2557 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
|
2558 return -1; |
| 801 | 2559 |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2560 for(i=0;i<3;i++) { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2561 if (i == 1) { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2562 switch(pix_fmt) { |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2563 case PIX_FMT_YUV420P: |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2564 width >>= 1; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2565 height >>= 1; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2566 break; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2567 case PIX_FMT_YUV422P: |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2568 width >>= 1; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2569 break; |
|
1425
f53d31c5eac9
* ffmpeg was *silently* rejecting to deinterlace NTSC DV. The problem
romansh
parents:
1353
diff
changeset
|
2570 case PIX_FMT_YUV411P: |
|
f53d31c5eac9
* ffmpeg was *silently* rejecting to deinterlace NTSC DV. The problem
romansh
parents:
1353
diff
changeset
|
2571 width >>= 2; |
|
f53d31c5eac9
* ffmpeg was *silently* rejecting to deinterlace NTSC DV. The problem
romansh
parents:
1353
diff
changeset
|
2572 break; |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2573 default: |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2574 break; |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2575 } |
|
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2576 } |
| 801 | 2577 if (src == dst) { |
|
1488
766a2f4edbea
avcodec const correctness patch by (Drew Hess <dhess at ilm dot com>)
michaelni
parents:
1425
diff
changeset
|
2578 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
|
2579 width, height); |
| 801 | 2580 } else { |
| 2581 deinterlace_bottom_field(dst->data[i],dst->linesize[i], | |
| 2582 src->data[i], src->linesize[i], | |
| 2583 width, height); | |
| 2584 } | |
| 0 | 2585 } |
| 801 | 2586 #ifdef HAVE_MMX |
| 2587 emms(); | |
| 2588 #endif | |
|
52
1d796bdb2c2a
added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents:
18
diff
changeset
|
2589 return 0; |
| 0 | 2590 } |
|
440
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
2591 |
|
000aeeac27a2
* started to cleanup name clashes for onetime compilation
kabi
parents:
429
diff
changeset
|
2592 #undef FIX |
