mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/ffmpegcolorspace/imgconvert.c: Patch 1.3 broke the ordering of the colorspace info and made the plugin basically ...

Browse source 
Original commit message from CVS:
* gst/ffmpegcolorspace/imgconvert.c: (img_convert):
Patch 1.3 broke the ordering of the colorspace info and
made the plugin basically work by coincidence, reodered
the info.
This commit is contained in:
Wim Taymans 2004-06-14 13:19:39 +00:00
parent 88cf80dc19
commit f1a3a74db3
2 changed files with 75 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2004-06-14 Wim Taymans <wim@fluendo.com>
* gst/ffmpegcolorspace/imgconvert.c: (img_convert):
Patch 1.3 broke the ordering of the colorspace info and
made the plugin basically work by coincidence, reodered
the info.
2004-06-14 Thomas Vander Stichele <thomas at apestaart dot org> 2004-06-14 Thomas Vander Stichele <thomas at apestaart dot org>
* ext/lame/gstlame.c: * ext/lame/gstlame.c:

142
gst/ffmpegcolorspace/imgconvert.c
View file

@ -80,6 +80,36 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
/* .y_chroma_shift = */ 1, /* .y_chroma_shift = */ 1,
/* .depth = */ 8, /* .depth = */ 8,
}, },
/* [PIX_FMT_YUV422] = */ {
/* .name = */ "yuv422",
/* .nb_channels = */ 1,
/* .color_type = */ FF_COLOR_YUV,
/* .pixel_type = */ FF_PIXEL_PACKED,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 1,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* [PIX_FMT_RGB24] = */ {
/* .name = */ "rgb24",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_RGB,
/* .pixel_type = */ FF_PIXEL_PACKED,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 0,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* [PIX_FMT_BGR24] = */ {
/* .name = */ "bgr24",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_RGB,
/* .pixel_type = */ FF_PIXEL_PACKED,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 0,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* [PIX_FMT_YUV422P] = */ { /* [PIX_FMT_YUV422P] = */ {
/* .name = */ "yuv422p", /* .name = */ "yuv422p",
/* .nb_channels = */ 3, /* .nb_channels = */ 3,
@ -100,13 +130,13 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
/* .y_chroma_shift = */ 0, /* .y_chroma_shift = */ 0,
/* .depth = */ 8, /* .depth = */ 8,
}, },
/* [PIX_FMT_YUV422] = */ { /* [PIX_FMT_RGBA32] = */ {
/* .name = */ "yuv422", /* .name = */ "rgba32",
/* .nb_channels = */ 1, /* .nb_channels = */ 4,
/* .color_type = */ FF_COLOR_YUV, /* .color_type = */ FF_COLOR_RGB,
/* .pixel_type = */ FF_PIXEL_PACKED, /* .pixel_type = */ FF_PIXEL_PACKED,
/* .is_alpha = */ 0, /* .is_alpha = */ 1,
/* .x_chroma_shift = */ 1, /* .x_chroma_shift = */ 0,
/* .y_chroma_shift = */ 0, /* .y_chroma_shift = */ 0,
/* .depth = */ 8, /* .depth = */ 8,
}, },
@ -130,70 +160,6 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
/* .y_chroma_shift = */ 0, /* .y_chroma_shift = */ 0,
/* .depth = */ 8, /* .depth = */ 8,
}, },
/* JPEG YUV */
/* [PIX_FMT_YUVJ420P] = */ {
/* .name = */ "yuvj420p",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_YUV_JPEG,
/* .pixel_type = */ FF_PIXEL_PLANAR,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 1,
/* .y_chroma_shift = */ 1,
/* .depth = */ 8,
},
/* [PIX_FMT_YUVJ422P] = */ {
/* .name = */ "yuvj422p",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_YUV_JPEG,
/* .pixel_type = */ FF_PIXEL_PLANAR,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 1,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* [PIX_FMT_YUVJ444P] = */ {
/* .name = */ "yuvj444p",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_YUV_JPEG,
/* .pixel_type = */ FF_PIXEL_PLANAR,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 0,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* RGB formats */
/* [PIX_FMT_RGB24] = */ {
/* .name = */ "rgb24",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_RGB,
/* .pixel_type = */ FF_PIXEL_PACKED,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 0,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* [PIX_FMT_BGR24] = */ {
/* .name = */ "bgr24",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_RGB,
/* .pixel_type = */ FF_PIXEL_PACKED,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 0,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* [PIX_FMT_RGBA32] = */ {
/* .name = */ "rgba32",
/* .nb_channels = */ 4,
/* .color_type = */ FF_COLOR_RGB,
/* .pixel_type = */ FF_PIXEL_PACKED,
/* .is_alpha = */ 1,
/* .x_chroma_shift = */ 0,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* [PIX_FMT_RGB565] = */ { /* [PIX_FMT_RGB565] = */ {
/* .name = */ "rgb565", /* .name = */ "rgb565",
/* .nb_channels = */ 3, /* .nb_channels = */ 3,
@ -214,8 +180,6 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
/* .y_chroma_shift = */ 0, /* .y_chroma_shift = */ 0,
/* .depth = */ 5, /* .depth = */ 5,
}, },
/* gray / mono formats */
/* [PIX_FMT_GRAY8] = */ { /* [PIX_FMT_GRAY8] = */ {
/* .name = */ "gray", /* .name = */ "gray",
/* .nb_channels = */ 1, /* .nb_channels = */ 1,
@ -246,8 +210,6 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
/* .y_chroma_shift = */ 0, /* .y_chroma_shift = */ 0,
/* .depth = */ 1, /* .depth = */ 1,
}, },
/* paletted formats */
/* [PIX_FMT_PAL8] = */ { /* [PIX_FMT_PAL8] = */ {
/* .name = */ "pal8", /* .name = */ "pal8",
/* .nb_channels = */ 4, /* .nb_channels = */ 4,
@ -258,6 +220,37 @@ static PixFmtInfo pix_fmt_info[PIX_FMT_NB] = {
/* .y_chroma_shift = */ 0, /* .y_chroma_shift = */ 0,
/* .depth = */ 8, /* .depth = */ 8,
}, },
/* JPEG YUV */
/* [PIX_FMT_YUVJ420P] = */ {
/* .name = */ "yuvj420p",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_YUV_JPEG,
/* .pixel_type = */ FF_PIXEL_PLANAR,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 1,
/* .y_chroma_shift = */ 1,
/* .depth = */ 8,
},
/* [PIX_FMT_YUVJ422P] = */ {
/* .name = */ "yuvj422p",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_YUV_JPEG,
/* .pixel_type = */ FF_PIXEL_PLANAR,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 1,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
/* [PIX_FMT_YUVJ444P] = */ {
/* .name = */ "yuvj444p",
/* .nb_channels = */ 3,
/* .color_type = */ FF_COLOR_YUV_JPEG,
/* .pixel_type = */ FF_PIXEL_PLANAR,
/* .is_alpha = */ 0,
/* .x_chroma_shift = */ 0,
/* .y_chroma_shift = */ 0,
/* .depth = */ 8,
},
}; };
void void
@ -1635,6 +1628,7 @@ img_convert (AVPicture * dst, int dst_pix_fmt,
dst_pix = &pix_fmt_info[dst_pix_fmt]; dst_pix = &pix_fmt_info[dst_pix_fmt];
src_pix = &pix_fmt_info[src_pix_fmt]; src_pix = &pix_fmt_info[src_pix_fmt];
if (src_pix_fmt == dst_pix_fmt) { if (src_pix_fmt == dst_pix_fmt) {
/* no conversion needed: just copy */ /* no conversion needed: just copy */
img_copy (dst, src, dst_pix_fmt, dst_width, dst_height); img_copy (dst, src, dst_pix_fmt, dst_width, dst_height);