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