annotate imgconvert.c @ 5144:e92146cec4a8 libavcodec

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