summaryrefslogtreecommitdiff
path: root/libavcodec/imgconvert.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r--libavcodec/imgconvert.c264
1 files changed, 132 insertions, 132 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index afb66fa85a..f0d23d0997 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -71,7 +71,7 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
.color_type = FF_COLOR_YUV,
.pixel_type = FF_PIXEL_PLANAR,
.depth = 8,
- .x_chroma_shift = 1, .y_chroma_shift = 1,
+ .x_chroma_shift = 1, .y_chroma_shift = 1,
},
[PIX_FMT_YUV422P] = {
.name = "yuv422p",
@@ -79,7 +79,7 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
.color_type = FF_COLOR_YUV,
.pixel_type = FF_PIXEL_PLANAR,
.depth = 8,
- .x_chroma_shift = 1, .y_chroma_shift = 0,
+ .x_chroma_shift = 1, .y_chroma_shift = 0,
},
[PIX_FMT_YUV444P] = {
.name = "yuv444p",
@@ -87,7 +87,7 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
.color_type = FF_COLOR_YUV,
.pixel_type = FF_PIXEL_PLANAR,
.depth = 8,
- .x_chroma_shift = 0, .y_chroma_shift = 0,
+ .x_chroma_shift = 0, .y_chroma_shift = 0,
},
[PIX_FMT_YUV422] = {
.name = "yuv422",
@@ -129,7 +129,7 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
.color_type = FF_COLOR_YUV_JPEG,
.pixel_type = FF_PIXEL_PLANAR,
.depth = 8,
- .x_chroma_shift = 1, .y_chroma_shift = 1,
+ .x_chroma_shift = 1, .y_chroma_shift = 1,
},
[PIX_FMT_YUVJ422P] = {
.name = "yuvj422p",
@@ -137,7 +137,7 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
.color_type = FF_COLOR_YUV_JPEG,
.pixel_type = FF_PIXEL_PLANAR,
.depth = 8,
- .x_chroma_shift = 1, .y_chroma_shift = 0,
+ .x_chroma_shift = 1, .y_chroma_shift = 0,
},
[PIX_FMT_YUVJ444P] = {
.name = "yuvj444p",
@@ -145,7 +145,7 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
.color_type = FF_COLOR_YUV_JPEG,
.pixel_type = FF_PIXEL_PLANAR,
.depth = 8,
- .x_chroma_shift = 0, .y_chroma_shift = 0,
+ .x_chroma_shift = 0, .y_chroma_shift = 0,
},
/* RGB formats */
@@ -253,8 +253,8 @@ const char *avcodec_get_pix_fmt_name(int pix_fmt)
enum PixelFormat avcodec_get_pix_fmt(const char* name)
{
- int i;
-
+ int i;
+
for (i=0; i < PIX_FMT_NB; i++)
if (!strcmp(pix_fmt_info[i].name, name))
break;
@@ -267,7 +267,7 @@ int avpicture_fill(AVPicture *picture, uint8_t *ptr,
{
int size, w2, h2, size2;
PixFmtInfo *pinfo;
-
+
if(avcodec_check_dimensions(NULL, width, height))
goto fail;
@@ -361,15 +361,15 @@ int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height,
{
PixFmtInfo* pf = &pix_fmt_info[pix_fmt];
int i, j, w, h, data_planes;
- const unsigned char* s;
+ const unsigned char* s;
int size = avpicture_get_size(pix_fmt, width, height);
if (size > dest_size || size < 0)
return -1;
if (pf->pixel_type == FF_PIXEL_PACKED || pf->pixel_type == FF_PIXEL_PALETTE) {
- if (pix_fmt == PIX_FMT_YUV422 ||
- pix_fmt == PIX_FMT_UYVY422 ||
+ if (pix_fmt == PIX_FMT_YUV422 ||
+ pix_fmt == PIX_FMT_UYVY422 ||
pix_fmt == PIX_FMT_RGB565 ||
pix_fmt == PIX_FMT_RGB555)
w = width * 2;
@@ -379,7 +379,7 @@ int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height,
w = width;
else
w = width * (pf->depth * pf->nb_channels / 8);
-
+
data_planes = 1;
h = height;
} else {
@@ -387,7 +387,7 @@ int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height,
w = (width*pf->depth + 7)/8;
h = height;
}
-
+
for (i=0; i<data_planes; i++) {
if (i == 1) {
w = width >> pf->x_chroma_shift;
@@ -400,10 +400,10 @@ int avpicture_layout(const AVPicture* src, int pix_fmt, int width, int height,
s += src->linesize[i];
}
}
-
+
if (pf->pixel_type == FF_PIXEL_PALETTE)
memcpy((unsigned char *)(((size_t)dest + 3) & ~3), src->data[1], 256 * 4);
-
+
return size;
}
@@ -414,7 +414,7 @@ int avpicture_get_size(int pix_fmt, int width, int height)
}
/**
- * compute the loss when converting from a pixel format to another
+ * compute the loss when converting from a pixel format to another
*/
int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt,
int has_alpha)
@@ -450,7 +450,7 @@ int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt,
break;
case FF_COLOR_YUV_JPEG:
if (ps->color_type != FF_COLOR_YUV_JPEG &&
- ps->color_type != FF_COLOR_YUV &&
+ ps->color_type != FF_COLOR_YUV &&
ps->color_type != FF_COLOR_GRAY)
loss |= FF_LOSS_COLORSPACE;
break;
@@ -465,7 +465,7 @@ int avcodec_get_pix_fmt_loss(int dst_pix_fmt, int src_pix_fmt,
loss |= FF_LOSS_CHROMA;
if (!pf->is_alpha && (ps->is_alpha && has_alpha))
loss |= FF_LOSS_ALPHA;
- if (pf->pixel_type == FF_PIXEL_PALETTE &&
+ if (pf->pixel_type == FF_PIXEL_PALETTE &&
(ps->pixel_type != FF_PIXEL_PALETTE && ps->color_type != FF_COLOR_GRAY))
loss |= FF_LOSS_COLORQUANT;
return loss;
@@ -498,7 +498,7 @@ static int avg_bits_per_pixel(int pix_fmt)
if (pf->x_chroma_shift == 0 && pf->y_chroma_shift == 0) {
bits = pf->depth * pf->nb_channels;
} else {
- bits = pf->depth + ((2 * pf->depth) >>
+ bits = pf->depth + ((2 * pf->depth) >>
(pf->x_chroma_shift + pf->y_chroma_shift));
}
break;
@@ -512,7 +512,7 @@ static int avg_bits_per_pixel(int pix_fmt)
return bits;
}
-static int avcodec_find_best_pix_fmt1(int pix_fmt_mask,
+static int avcodec_find_best_pix_fmt1(int pix_fmt_mask,
int src_pix_fmt,
int has_alpha,
int loss_mask)
@@ -537,8 +537,8 @@ static int avcodec_find_best_pix_fmt1(int pix_fmt_mask,
return dst_pix_fmt;
}
-/**
- * find best pixel format to convert to. Return -1 if none found
+/**
+ * find best pixel format to convert to. Return -1 if none found
*/
int avcodec_find_best_pix_fmt(int pix_fmt_mask, int src_pix_fmt,
int has_alpha, int *loss_ptr)
@@ -558,7 +558,7 @@ int avcodec_find_best_pix_fmt(int pix_fmt_mask, int src_pix_fmt,
i = 0;
for(;;) {
loss_mask = loss_mask_order[i++];
- dst_pix_fmt = avcodec_find_best_pix_fmt1(pix_fmt_mask, src_pix_fmt,
+ dst_pix_fmt = avcodec_find_best_pix_fmt1(pix_fmt_mask, src_pix_fmt,
has_alpha, loss_mask);
if (dst_pix_fmt >= 0)
goto found;
@@ -572,11 +572,11 @@ int avcodec_find_best_pix_fmt(int pix_fmt_mask, int src_pix_fmt,
return dst_pix_fmt;
}
-static void img_copy_plane(uint8_t *dst, int dst_wrap,
+static void img_copy_plane(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height)
{
- if((!dst) || (!src))
+ if((!dst) || (!src))
return;
for(;height > 0; height--) {
memcpy(dst, src, width);
@@ -593,7 +593,7 @@ void img_copy(AVPicture *dst, const AVPicture *src,
{
int bwidth, bits, i;
PixFmtInfo *pf = &pix_fmt_info[pix_fmt];
-
+
pf = &pix_fmt_info[pix_fmt];
switch(pf->pixel_type) {
case FF_PIXEL_PACKED:
@@ -651,7 +651,7 @@ static void yuv422_to_yuv420p(AVPicture *dst, const AVPicture *src,
const uint8_t *p, *p1;
uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1;
int w;
-
+
p1 = src->data[0];
lum1 = dst->data[0];
cb1 = dst->data[1];
@@ -707,9 +707,9 @@ static void uyvy422_to_yuv420p(AVPicture *dst, const AVPicture *src,
const uint8_t *p, *p1;
uint8_t *lum, *cr, *cb, *lum1, *cr1, *cb1;
int w;
-
+
p1 = src->data[0];
-
+
lum1 = dst->data[0];
cb1 = dst->data[1];
cr1 = dst->data[2];
@@ -936,24 +936,24 @@ static void yuv420p_to_yuv422(AVPicture *dst, const AVPicture *src,
uint8_t *lum1, *lum2, *lumsrc = src->data[0];
uint8_t *cb1, *cb2 = src->data[1];
uint8_t *cr1, *cr2 = src->data[2];
-
+
for(h = height / 2; h--;) {
line1 = linesrc;
line2 = linesrc + dst->linesize[0];
-
+
lum1 = lumsrc;
lum2 = lumsrc + src->linesize[0];
-
+
cb1 = cb2;
cr1 = cr2;
-
+
for(w = width / 2; w--;) {
- *line1++ = *lum1++; *line2++ = *lum2++;
- *line1++ = *line2++ = *cb1++;
- *line1++ = *lum1++; *line2++ = *lum2++;
+ *line1++ = *lum1++; *line2++ = *lum2++;
+ *line1++ = *line2++ = *cb1++;
+ *line1++ = *lum1++; *line2++ = *lum2++;
*line1++ = *line2++ = *cr1++;
}
-
+
linesrc += dst->linesize[0] * 2;
lumsrc += src->linesize[0] * 2;
cb2 += src->linesize[1];
@@ -969,24 +969,24 @@ static void yuv420p_to_uyvy422(AVPicture *dst, const AVPicture *src,
uint8_t *lum1, *lum2, *lumsrc = src->data[0];
uint8_t *cb1, *cb2 = src->data[1];
uint8_t *cr1, *cr2 = src->data[2];
-
+
for(h = height / 2; h--;) {
line1 = linesrc;
line2 = linesrc + dst->linesize[0];
-
+
lum1 = lumsrc;
lum2 = lumsrc + src->linesize[0];
-
+
cb1 = cb2;
cr1 = cr2;
-
+
for(w = width / 2; w--;) {
- *line1++ = *line2++ = *cb1++;
- *line1++ = *lum1++; *line2++ = *lum2++;
+ *line1++ = *line2++ = *cb1++;
+ *line1++ = *lum1++; *line2++ = *lum2++;
*line1++ = *line2++ = *cr1++;
- *line1++ = *lum1++; *line2++ = *lum2++;
+ *line1++ = *lum1++; *line2++ = *lum2++;
}
-
+
linesrc += dst->linesize[0] * 2;
lumsrc += src->linesize[0] * 2;
cb2 += src->linesize[1];
@@ -1095,7 +1095,7 @@ static void img_convert_init(void)
}
/* apply to each pixel the given table */
-static void img_apply_table(uint8_t *dst, int dst_wrap,
+static void img_apply_table(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height, const uint8_t *table1)
{
@@ -1133,7 +1133,7 @@ static void img_apply_table(uint8_t *dst, int dst_wrap,
/* XXX: in most cases, the sampling position is incorrect */
/* 4x1 -> 1x1 */
-static void shrink41(uint8_t *dst, int dst_wrap,
+static void shrink41(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height)
{
@@ -1155,7 +1155,7 @@ static void shrink41(uint8_t *dst, int dst_wrap,
}
/* 2x1 -> 1x1 */
-static void shrink21(uint8_t *dst, int dst_wrap,
+static void shrink21(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height)
{
@@ -1177,7 +1177,7 @@ static void shrink21(uint8_t *dst, int dst_wrap,
}
/* 1x2 -> 1x1 */
-static void shrink12(uint8_t *dst, int dst_wrap,
+static void shrink12(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height)
{
@@ -1210,7 +1210,7 @@ static void shrink12(uint8_t *dst, int dst_wrap,
}
/* 2x2 -> 1x1 */
-static void shrink22(uint8_t *dst, int dst_wrap,
+static void shrink22(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height)
{
@@ -1243,7 +1243,7 @@ static void shrink22(uint8_t *dst, int dst_wrap,
}
/* 4x4 -> 1x1 */
-static void shrink44(uint8_t *dst, int dst_wrap,
+static void shrink44(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height)
{
@@ -1371,7 +1371,7 @@ static void grow44(uint8_t *dst, int dst_wrap,
}
/* 1x2 -> 2x1 */
-static void conv411(uint8_t *dst, int dst_wrap,
+static void conv411(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height)
{
@@ -1419,7 +1419,7 @@ static void build_rgb_palette(uint8_t *palette, int has_alpha)
for(r = 0; r < 6; r++) {
for(g = 0; g < 6; g++) {
for(b = 0; b < 6; b++) {
- pal[i++] = (0xff << 24) | (pal_value[r] << 16) |
+ pal[i++] = (0xff << 24) | (pal_value[r] << 16) |
(pal_value[g] << 8) | pal_value[b];
}
}
@@ -1584,7 +1584,7 @@ static void mono_to_gray(AVPicture *dst, const AVPicture *src,
q = dst->data[0];
dst_wrap = dst->linesize[0] - width;
for(y=0;y<height;y++) {
- w = width;
+ w = width;
while (w >= 8) {
v = *p++ ^ xor_mask;
q[0] = -(v >> 7);
@@ -1688,7 +1688,7 @@ typedef struct ConvertEntry {
to convert from any format to any format, the following constraints
must be satisfied:
- - all FF_COLOR_RGB formats must convert to and from PIX_FMT_RGB24
+ - all FF_COLOR_RGB formats must convert to and from PIX_FMT_RGB24
- all FF_COLOR_GRAY formats must convert to and from PIX_FMT_GRAY8
@@ -1706,213 +1706,213 @@ static ConvertEntry convert_table[PIX_FMT_NB][PIX_FMT_NB] = {
[PIX_FMT_YUV422] = {
.convert = yuv420p_to_yuv422,
},
- [PIX_FMT_RGB555] = {
+ [PIX_FMT_RGB555] = {
.convert = yuv420p_to_rgb555
},
- [PIX_FMT_RGB565] = {
+ [PIX_FMT_RGB565] = {
.convert = yuv420p_to_rgb565
},
- [PIX_FMT_BGR24] = {
+ [PIX_FMT_BGR24] = {
.convert = yuv420p_to_bgr24
},
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_RGB24] = {
.convert = yuv420p_to_rgb24
},
- [PIX_FMT_RGBA32] = {
+ [PIX_FMT_RGBA32] = {
.convert = yuv420p_to_rgba32
},
- [PIX_FMT_UYVY422] = {
+ [PIX_FMT_UYVY422] = {
.convert = yuv420p_to_uyvy422,
},
},
- [PIX_FMT_YUV422P] = {
- [PIX_FMT_YUV422] = {
+ [PIX_FMT_YUV422P] = {
+ [PIX_FMT_YUV422] = {
.convert = yuv422p_to_yuv422,
},
- [PIX_FMT_UYVY422] = {
+ [PIX_FMT_UYVY422] = {
.convert = yuv422p_to_uyvy422,
},
},
- [PIX_FMT_YUV444P] = {
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_YUV444P] = {
+ [PIX_FMT_RGB24] = {
.convert = yuv444p_to_rgb24
},
},
[PIX_FMT_YUVJ420P] = {
- [PIX_FMT_RGB555] = {
+ [PIX_FMT_RGB555] = {
.convert = yuvj420p_to_rgb555
},
- [PIX_FMT_RGB565] = {
+ [PIX_FMT_RGB565] = {
.convert = yuvj420p_to_rgb565
},
- [PIX_FMT_BGR24] = {
+ [PIX_FMT_BGR24] = {
.convert = yuvj420p_to_bgr24
},
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_RGB24] = {
.convert = yuvj420p_to_rgb24
},
- [PIX_FMT_RGBA32] = {
+ [PIX_FMT_RGBA32] = {
.convert = yuvj420p_to_rgba32
},
},
- [PIX_FMT_YUVJ444P] = {
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_YUVJ444P] = {
+ [PIX_FMT_RGB24] = {
.convert = yuvj444p_to_rgb24
},
},
- [PIX_FMT_YUV422] = {
- [PIX_FMT_YUV420P] = {
+ [PIX_FMT_YUV422] = {
+ [PIX_FMT_YUV420P] = {
.convert = yuv422_to_yuv420p,
},
- [PIX_FMT_YUV422P] = {
+ [PIX_FMT_YUV422P] = {
.convert = yuv422_to_yuv422p,
},
},
- [PIX_FMT_UYVY422] = {
- [PIX_FMT_YUV420P] = {
+ [PIX_FMT_UYVY422] = {
+ [PIX_FMT_YUV420P] = {
.convert = uyvy422_to_yuv420p,
},
- [PIX_FMT_YUV422P] = {
+ [PIX_FMT_YUV422P] = {
.convert = uyvy422_to_yuv422p,
},
},
[PIX_FMT_RGB24] = {
- [PIX_FMT_YUV420P] = {
+ [PIX_FMT_YUV420P] = {
.convert = rgb24_to_yuv420p
},
- [PIX_FMT_RGB565] = {
+ [PIX_FMT_RGB565] = {
.convert = rgb24_to_rgb565
},
- [PIX_FMT_RGB555] = {
+ [PIX_FMT_RGB555] = {
.convert = rgb24_to_rgb555
},
- [PIX_FMT_RGBA32] = {
+ [PIX_FMT_RGBA32] = {
.convert = rgb24_to_rgba32
},
- [PIX_FMT_BGR24] = {
+ [PIX_FMT_BGR24] = {
.convert = rgb24_to_bgr24
},
- [PIX_FMT_GRAY8] = {
+ [PIX_FMT_GRAY8] = {
.convert = rgb24_to_gray
},
[PIX_FMT_PAL8] = {
.convert = rgb24_to_pal8
},
- [PIX_FMT_YUV444P] = {
+ [PIX_FMT_YUV444P] = {
.convert = rgb24_to_yuv444p
},
- [PIX_FMT_YUVJ420P] = {
+ [PIX_FMT_YUVJ420P] = {
.convert = rgb24_to_yuvj420p
},
- [PIX_FMT_YUVJ444P] = {
+ [PIX_FMT_YUVJ444P] = {
.convert = rgb24_to_yuvj444p
},
},
[PIX_FMT_RGBA32] = {
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_RGB24] = {
.convert = rgba32_to_rgb24
},
- [PIX_FMT_RGB555] = {
+ [PIX_FMT_RGB555] = {
.convert = rgba32_to_rgb555
},
- [PIX_FMT_PAL8] = {
+ [PIX_FMT_PAL8] = {
.convert = rgba32_to_pal8
},
- [PIX_FMT_YUV420P] = {
+ [PIX_FMT_YUV420P] = {
.convert = rgba32_to_yuv420p
},
- [PIX_FMT_GRAY8] = {
+ [PIX_FMT_GRAY8] = {
.convert = rgba32_to_gray
},
},
[PIX_FMT_BGR24] = {
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_RGB24] = {
.convert = bgr24_to_rgb24
},
- [PIX_FMT_YUV420P] = {
+ [PIX_FMT_YUV420P] = {
.convert = bgr24_to_yuv420p
},
- [PIX_FMT_GRAY8] = {
+ [PIX_FMT_GRAY8] = {
.convert = bgr24_to_gray
},
},
[PIX_FMT_RGB555] = {
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_RGB24] = {
.convert = rgb555_to_rgb24
},
- [PIX_FMT_RGBA32] = {
+ [PIX_FMT_RGBA32] = {
.convert = rgb555_to_rgba32
},
- [PIX_FMT_YUV420P] = {
+ [PIX_FMT_YUV420P] = {
.convert = rgb555_to_yuv420p
},
- [PIX_FMT_GRAY8] = {
+ [PIX_FMT_GRAY8] = {
.convert = rgb555_to_gray
},
},
[PIX_FMT_RGB565] = {
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_RGB24] = {
.convert = rgb565_to_rgb24
},
- [PIX_FMT_YUV420P] = {
+ [PIX_FMT_YUV420P] = {
.convert = rgb565_to_yuv420p
},
- [PIX_FMT_GRAY8] = {
+ [PIX_FMT_GRAY8] = {
.convert = rgb565_to_gray
},
},
[PIX_FMT_GRAY8] = {
- [PIX_FMT_RGB555] = {
+ [PIX_FMT_RGB555] = {
.convert = gray_to_rgb555
},
- [PIX_FMT_RGB565] = {
+ [PIX_FMT_RGB565] = {
.convert = gray_to_rgb565
},
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_RGB24] = {
.convert = gray_to_rgb24
},
- [PIX_FMT_BGR24] = {
+ [PIX_FMT_BGR24] = {
.convert = gray_to_bgr24
},
- [PIX_FMT_RGBA32] = {
+ [PIX_FMT_RGBA32] = {
.convert = gray_to_rgba32
},
- [PIX_FMT_MONOWHITE] = {
+ [PIX_FMT_MONOWHITE] = {
.convert = gray_to_monowhite
},
- [PIX_FMT_MONOBLACK] = {
+ [PIX_FMT_MONOBLACK] = {
.convert = gray_to_monoblack
},
},
[PIX_FMT_MONOWHITE] = {
- [PIX_FMT_GRAY8] = {
+ [PIX_FMT_GRAY8] = {
.convert = monowhite_to_gray
},
},
[PIX_FMT_MONOBLACK] = {
- [PIX_FMT_GRAY8] = {
+ [PIX_FMT_GRAY8] = {
.convert = monoblack_to_gray
},
},
[PIX_FMT_PAL8] = {
- [PIX_FMT_RGB555] = {
+ [PIX_FMT_RGB555] = {
.convert = pal8_to_rgb555
},
- [PIX_FMT_RGB565] = {
+ [PIX_FMT_RGB565] = {
.convert = pal8_to_rgb565
},
- [PIX_FMT_BGR24] = {
+ [PIX_FMT_BGR24] = {
.convert = pal8_to_bgr24
},
- [PIX_FMT_RGB24] = {
+ [PIX_FMT_RGB24] = {
.convert = pal8_to_rgb24
},
- [PIX_FMT_RGBA32] = {
+ [PIX_FMT_RGBA32] = {
.convert = pal8_to_rgba32
},
},
- [PIX_FMT_UYVY411] = {
- [PIX_FMT_YUV411P] = {
+ [PIX_FMT_UYVY411] = {
+ [PIX_FMT_YUV411P] = {
.convert = uyvy411_to_yuv411p,
},
},
@@ -1947,13 +1947,13 @@ void avpicture_free(AVPicture *picture)
static inline int is_yuv_planar(PixFmtInfo *ps)
{
return (ps->color_type == FF_COLOR_YUV ||
- ps->color_type == FF_COLOR_YUV_JPEG) &&
+ ps->color_type == FF_COLOR_YUV_JPEG) &&
ps->pixel_type == FF_PIXEL_PLANAR;
}
/* XXX: always use linesize. Return -1 if not supported */
int img_convert(AVPicture *dst, int dst_pix_fmt,
- const AVPicture *src, int src_pix_fmt,
+ const AVPicture *src, int src_pix_fmt,
int src_width, int src_height)
{
static int inited;
@@ -2023,7 +2023,7 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
}
/* YUV to gray */
- if (is_yuv_planar(src_pix) &&
+ if (is_yuv_planar(src_pix) &&
dst_pix_fmt == PIX_FMT_GRAY8) {
if (src_pix->color_type == FF_COLOR_YUV_JPEG) {
img_copy_plane(dst->data[0], dst->linesize[0],
@@ -2041,7 +2041,7 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
/* YUV to YUV planar */
if (is_yuv_planar(dst_pix) && is_yuv_planar(src_pix)) {
int x_shift, y_shift, w, h, xy_shift;
- void (*resize_func)(uint8_t *dst, int dst_wrap,
+ void (*resize_func)(uint8_t *dst, int dst_wrap,
const uint8_t *src, int src_wrap,
int width, int height);
@@ -2128,7 +2128,7 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
for(i = 1;i <= 2; i++)
img_apply_table(dst->data[i], dst->linesize[i],
dst->data[i], dst->linesize[i],
- dst_width>>dst_pix->x_chroma_shift,
+ dst_width>>dst_pix->x_chroma_shift,
dst_height>>dst_pix->y_chroma_shift,
c_table);
}
@@ -2150,12 +2150,12 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
/* specific case: convert to YUV411P first */
int_pix_fmt = PIX_FMT_YUV411P;
} else if ((src_pix->color_type == FF_COLOR_GRAY &&
- src_pix_fmt != PIX_FMT_GRAY8) ||
+ src_pix_fmt != PIX_FMT_GRAY8) ||
(dst_pix->color_type == FF_COLOR_GRAY &&
dst_pix_fmt != PIX_FMT_GRAY8)) {
/* gray8 is the normalized format */
int_pix_fmt = PIX_FMT_GRAY8;
- } else if ((is_yuv_planar(src_pix) &&
+ } else if ((is_yuv_planar(src_pix) &&
src_pix_fmt != PIX_FMT_YUV444P &&
src_pix_fmt != PIX_FMT_YUVJ444P)) {
/* yuv444 is the normalized format */
@@ -2163,7 +2163,7 @@ int img_convert(AVPicture *dst, int dst_pix_fmt,
int_pix_fmt = PIX_FMT_YUVJ444P;
else
int_pix_fmt = PIX_FMT_YUV444P;
- } else if ((is_yuv_planar(dst_pix) &&
+ } else if ((is_yuv_planar(dst_pix) &&
dst_pix_fmt != PIX_FMT_YUV444P &&
dst_pix_fmt != PIX_FMT_YUVJ444P)) {
/* yuv444 is the normalized format */
@@ -2200,7 +2200,7 @@ static int get_alpha_info_pal8(const AVPicture *src, int width, int height)
int src_wrap, ret, x, y;
unsigned int a;
uint32_t *palette = (uint32_t *)src->data[1];
-
+
p = src->data[0];
src_wrap = src->linesize[0] - width;
ret = 0;
@@ -2299,9 +2299,9 @@ int img_get_alpha_info(const AVPicture *src,
#endif
/* filter parameters: [-1 4 2 4 -1] // 8 */
-static void deinterlace_line(uint8_t *dst,
- const uint8_t *lum_m4, const uint8_t *lum_m3,
- const uint8_t *lum_m2, const uint8_t *lum_m1,
+static void deinterlace_line(uint8_t *dst,
+ const uint8_t *lum_m4, const uint8_t *lum_m3,
+ const uint8_t *lum_m2, const uint8_t *lum_m1,
const uint8_t *lum,
int size)
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-11 16:40:21 +0000