annotate imgconvert.c @ 1111:54dc72414a69 libavcodec

typo
author michaelni
date Thu, 06 Mar 2003 14:42:07 +0000
parents bfc18110d4b6
children 54384dc71fe7
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 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
5 * This library is free software; you can redistribute it and/or
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
7 * License as published by the Free Software Foundation; either
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
429
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
16 * License along with this library; if not, write to the Free Software
718a22dc121f license/copyright change
glantau
parents: 396
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
18 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
19
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
20 /**
1108
bfc18110d4b6 typos & cosmetics
michaelni
parents: 1106
diff changeset
21 * @file imgconvert.c
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
22 * Misc image convertion routines.
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
23 */
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
24
1e39f273ecd6 per file doxy
michaelni
parents: 1073
diff changeset
25
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
26 #include "avcodec.h"
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
27 #include "dsputil.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
28
17
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 0
diff changeset
29 #ifdef USE_FASTMEMCPY
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 0
diff changeset
30 #include "fastmemcpy.h"
b69fe46fd708 Adding fastmemcpy stuff to speedup mplayer project
nickols_k
parents: 0
diff changeset
31 #endif
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
32
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
33 #ifdef HAVE_MMX
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
34 #include "i386/mmx.h"
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
35 #endif
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
36
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
37 typedef struct PixFmtInfo {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
38 const char *name;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
39 uint8_t nb_components; /* number of components in AVPicture array */
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
40 uint8_t is_yuv : 1; /* true if YUV instead of RGB color space */
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
41 uint8_t is_packed : 1; /* true if multiple components in same word */
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
42 uint8_t is_paletted : 1; /* true if paletted */
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
43 uint8_t is_alpha : 1; /* true if alpha can be specified */
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
44 uint8_t is_gray : 1; /* true if gray or monochrome format */
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
45 uint8_t x_chroma_shift; /* X chroma subsampling factor is 2 ^ shift */
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
46 uint8_t y_chroma_shift; /* Y chroma subsampling factor is 2 ^ shift */
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
47 } PixFmtInfo;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
48
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
49 /* this table gives more information about formats */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
50 static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
51 /* YUV formats */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
52 [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
53 .name = "yuv420p",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
54 .nb_components = 3, .is_yuv = 1,
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
55 .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
56 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
57 [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
58 .name = "yuv422p",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
59 .nb_components = 3, .is_yuv = 1,
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
60 .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
61 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
62 [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
63 .name = "yuv444p",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
64 .nb_components = 3, .is_yuv = 1,
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
65 .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
66 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
67 [PIX_FMT_YUV422] = {
1014
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
68 .name = "yuv422",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
69 .nb_components = 1, .is_yuv = 1, .is_packed = 1,
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
70 .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
71 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
72 [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
73 .name = "yuv410p",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
74 .nb_components = 3, .is_yuv = 1,
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
75 .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
76 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
77 [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
78 .name = "yuv411p",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
79 .nb_components = 3, .is_yuv = 1,
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
80 .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
81 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
82
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
83 /* RGB formats */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
84 [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
85 .name = "rgb24",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
86 .nb_components = 1, .is_packed = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
87 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
88 [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
89 .name = "bgr24",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
90 .nb_components = 1, .is_packed = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
91 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
92 [PIX_FMT_RGBA32] = {
1014
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
93 .name = "rgba32",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
94 .nb_components = 1, .is_packed = 1, .is_alpha = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
95 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
96 [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
97 .name = "rgb565",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
98 .nb_components = 1, .is_packed = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
99 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
100 [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
101 .name = "rgb555",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
102 .nb_components = 1, .is_packed = 1, .is_alpha = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
103 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
104
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
105 /* gray / mono formats */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
106 [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
107 .name = "gray",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
108 .nb_components = 1, .is_gray = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
109 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
110 [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
111 .name = "monow",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
112 .nb_components = 1, .is_packed = 1, .is_gray = 1,
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_MONOBLACK] = {
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 = "monob",
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
116 .nb_components = 1, .is_packed = 1, .is_gray = 1,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
117 },
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
118
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
119 /* paletted formats */
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
120 [PIX_FMT_PAL8] = {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
121 .name = "pal8",
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
122 .nb_components = 1, .is_packed = 1, .is_paletted = 1,
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
123 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
124 };
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
125
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
126 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
127 {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
128 if (pix_fmt_info[pix_fmt].is_yuv) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
129 *h_shift = pix_fmt_info[pix_fmt].x_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
130 *v_shift = pix_fmt_info[pix_fmt].y_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
131 } else {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
132 *h_shift=0;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
133 *v_shift=0;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
134 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
135 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
136
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
137 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
138 {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
139 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
140 return "???";
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
141 else
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
142 return pix_fmt_info[pix_fmt].name;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
143 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
144
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
145 /* Picture field are filled with 'ptr' addresses. Also return size */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
146 int avpicture_fill(AVPicture *picture, uint8_t *ptr,
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
147 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
148 {
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
149 int size, w2, h2, size2;
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
150 PixFmtInfo *pinfo;
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
151
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
152 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
153 size = width * height;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
154 switch(pix_fmt) {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
155 case PIX_FMT_YUV420P:
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
156 case PIX_FMT_YUV422P:
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
157 case PIX_FMT_YUV444P:
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
158 case PIX_FMT_YUV410P:
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
159 case PIX_FMT_YUV411P:
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
160 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
161 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
162 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
163 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
164 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
165 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
166 picture->linesize[0] = width;
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
167 picture->linesize[1] = w2;
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
168 picture->linesize[2] = w2;
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
169 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
170 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
171 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
172 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
173 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
174 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
175 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
176 return size * 3;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
177 case PIX_FMT_RGBA32:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
178 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
179 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
180 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
181 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
182 return size * 4;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
183 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
184 case PIX_FMT_RGB565:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
185 case PIX_FMT_YUV422:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
186 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
187 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
188 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
189 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
190 return size * 2;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
191 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
192 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
193 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
194 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
195 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
196 return size;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
197 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
198 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
199 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
200 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
201 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
202 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
203 return picture->linesize[0] * height;
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
204 case PIX_FMT_PAL8:
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
205 size2 = (size + 3) & ~3;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
206 picture->data[0] = ptr;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
207 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
208 picture->data[2] = NULL;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
209 picture->linesize[0] = width;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
210 picture->linesize[1] = 4;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
211 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
212 default:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
213 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
214 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
215 picture->data[2] = NULL;
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
216 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
217 return -1;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
218 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
219 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
220
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
221 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
222 {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
223 AVPicture dummy_pict;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
224 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
225 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
226
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
227
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
228 /* XXX: totally non optimized */
986e461dc072 Initial revision
glantau
parents:
diff changeset
229
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
230 static void yuv422_to_yuv420p(AVPicture *dst, AVPicture *src,
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
231 int width, int height)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
232 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
233 uint8_t *lum, *cb, *cr;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 int x, y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
235 const uint8_t *p;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
236
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
237 lum = dst->data[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
238 cb = dst->data[1];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
239 cr = dst->data[2];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
240 p = src->data[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
241
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
242 for(y=0;y<height;y+=2) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 for(x=0;x<width;x+=2) {
1028
e76fb91de4cc reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents: 1023
diff changeset
244 lum[0] = p[0];
e76fb91de4cc reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents: 1023
diff changeset
245 cb[0] = p[1];
e76fb91de4cc reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents: 1023
diff changeset
246 lum[1] = p[2];
e76fb91de4cc reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents: 1023
diff changeset
247 cr[0] = p[3];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 p += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
249 lum += 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
250 cb++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
251 cr++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 for(x=0;x<width;x+=2) {
1028
e76fb91de4cc reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents: 1023
diff changeset
254 lum[0] = p[0];
e76fb91de4cc reversing my own stupidity ... (raw packed yuv422 files dont use YUY2 but UYVY)
michaelni
parents: 1023
diff changeset
255 lum[1] = p[2];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
256 p += 4;
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 lum += 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
259 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
261
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 #define SCALEBITS 8
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 #define ONE_HALF (1 << (SCALEBITS - 1))
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 #define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5))
986e461dc072 Initial revision
glantau
parents:
diff changeset
265
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
266 /* XXX: use generic filter ? */
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
267 /* 1x2 -> 1x1 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
268 static void shrink2(uint8_t *dst, int dst_wrap,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
269 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
270 int width, int height)
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
271 {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
272 int w;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
273 uint8_t *s1, *s2, *d;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
274
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
275 for(;height > 0; height--) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
276 s1 = src;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
277 s2 = s1 + src_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
278 d = dst;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
279 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
280 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
281 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
282 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
283 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
284 s1 += 4;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
285 s2 += 4;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
286 d += 4;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
287 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
288 for(;w > 0; w--) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
289 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
290 s1++;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
291 s2++;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
292 d++;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
293 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
294 src += 2 * src_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
295 dst += dst_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
296 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
297 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
298
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
299 /* 2x2 -> 1x1 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
300 static void shrink22(uint8_t *dst, int dst_wrap,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
301 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
302 int width, int height)
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
303 {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
304 int w;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
305 uint8_t *s1, *s2, *d;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
306
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
307 for(;height > 0; height--) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
308 s1 = src;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
309 s2 = s1 + src_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
310 d = dst;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
311 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
312 d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
313 d[1] = (s1[2] + s1[3] + s2[2] + s2[3] + 2) >> 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
314 d[2] = (s1[4] + s1[5] + s2[4] + s2[5] + 2) >> 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
315 d[3] = (s1[6] + s1[7] + s2[6] + s2[7] + 2) >> 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
316 s1 += 8;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
317 s2 += 8;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
318 d += 4;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
319 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
320 for(;w > 0; w--) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
321 d[0] = (s1[0] + s1[1] + s2[0] + s2[1] + 2) >> 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
322 s1 += 2;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
323 s2 += 2;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
324 d++;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
325 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
326 src += 2 * src_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
327 dst += dst_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
328 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
329 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
330
576
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
331 /* 1x1 -> 2x2 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
332 static void grow22(uint8_t *dst, int dst_wrap,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
333 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
334 int width, int height)
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
335 {
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
336 int w;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
337 uint8_t *s1, *d;
576
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
338
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
339 for(;height > 0; height--) {
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
340 s1 = src;
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
341 d = dst;
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
342 for(w = width;w >= 4; w-=4) {
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
343 d[1] = d[0] = s1[0];
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
344 d[3] = d[2] = s1[1];
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
345 s1 += 2;
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
346 d += 4;
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
347 }
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
348 for(;w > 0; w--) {
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
349 d[0] = s1[0];
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
350 s1 ++;
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
351 d++;
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
352 }
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
353 if (height%2)
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
354 src += src_wrap;
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
355 dst += dst_wrap;
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
356 }
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
357 }
9aa5f0d0124e YUV410P to YUV420P patch by Franois Revol <revol at free dot fr>
michaelni
parents: 440
diff changeset
358
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
359 /* 1x2 -> 2x1 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
360 static void conv411(uint8_t *dst, int dst_wrap,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
361 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
362 int width, int height)
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
363 {
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
364 int w, c;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
365 uint8_t *s1, *s2, *d;
736
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
366
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
367 for(;height > 0; height--) {
736
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
368 s1 = src;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
369 s2 = src + src_wrap;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
370 d = dst;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
371 for(w = width;w > 0; w--) {
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
372 c = (s1[0] + s2[0]) >> 1;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
373 d[0] = c;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
374 d[1] = c;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
375 s1++;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
376 s2++;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
377 d += 2;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
378 }
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
379 src += src_wrap * 2;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
380 dst += dst_wrap;
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
381 }
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
382 }
918756bffda2 minimum support for YUV411P (new combined scaler/converter will handle that better...)
bellard
parents: 583
diff changeset
383
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
384 static void img_copy(uint8_t *dst, int dst_wrap,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
385 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
386 int width, int height)
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
387 {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
388 for(;height > 0; height--) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
389 memcpy(dst, src, width);
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
390 dst += dst_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
391 src += src_wrap;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
392 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
393 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
394
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
395 #define SCALE_BITS 10
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
396
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
397 #define C_Y (76309 >> (16 - SCALE_BITS))
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
398 #define C_RV (117504 >> (16 - SCALE_BITS))
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
399 #define C_BU (138453 >> (16 - SCALE_BITS))
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
400 #define C_GU (13954 >> (16 - SCALE_BITS))
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
401 #define C_GV (34903 >> (16 - SCALE_BITS))
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
402
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
403 #define YUV_TO_RGB2(r, g, b, y1)\
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
404 {\
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
405 y = (y1 - 16) * C_Y;\
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
406 r = cm[(y + r_add) >> SCALE_BITS];\
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
407 g = cm[(y + g_add) >> SCALE_BITS];\
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
408 b = cm[(y + b_add) >> SCALE_BITS];\
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
409 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
410
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
411 /* XXX: no chroma interpolating is done */
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
412 #define RGB_FUNCTIONS(rgb_name) \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
413 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
414 static void yuv420p_to_ ## rgb_name (AVPicture *dst, AVPicture *src, \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
415 int width, int height) \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
416 { \
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
417 uint8_t *y1_ptr, *y2_ptr, *cb_ptr, *cr_ptr, *d, *d1, *d2; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
418 int w, y, cb, cr, r_add, g_add, b_add, width2; \
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
419 uint8_t *cm = cropTbl + MAX_NEG_CROP; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
420 unsigned int r, g, b; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
421 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
422 d = dst->data[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
423 y1_ptr = src->data[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
424 cb_ptr = src->data[1]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
425 cr_ptr = src->data[2]; \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
426 width2 = (width + 1) >> 1; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
427 for(;height >= 2; height -= 2) { \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
428 d1 = d; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
429 d2 = d + dst->linesize[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
430 y2_ptr = y1_ptr + src->linesize[0]; \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
431 for(w = width; w >= 2; w -= 2) { \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
432 cb = cb_ptr[0] - 128; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
433 cr = cr_ptr[0] - 128; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
434 r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
435 g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
436 b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
437 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
438 /* output 4 pixels */ \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
439 YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
440 RGB_OUT(d1, r, g, b); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
441 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
442 YUV_TO_RGB2(r, g, b, y1_ptr[1]); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
443 RGB_OUT(d1 + BPP, r, g, b); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
444 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
445 YUV_TO_RGB2(r, g, b, y2_ptr[0]); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
446 RGB_OUT(d2, r, g, b); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
447 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
448 YUV_TO_RGB2(r, g, b, y2_ptr[1]); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
449 RGB_OUT(d2 + BPP, r, g, b); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
450 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
451 d1 += 2 * BPP; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
452 d2 += 2 * BPP; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
453 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
454 y1_ptr += 2; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
455 y2_ptr += 2; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
456 cb_ptr++; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
457 cr_ptr++; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
458 } \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
459 /* handle odd width */ \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
460 if (w) { \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
461 cb = cb_ptr[0] - 128; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
462 cr = cr_ptr[0] - 128; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
463 r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
464 g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
465 b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
466 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
467 YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
468 RGB_OUT(d1, r, g, b); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
469 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
470 YUV_TO_RGB2(r, g, b, y2_ptr[0]); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
471 RGB_OUT(d2, r, g, b); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
472 d1 += BPP; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
473 d2 += BPP; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
474 y1_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
475 y2_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
476 cb_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
477 cr_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
478 } \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
479 d += 2 * dst->linesize[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
480 y1_ptr += 2 * src->linesize[0] - width; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
481 cb_ptr += src->linesize[1] - width2; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
482 cr_ptr += src->linesize[2] - width2; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
483 } \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
484 /* handle odd height */ \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
485 if (height) { \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
486 d1 = d; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
487 for(w = width; w >= 2; w -= 2) { \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
488 cb = cb_ptr[0] - 128; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
489 cr = cr_ptr[0] - 128; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
490 r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
491 g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
492 b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
493 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
494 /* output 2 pixels */ \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
495 YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
496 RGB_OUT(d1, r, g, b); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
497 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
498 YUV_TO_RGB2(r, g, b, y1_ptr[1]); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
499 RGB_OUT(d1 + BPP, r, g, b); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
500 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
501 d1 += 2 * BPP; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
502 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
503 y1_ptr += 2; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
504 cb_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
505 cr_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
506 } \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
507 /* handle width */ \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
508 if (w) { \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
509 cb = cb_ptr[0] - 128; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
510 cr = cr_ptr[0] - 128; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
511 r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
512 g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
513 b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
514 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
515 /* output 2 pixels */ \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
516 YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
517 RGB_OUT(d1, r, g, b); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
518 d1 += BPP; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
519 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
520 y1_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
521 cb_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
522 cr_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
523 } \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
524 } \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
525 } \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
526 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
527 /* XXX: no chroma interpolating is done */ \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
528 static void yuv422p_to_ ## rgb_name (AVPicture *dst, AVPicture *src, \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
529 int width, int height) \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
530 { \
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
531 uint8_t *y1_ptr, *cb_ptr, *cr_ptr, *d, *d1; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
532 int w, y, cb, cr, r_add, g_add, b_add, width2; \
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
533 uint8_t *cm = cropTbl + MAX_NEG_CROP; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
534 unsigned int r, g, b; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
535 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
536 d = dst->data[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
537 y1_ptr = src->data[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
538 cb_ptr = src->data[1]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
539 cr_ptr = src->data[2]; \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
540 width2 = (width + 1) >> 1; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
541 for(;height > 0; height --) { \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
542 d1 = d; \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
543 for(w = width; w >= 2; w -= 2) { \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
544 cb = cb_ptr[0] - 128; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
545 cr = cr_ptr[0] - 128; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
546 r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
547 g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
548 b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
549 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
550 /* output 2 pixels */ \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
551 YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
552 RGB_OUT(d1, r, g, b); \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
553 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
554 YUV_TO_RGB2(r, g, b, y1_ptr[1]); \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
555 RGB_OUT(d1 + BPP, r, g, b); \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
556 \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
557 d1 += 2 * BPP; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
558 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
559 y1_ptr += 2; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
560 cb_ptr++; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
561 cr_ptr++; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
562 } \
1047
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
563 /* handle width */ \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
564 if (w) { \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
565 cb = cb_ptr[0] - 128; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
566 cr = cr_ptr[0] - 128; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
567 r_add = C_RV * cr + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
568 g_add = - C_GU * cb - C_GV * cr + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
569 b_add = C_BU * cb + (1 << (SCALE_BITS - 1)); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
570 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
571 /* output 2 pixels */ \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
572 YUV_TO_RGB2(r, g, b, y1_ptr[0]); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
573 RGB_OUT(d1, r, g, b); \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
574 d1 += BPP; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
575 \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
576 y1_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
577 cb_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
578 cr_ptr++; \
3f316a471019 handle odd image sizes when using subsampled chroma (useful for JPEG images)
bellard
parents: 1044
diff changeset
579 } \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
580 d += dst->linesize[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
581 y1_ptr += src->linesize[0] - width; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
582 cb_ptr += src->linesize[1] - width2; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
583 cr_ptr += src->linesize[2] - width2; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
584 } \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
585 } \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
586 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
587 static void rgb_name ## _to_yuv420p(AVPicture *dst, AVPicture *src, \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
588 int width, int height) \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
589 { \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
590 int wrap, wrap3, x, y; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
591 int r, g, b, r1, g1, b1; \
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
592 uint8_t *lum, *cb, *cr; \
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
593 const uint8_t *p; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
594 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
595 lum = dst->data[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
596 cb = dst->data[1]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
597 cr = dst->data[2]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
598 \
1052
f529b09e64b7 Fix a bug in the conversion of rgba32->yuv420p. This resulted in garbage images
philipjsg
parents: 1047
diff changeset
599 wrap = dst->linesize[0]; \
f529b09e64b7 Fix a bug in the conversion of rgba32->yuv420p. This resulted in garbage images
philipjsg
parents: 1047
diff changeset
600 wrap3 = src->linesize[0]; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
601 p = src->data[0]; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
602 for(y=0;y<height;y+=2) { \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
603 for(x=0;x<width;x+=2) { \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
604 RGB_IN(r, g, b, p); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
605 r1 = r; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
606 g1 = g; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
607 b1 = b; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
608 lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
609 FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
610 RGB_IN(r, g, b, p + BPP); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
611 r1 += r; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
612 g1 += g; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
613 b1 += b; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
614 lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
615 FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
616 p += wrap3; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
617 lum += wrap; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
618 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
619 RGB_IN(r, g, b, p); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
620 r1 += r; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
621 g1 += g; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
622 b1 += b; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
623 lum[0] = (FIX(0.29900) * r + FIX(0.58700) * g + \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
624 FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
625 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
626 RGB_IN(r, g, b, p + BPP); \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
627 r1 += r; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
628 g1 += g; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
629 b1 += b; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
630 lum[1] = (FIX(0.29900) * r + FIX(0.58700) * g + \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
631 FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
632 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
633 cb[0] = ((- FIX(0.16874) * r1 - FIX(0.33126) * g1 + \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
634 FIX(0.50000) * b1 + 4 * ONE_HALF - 1) >> \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
635 (SCALEBITS + 2)) + 128; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
636 cr[0] = ((FIX(0.50000) * r1 - FIX(0.41869) * g1 - \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
637 FIX(0.08131) * b1 + 4 * ONE_HALF - 1) >> \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
638 (SCALEBITS + 2)) + 128; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
639 \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
640 cb++; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
641 cr++; \
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
642 p += -wrap3 + 2 * BPP; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
643 lum += -wrap + 2; \
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
644 } \
1052
f529b09e64b7 Fix a bug in the conversion of rgba32->yuv420p. This resulted in garbage images
philipjsg
parents: 1047
diff changeset
645 p += wrap3 + (wrap3 - width * BPP); \
f529b09e64b7 Fix a bug in the conversion of rgba32->yuv420p. This resulted in garbage images
philipjsg
parents: 1047
diff changeset
646 lum += wrap + (wrap - width); \
f529b09e64b7 Fix a bug in the conversion of rgba32->yuv420p. This resulted in garbage images
philipjsg
parents: 1047
diff changeset
647 cb += dst->linesize[1] - width / 2; \
f529b09e64b7 Fix a bug in the conversion of rgba32->yuv420p. This resulted in garbage images
philipjsg
parents: 1047
diff changeset
648 cr += dst->linesize[2] - width / 2; \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
649 } \
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
650 } \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
651 \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
652 static void rgb_name ## _to_gray(AVPicture *dst, AVPicture *src, \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
653 int width, int height) \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
654 { \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
655 const unsigned char *p; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
656 unsigned char *q; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
657 int r, g, b, dst_wrap, src_wrap; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
658 int x, y; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
659 \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
660 p = src->data[0]; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
661 src_wrap = src->linesize[0] - BPP * width; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
662 \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
663 q = dst->data[0]; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
664 dst_wrap = dst->linesize[0] - width; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
665 \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
666 for(y=0;y<height;y++) { \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
667 for(x=0;x<width;x++) { \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
668 RGB_IN(r, g, b, p); \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
669 q[0] = (FIX(0.29900) * r + FIX(0.58700) * g + \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
670 FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
671 q++; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
672 p += BPP; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
673 } \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
674 p += src_wrap; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
675 q += dst_wrap; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
676 } \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
677 } \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
678 \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
679 static void gray_to_ ## rgb_name(AVPicture *dst, AVPicture *src, \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
680 int width, int height) \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
681 { \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
682 const unsigned char *p; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
683 unsigned char *q; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
684 int r, dst_wrap, src_wrap; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
685 int x, y; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
686 \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
687 p = src->data[0]; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
688 src_wrap = src->linesize[0] - width; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
689 \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
690 q = dst->data[0]; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
691 dst_wrap = dst->linesize[0] - BPP * width; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
692 \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
693 for(y=0;y<height;y++) { \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
694 for(x=0;x<width;x++) { \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
695 r = p[0]; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
696 RGB_OUT(q, r, r, r); \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
697 q += BPP; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
698 p ++; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
699 } \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
700 p += src_wrap; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
701 q += dst_wrap; \
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
702 } \
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
703 } \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
704 \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
705 static void pal8_to_ ## rgb_name(AVPicture *dst, AVPicture *src, \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
706 int width, int height) \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
707 { \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
708 const unsigned char *p; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
709 unsigned char *q; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
710 int r, g, b, dst_wrap, src_wrap; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
711 int x, y; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
712 uint32_t v;\
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
713 const uint32_t *palette;\
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
714 \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
715 p = src->data[0]; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
716 src_wrap = src->linesize[0] - width; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
717 palette = (uint32_t *)src->data[1];\
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
718 \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
719 q = dst->data[0]; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
720 dst_wrap = dst->linesize[0] - BPP * width; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
721 \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
722 for(y=0;y<height;y++) { \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
723 for(x=0;x<width;x++) { \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
724 v = palette[p[0]];\
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
725 r = (v >> 16) & 0xff;\
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
726 g = (v >> 8) & 0xff;\
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
727 b = (v) & 0xff;\
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
728 RGB_OUT(q, r, g, b); \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
729 q += BPP; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
730 p ++; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
731 } \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
732 p += src_wrap; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
733 q += dst_wrap; \
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
734 } \
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
735 }
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
736
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
737 /* copy bit n to bits 0 ... n - 1 */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
738 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
739 {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
740 int mask;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
741 mask = (1 << n) - 1;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
742 return (a & (0xff & ~mask)) | ((-((a >> n) & 1)) & mask);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
743 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
744
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
745 /* rgb555 handling */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
746
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
747 #define RGB_IN(r, g, b, s)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
748 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
749 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
750 r = bitcopy_n(v >> (10 - 3), 3);\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
751 g = bitcopy_n(v >> (5 - 3), 3);\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
752 b = bitcopy_n(v << 3, 3);\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
753 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
754
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
755 #define RGB_OUT(d, r, g, b)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
756 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
757 ((uint16_t *)(d))[0] = ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3) | 0x8000;\
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
758 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
759
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
760 #define BPP 2
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
761
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
762 RGB_FUNCTIONS(rgb555)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
763
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
764 #undef RGB_IN
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
765 #undef RGB_OUT
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
766 #undef BPP
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
767
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
768 /* rgb565 handling */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
769
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
770 #define RGB_IN(r, g, b, s)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
771 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
772 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
773 r = bitcopy_n(v >> (11 - 3), 3);\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
774 g = bitcopy_n(v >> (5 - 2), 2);\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
775 b = bitcopy_n(v << 3, 3);\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
776 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
777
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
778 #define RGB_OUT(d, r, g, b)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
779 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
780 ((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
781 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
782
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
783 #define BPP 2
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
784
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
785 RGB_FUNCTIONS(rgb565)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
786
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
787 #undef RGB_IN
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
788 #undef RGB_OUT
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
789 #undef BPP
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
790
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
791 /* bgr24 handling */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
792
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
793 #define RGB_IN(r, g, b, s)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
794 {\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
795 b = (s)[0];\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
796 g = (s)[1];\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
797 r = (s)[2];\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
798 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
799
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
800 #define RGB_OUT(d, r, g, b)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
801 {\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
802 (d)[0] = b;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
803 (d)[1] = g;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
804 (d)[2] = r;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
805 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
806
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
807 #define BPP 3
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
808
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
809 RGB_FUNCTIONS(bgr24)
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
810
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
811 #undef RGB_IN
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
812 #undef RGB_OUT
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
813 #undef BPP
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
814
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
815 /* rgb24 handling */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
816
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
817 #define RGB_IN(r, g, b, s)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
818 {\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
819 r = (s)[0];\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
820 g = (s)[1];\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
821 b = (s)[2];\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
822 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
823
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
824 #define RGB_OUT(d, r, g, b)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
825 {\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
826 (d)[0] = r;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
827 (d)[1] = g;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
828 (d)[2] = b;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
829 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
830
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
831 #define BPP 3
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
832
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
833 RGB_FUNCTIONS(rgb24)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
834
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
835 #undef RGB_IN
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
836 #undef RGB_OUT
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
837 #undef BPP
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
838
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
839 /* rgba32 handling */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
840
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
841 #define RGB_IN(r, g, b, s)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
842 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
843 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
844 r = (v >> 16) & 0xff;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
845 g = (v >> 8) & 0xff;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
846 b = v & 0xff;\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
847 }
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
848
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
849 #define RGB_OUT(d, r, g, b)\
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
850 {\
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
851 ((uint32_t *)(d))[0] = (0xff << 24) | (r << 16) | (g << 8) | b;\
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
852 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
853
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
854 #define BPP 4
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
855
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
856 RGB_FUNCTIONS(rgba32)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
857
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
858 #undef RGB_IN
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
859 #undef RGB_OUT
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
860 #undef BPP
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
861
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
862
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
863 static void rgb24_to_rgb565(AVPicture *dst, AVPicture *src,
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
864 int width, int height)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
865 {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
866 const unsigned char *p;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
867 unsigned char *q;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
868 int r, g, b, dst_wrap, src_wrap;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
869 int x, y;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
870
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
871 p = src->data[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
872 src_wrap = src->linesize[0] - 3 * width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
873
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
874 q = dst->data[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
875 dst_wrap = dst->linesize[0] - 2 * width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
876
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
877 for(y=0;y<height;y++) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
878 for(x=0;x<width;x++) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
879 r = p[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
880 g = p[1];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
881 b = p[2];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
882
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
883 ((unsigned short *)q)[0] =
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
884 ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
885 q += 2;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
886 p += 3;
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
887 }
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
888 p += src_wrap;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
889 q += dst_wrap;
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
890 }
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
891 }
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
892
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
893 /* NOTE: we also add a dummy alpha bit */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
894 static void rgb24_to_rgb555(AVPicture *dst, AVPicture *src,
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
895 int width, int height)
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
896 {
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
897 const unsigned char *p;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
898 unsigned char *q;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
899 int r, g, b, dst_wrap, src_wrap;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
900 int x, y;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
901
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
902 p = src->data[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
903 src_wrap = src->linesize[0] - 3 * width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
904
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
905 q = dst->data[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
906 dst_wrap = dst->linesize[0] - 2 * width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
907
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
908 for(y=0;y<height;y++) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
909 for(x=0;x<width;x++) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
910 r = p[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
911 g = p[1];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
912 b = p[2];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
913
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
914 ((unsigned short *)q)[0] =
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
915 ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3) | 0x8000;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
916 q += 2;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
917 p += 3;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
918 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
919 p += src_wrap;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
920 q += dst_wrap;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
921 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
922 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
923
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
924 static void mono_to_gray(AVPicture *dst, AVPicture *src,
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
925 int width, int height, int xor_mask)
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
926 {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
927 const unsigned char *p;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
928 unsigned char *q;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
929 int v, dst_wrap, src_wrap;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
930 int y, w;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
931
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
932 p = src->data[0];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
933 src_wrap = src->linesize[0] - ((width + 7) >> 3);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
934
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
935 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
936 dst_wrap = dst->linesize[0] - width;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
937 for(y=0;y<height;y++) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
938 w = width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
939 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
940 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
941 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
942 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
943 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
944 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
945 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
946 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
947 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
948 q[7] = -((v >> 0) & 1);
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
949 w -= 8;
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
950 q += 8;
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
951 }
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
952 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
953 v = *p++ ^ xor_mask;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
954 do {
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
955 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
956 q++;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
957 v <<= 1;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
958 } while (--w);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
959 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
960 p += src_wrap;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
961 q += dst_wrap;
583
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
962 }
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
963 }
d6955d0d7d27 Add conversions to and from RGBA32 and BGRA32.
philipjsg
parents: 576
diff changeset
964
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
965 static void monowhite_to_gray(AVPicture *dst, AVPicture *src,
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
966 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
967 {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
968 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
969 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
970
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
971 static void monoblack_to_gray(AVPicture *dst, AVPicture *src,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
972 int width, int height)
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
973 {
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
974 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
975 }
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
976
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
977 static void gray_to_mono(AVPicture *dst, AVPicture *src,
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
978 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
979 {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
980 int n;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
981 const uint8_t *s;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
982 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
983 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
984
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
985 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
986 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
987
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
988 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
989 dst_wrap = dst->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
990 printf("%d %d\n", width, height);
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
991
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
992 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
993 n = width;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
994 while (n >= 8) {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
995 v = 0;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
996 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
997 b = s[0];
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
998 s++;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
999 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
1000 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1001 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
1002 d++;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1003 n -= 8;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1004 }
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1005 if (n > 0) {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1006 n1 = n;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1007 v = 0;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1008 while (n > 0) {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1009 b = s[0];
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1010 s++;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1011 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
1012 n--;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1013 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1014 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
1015 d++;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1016 }
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1017 s += src_wrap;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1018 d += dst_wrap;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1019 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1020 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1021
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1022 static void gray_to_monowhite(AVPicture *dst, AVPicture *src,
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1023 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
1024 {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1025 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
1026 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1027
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1028 static void gray_to_monoblack(AVPicture *dst, AVPicture *src,
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1029 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
1030 {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1031 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
1032 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1033
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1034 /* this is maybe slow, but allows for extensions */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1035 static inline unsigned char gif_clut_index(uint8_t r, uint8_t g, uint8_t b)
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1036 {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1037 return ((((r)/47)%6)*6*6+(((g)/47)%6)*6+(((b)/47)%6));
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1038 }
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1039
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1040 /* XXX: put jpeg quantize code instead */
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1041 static void rgb24_to_pal8(AVPicture *dst, AVPicture *src,
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1042 int width, int height)
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1043 {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1044 const unsigned char *p;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1045 unsigned char *q;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1046 int r, g, b, dst_wrap, src_wrap;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1047 int x, y, i;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1048 static const uint8_t pal_value[6] = { 0x00, 0x33, 0x66, 0x99, 0xcc, 0xff };
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1049 uint32_t *pal;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1050
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1051 p = src->data[0];
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1052 src_wrap = src->linesize[0] - 3 * width;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1053
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1054 q = dst->data[0];
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1055 dst_wrap = dst->linesize[0] - width;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1056
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1057 for(y=0;y<height;y++) {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1058 for(x=0;x<width;x++) {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1059 r = p[0];
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1060 g = p[1];
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1061 b = p[2];
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1062
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1063 q[0] = gif_clut_index(r, g, b);
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1064 q++;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1065 p += 3;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1066 }
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1067 p += src_wrap;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1068 q += dst_wrap;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1069 }
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1070
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1071 /* build palette */
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1072 pal = (uint32_t *)dst->data[1];
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1073 i = 0;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1074 for(r = 0; r < 6; r++) {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1075 for(g = 0; g < 6; g++) {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1076 for(b = 0; b < 6; b++) {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1077 pal[i++] = (0xff << 24) | (pal_value[r] << 16) |
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1078 (pal_value[g] << 8) | pal_value[b];
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1079 }
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1080 }
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1081 }
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1082 while (i < 256)
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1083 pal[i++] = 0;
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1084 }
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1085
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1086 typedef struct ConvertEntry {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1087 void (*convert)(AVPicture *dst, AVPicture *src, int width, int height);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1088 } ConvertEntry;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1089
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1090 /* add each new convertion function in this table */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1091 /* constraints;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1092 - all non YUV modes must convert at least to and from PIX_FMT_RGB24
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1093 */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1094 static ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1095 [PIX_FMT_YUV420P] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1096 [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
1097 .convert = yuv420p_to_rgb555
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1098 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1099 [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
1100 .convert = yuv420p_to_rgb565
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1101 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1102 [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
1103 .convert = yuv420p_to_bgr24
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1104 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1105 [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
1106 .convert = yuv420p_to_rgb24
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1107 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1108 [PIX_FMT_RGBA32] = {
1014
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
1109 .convert = yuv420p_to_rgba32
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1110 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1111 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1112 [PIX_FMT_YUV422P] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1113 [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
1114 .convert = yuv422p_to_rgb555
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1115 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1116 [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
1117 .convert = yuv422p_to_rgb565
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1118 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1119 [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
1120 .convert = yuv422p_to_bgr24
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1121 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1122 [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
1123 .convert = yuv422p_to_rgb24
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1124 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1125 [PIX_FMT_RGBA32] = {
1014
48349e11c9b2 C99 initializers and kill warnings patch by (mru at users dot sourceforge dot net (Mns Rullgrd))
michaelni
parents: 993
diff changeset
1126 .convert = yuv422p_to_rgba32
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1127 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1128 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1129 [PIX_FMT_YUV422] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1130 [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
1131 .convert = yuv422_to_yuv420p,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1132 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1133 },
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1134
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1135 [PIX_FMT_RGB24] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1136 [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
1137 .convert = rgb24_to_yuv420p
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1138 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1139 [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
1140 .convert = rgb24_to_rgb565
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1141 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1142 [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
1143 .convert = rgb24_to_rgb555
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1144 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1145 [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
1146 .convert = rgb24_to_gray
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1147 },
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1148 [PIX_FMT_PAL8] = {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1149 .convert = rgb24_to_pal8
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1150 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1151 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1152 [PIX_FMT_RGBA32] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1153 [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
1154 .convert = rgba32_to_yuv420p
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1155 },
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1156 [PIX_FMT_GRAY8] = {
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1157 .convert = rgba32_to_gray
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1158 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1159 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1160 [PIX_FMT_BGR24] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1161 [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
1162 .convert = bgr24_to_yuv420p
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1163 },
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1164 [PIX_FMT_GRAY8] = {
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1165 .convert = bgr24_to_gray
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1166 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1167 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1168 [PIX_FMT_RGB555] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1169 [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
1170 .convert = rgb555_to_yuv420p
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1171 },
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1172 [PIX_FMT_GRAY8] = {
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1173 .convert = rgb555_to_gray
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1174 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1175 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1176 [PIX_FMT_RGB565] = {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1177 [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
1178 .convert = rgb565_to_yuv420p
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1179 },
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1180 [PIX_FMT_GRAY8] = {
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1181 .convert = rgb565_to_gray
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1182 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1183 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1184 [PIX_FMT_GRAY8] = {
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1185 [PIX_FMT_RGB555] = {
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1186 .convert = gray_to_rgb555
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1187 },
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1188 [PIX_FMT_RGB565] = {
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1189 .convert = gray_to_rgb565
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1190 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1191 [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
1192 .convert = gray_to_rgb24
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1193 },
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1194 [PIX_FMT_BGR24] = {
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1195 .convert = gray_to_bgr24
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1196 },
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1197 [PIX_FMT_RGBA32] = {
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1198 .convert = gray_to_rgba32
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1199 },
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1200 [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
1201 .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
1202 },
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1203 [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
1204 .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
1205 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1206 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1207 [PIX_FMT_MONOWHITE] = {
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1208 [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
1209 .convert = monowhite_to_gray
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1210 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1211 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1212 [PIX_FMT_MONOBLACK] = {
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1213 [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
1214 .convert = monoblack_to_gray
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1215 },
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1216 },
1055
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1217 [PIX_FMT_PAL8] = {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1218 [PIX_FMT_RGB555] = {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1219 .convert = pal8_to_rgb555
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1220 },
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1221 [PIX_FMT_RGB565] = {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1222 .convert = pal8_to_rgb565
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1223 },
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1224 [PIX_FMT_BGR24] = {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1225 .convert = pal8_to_bgr24
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1226 },
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1227 [PIX_FMT_RGB24] = {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1228 .convert = pal8_to_rgb24
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1229 },
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1230 [PIX_FMT_RGBA32] = {
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1231 .convert = pal8_to_rgba32
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1232 },
6261fdd1f69d added paletted 8 bit format support
bellard
parents: 1052
diff changeset
1233 },
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1234 };
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1235
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1236 static int avpicture_alloc(AVPicture *picture,
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1237 int pix_fmt, int width, int height)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1238 {
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1055
diff changeset
1239 unsigned int size;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1240 void *ptr;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1241
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1242 size = avpicture_get_size(pix_fmt, width, height);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1243 if (size < 0)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1244 goto fail;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1245 ptr = av_malloc(size);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1246 if (!ptr)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1247 goto fail;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1248 avpicture_fill(picture, ptr, pix_fmt, width, height);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1249 return 0;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1250 fail:
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1251 memset(picture, 0, sizeof(AVPicture));
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1252 return -1;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1253 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1254
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1255 static void avpicture_free(AVPicture *picture)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1256 {
1031
19de1445beb2 use av_malloc() functions - added av_strdup and av_realloc()
bellard
parents: 1028
diff changeset
1257 av_free(picture->data[0]);
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1258 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1259
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1260 /* 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
1261 int img_convert(AVPicture *dst, int dst_pix_fmt,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1262 AVPicture *src, int src_pix_fmt,
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1263 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
1264 {
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1265 int i, ret, dst_width, dst_height, int_pix_fmt;
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1266 PixFmtInfo *src_pix, *dst_pix;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1267 ConvertEntry *ce;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1268 AVPicture tmp1, *tmp = &tmp1;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1269
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1270 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
1271 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
1272 return -1;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1273 if (src_width <= 0 || src_height <= 0)
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1274 return 0;
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1275
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1276 dst_width = src_width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1277 dst_height = src_height;
1022
d651df667898 added gray<->RGB functions - fixed rgb<->yuv functions for non RGB24 case
bellard
parents: 1020
diff changeset
1278
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1279 dst_pix = &pix_fmt_info[dst_pix_fmt];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1280 src_pix = &pix_fmt_info[src_pix_fmt];
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1281 if (src_pix_fmt == dst_pix_fmt) {
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1282 /* XXX: incorrect */
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1283 /* same format: just copy */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1284 for(i = 0; i < dst_pix->nb_components; i++) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1285 int w, h;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1286 w = dst_width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1287 h = dst_height;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1288 if (dst_pix->is_yuv && (i == 1 || i == 2)) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1289 w >>= dst_pix->x_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1290 h >>= dst_pix->y_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1291 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1292 img_copy(dst->data[i], dst->linesize[i],
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1293 src->data[i], src->linesize[i],
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1294 w, h);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1295 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1296 return 0;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1297 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1298
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1299 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
1300 if (ce->convert) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1301 /* specific convertion routine */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1302 ce->convert(dst, src, dst_width, dst_height);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1303 return 0;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1304 }
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1305
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1306 /* gray to YUV */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1307 if (dst_pix->is_yuv && src_pix_fmt == PIX_FMT_GRAY8) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1308 int w, h, y;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1309 uint8_t *d;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1310
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1311 img_copy(dst->data[0], dst->linesize[0],
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1312 src->data[0], src->linesize[0],
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1313 dst_width, dst_height);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1314 /* fill U and V with 128 */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1315 w = dst_width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1316 h = dst_height;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1317 w >>= dst_pix->x_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1318 h >>= dst_pix->y_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1319 for(i = 1; i <= 2; i++) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1320 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
1321 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
1322 memset(d, 128, w);
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1323 d += dst->linesize[i];
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1324 }
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1325 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1326 return 0;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1327 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1328
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1329 /* YUV to gray */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1330 if (src_pix->is_yuv && dst_pix_fmt == PIX_FMT_GRAY8) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1331 img_copy(dst->data[0], dst->linesize[0],
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1332 src->data[0], src->linesize[0],
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1333 dst_width, dst_height);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1334 return 0;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1335 }
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1336
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1337 /* YUV to YUV */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1338 if (dst_pix->is_yuv && src_pix->is_yuv) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1339 int x_shift, y_shift, w, h;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1340 void (*resize_func)(uint8_t *dst, int dst_wrap,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1341 uint8_t *src, int src_wrap,
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1342 int width, int height);
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1343
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1344 /* compute chroma size of the smallest dimensions */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1345 w = dst_width;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1346 h = dst_height;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1347 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
1348 w >>= dst_pix->x_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1349 else
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1350 w >>= src_pix->x_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1351 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
1352 h >>= dst_pix->y_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1353 else
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1354 h >>= src_pix->y_chroma_shift;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1355
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1356 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
1357 y_shift = (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
1358 if (x_shift == 0 && y_shift == 0) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1359 resize_func = img_copy; /* should never happen */
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1360 } else if (x_shift == 0 && y_shift == 1) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1361 resize_func = shrink2;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1362 } else if (x_shift == 1 && y_shift == 1) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1363 resize_func = shrink22;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1364 } else if (x_shift == -1 && y_shift == -1) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1365 resize_func = grow22;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1366 } else if (x_shift == -1 && y_shift == 1) {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1367 resize_func = conv411;
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1368 } else {
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1369 /* currently not handled */
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1370 return -1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1371 }
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1372
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1373 img_copy(dst->data[0], dst->linesize[0],
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1374 src->data[0], src->linesize[0],
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1375 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
1376
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1377 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
1378 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
1379 src->data[i], src->linesize[i],
1073
4bc02fcf4d8c fixing 410 -> 420
michaelni
parents: 1064
diff changeset
1380 dst_width>>dst_pix->x_chroma_shift, dst_height>>dst_pix->y_chroma_shift);
1023
e61be5796027 img_convert() (YUV to YUV) patch by (Max Krasnyansky <maxk at qualcomm dot com>)
michaelni
parents: 1022
diff changeset
1381 return 0;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1382 }
989
fe9083c56733 simplified code (need automatic testing) - added primitive new format support.
bellard
parents: 940
diff changeset
1383
993
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1384 /* try to use an intermediate format */
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1385 if (src_pix_fmt == PIX_FMT_MONOWHITE ||
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1386 src_pix_fmt == PIX_FMT_MONOBLACK ||
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1387 dst_pix_fmt == PIX_FMT_MONOWHITE ||
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1388 dst_pix_fmt == PIX_FMT_MONOBLACK) {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1389 int_pix_fmt = PIX_FMT_GRAY8;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1390 } else {
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1391 int_pix_fmt = PIX_FMT_RGB24;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1392 }
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1393 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
1394 return -1;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1395 ret = -1;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1396 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
1397 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
1398 goto fail1;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1399 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
1400 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
1401 goto fail1;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1402 ret = 0;
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1403 fail1:
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1404 avpicture_free(tmp);
895d3b01c6f4 added missing formats in all functions - added monoblack, monowhite and gray8 support for most conversions
bellard
parents: 989
diff changeset
1405 return ret;
52
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
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1408
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1409 #ifdef HAVE_MMX
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1410 #define DEINT_INPLACE_LINE_LUM \
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1411 movd_m2r(lum_m4[0],mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1412 movd_m2r(lum_m3[0],mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1413 movd_m2r(lum_m2[0],mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1414 movd_m2r(lum_m1[0],mm3);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1415 movd_m2r(lum[0],mm4);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1416 punpcklbw_r2r(mm7,mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1417 movd_r2m(mm2,lum_m4[0]);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1418 punpcklbw_r2r(mm7,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1419 punpcklbw_r2r(mm7,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1420 punpcklbw_r2r(mm7,mm3);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1421 punpcklbw_r2r(mm7,mm4);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1422 paddw_r2r(mm3,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1423 psllw_i2r(1,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1424 paddw_r2r(mm4,mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1425 psllw_i2r(2,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1426 paddw_r2r(mm6,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1427 paddw_r2r(mm2,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1428 psubusw_r2r(mm0,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1429 psrlw_i2r(3,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1430 packuswb_r2r(mm7,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1431 movd_r2m(mm1,lum_m2[0]);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1432
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1433 #define DEINT_LINE_LUM \
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1434 movd_m2r(lum_m4[0],mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1435 movd_m2r(lum_m3[0],mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1436 movd_m2r(lum_m2[0],mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1437 movd_m2r(lum_m1[0],mm3);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1438 movd_m2r(lum[0],mm4);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1439 punpcklbw_r2r(mm7,mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1440 punpcklbw_r2r(mm7,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1441 punpcklbw_r2r(mm7,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1442 punpcklbw_r2r(mm7,mm3);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1443 punpcklbw_r2r(mm7,mm4);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1444 paddw_r2r(mm3,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1445 psllw_i2r(1,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1446 paddw_r2r(mm4,mm0);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1447 psllw_i2r(2,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1448 paddw_r2r(mm6,mm2);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1449 paddw_r2r(mm2,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1450 psubusw_r2r(mm0,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1451 psrlw_i2r(3,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1452 packuswb_r2r(mm7,mm1);\
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1453 movd_r2m(mm1,dst[0]);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1454 #endif
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1455
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1456 /* filter parameters: [-1 4 2 4 -1] // 8 */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1457 static void deinterlace_line(uint8_t *dst, 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
1458 int size)
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1459 {
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1460 #ifndef HAVE_MMX
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1461 uint8_t *cm = cropTbl + MAX_NEG_CROP;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1462 int sum;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1463
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1464 for(;size > 0;size--) {
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1465 sum = -lum_m4[0];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1466 sum += lum_m3[0] << 2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1467 sum += lum_m2[0] << 1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1468 sum += lum_m1[0] << 2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1469 sum += -lum[0];
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1470 dst[0] = cm[(sum + 4) >> 3];
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1471 lum_m4++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1472 lum_m3++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1473 lum_m2++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1474 lum_m1++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1475 lum++;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1476 dst++;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1477 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1478 #else
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1479
1044
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1480 {
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1481 mmx_t rounder;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1482 rounder.uw[0]=4;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1483 rounder.uw[1]=4;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1484 rounder.uw[2]=4;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1485 rounder.uw[3]=4;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1486 pxor_r2r(mm7,mm7);
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1487 movq_m2r(rounder,mm6);
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1488 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1489 for (;size > 3; size-=4) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1490 DEINT_LINE_LUM
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1491 lum_m4+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1492 lum_m3+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1493 lum_m2+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1494 lum_m1+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1495 lum+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1496 dst+=4;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1497 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1498 #endif
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1499 }
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1500 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
1501 int size)
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1502 {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1503 #ifndef HAVE_MMX
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1504 uint8_t *cm = cropTbl + MAX_NEG_CROP;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1505 int sum;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1506
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1507 for(;size > 0;size--) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1508 sum = -lum_m4[0];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1509 sum += lum_m3[0] << 2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1510 sum += lum_m2[0] << 1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1511 lum_m4[0]=lum_m2[0];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1512 sum += lum_m1[0] << 2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1513 sum += -lum[0];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1514 lum_m2[0] = cm[(sum + 4) >> 3];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1515 lum_m4++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1516 lum_m3++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1517 lum_m2++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1518 lum_m1++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1519 lum++;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1520 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1521 #else
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1522
1044
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1523 {
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1524 mmx_t rounder;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1525 rounder.uw[0]=4;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1526 rounder.uw[1]=4;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1527 rounder.uw[2]=4;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1528 rounder.uw[3]=4;
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1529 pxor_r2r(mm7,mm7);
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1530 movq_m2r(rounder,mm6);
c6b3af81d79e 100000l
michaelni
parents: 1031
diff changeset
1531 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1532 for (;size > 3; size-=4) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1533 DEINT_INPLACE_LINE_LUM
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1534 lum_m4+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1535 lum_m3+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1536 lum_m2+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1537 lum_m1+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1538 lum+=4;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1539 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1540 #endif
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1541 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1542
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1543 /* 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
1544 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
1545 against the top field. */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1546 static void deinterlace_bottom_field(uint8_t *dst, int dst_wrap,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1547 uint8_t *src1, int src_wrap,
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1548 int width, int height)
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1549 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1550 uint8_t *src_m2, *src_m1, *src_0, *src_p1, *src_p2;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1551 int y;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1552
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1553 src_m2 = src1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1554 src_m1 = src1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1555 src_0=&src_m1[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1556 src_p1=&src_0[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1557 src_p2=&src_p1[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1558 for(y=0;y<(height-2);y+=2) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1559 memcpy(dst,src_m1,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1560 dst += dst_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1561 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
1562 src_m2 = src_0;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1563 src_m1 = src_p1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1564 src_0 = src_p2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1565 src_p1 += 2*src_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1566 src_p2 += 2*src_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1567 dst += dst_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1568 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1569 memcpy(dst,src_m1,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1570 dst += dst_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1571 /* do last line */
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1572 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
1573 }
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1574
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1575 static void deinterlace_bottom_field_inplace(uint8_t *src1, int src_wrap,
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1576 int width, int height)
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1577 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1578 uint8_t *src_m1, *src_0, *src_p1, *src_p2;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1579 int y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1580 uint8_t *buf;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
1581 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
1582
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1583 src_m1 = src1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1584 memcpy(buf,src_m1,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1585 src_0=&src_m1[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1586 src_p1=&src_0[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1587 src_p2=&src_p1[src_wrap];
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1588 for(y=0;y<(height-2);y+=2) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1589 deinterlace_line_inplace(buf,src_m1,src_0,src_p1,src_p2,width);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1590 src_m1 = src_p1;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1591 src_0 = src_p2;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1592 src_p1 += 2*src_wrap;
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1593 src_p2 += 2*src_wrap;
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1594 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1595 /* do last line */
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1596 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
1597 av_free(buf);
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1598 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1599
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1600
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1601 /* deinterlace - if not supported return -1 */
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1602 int avpicture_deinterlace(AVPicture *dst, AVPicture *src,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1603 int pix_fmt, int width, int height)
986e461dc072 Initial revision
glantau
parents:
diff changeset
1604 {
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1605 int i;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1606
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1607 if (pix_fmt != PIX_FMT_YUV420P &&
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1608 pix_fmt != PIX_FMT_YUV422P &&
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1609 pix_fmt != PIX_FMT_YUV444P)
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1610 return -1;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1611 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
1612 return -1;
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1613
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1614 for(i=0;i<3;i++) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1615 if (i == 1) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1616 switch(pix_fmt) {
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1617 case PIX_FMT_YUV420P:
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1618 width >>= 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1619 height >>= 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1620 break;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1621 case PIX_FMT_YUV422P:
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1622 width >>= 1;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1623 break;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1624 default:
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1625 break;
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1626 }
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1627 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1628 if (src == dst) {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1629 deinterlace_bottom_field_inplace(src->data[i], src->linesize[i],
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1630 width, height);
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1631 } else {
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1632 deinterlace_bottom_field(dst->data[i],dst->linesize[i],
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1633 src->data[i], src->linesize[i],
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1634 width, height);
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1635 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1636 }
801
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1637 #ifdef HAVE_MMX
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1638 emms();
f720b01c0fd5 1) Add MMX deinterlace code.
michaelni
parents: 736
diff changeset
1639 #endif
52
1d796bdb2c2a added 422P, 444P support - added deinterlace support - added xxx to RGB24 convertion
glantau
parents: 18
diff changeset
1640 return 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1641 }
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 429
diff changeset
1642
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 429
diff changeset
1643 #undef FIX