annotate imgconvert.c @ 9222:e314914641bc libavcodec

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