mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-18 05:16:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

video.{c,h}: Fix an endianness bug fix.

Browse source 
This commit makes sure the endianness is ok for RGB/BGR 15/16 formats.
This commit is contained in:
Martin Bisson 2010-06-01 16:45:34 +00:00 committed by Sebastian Dröge
parent f5a690f860
commit b8f330dea6
2 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gst-libs/gst/video/video.c
View file

@ -384,7 +384,7 @@ gst_video_format_parse_caps (GstCaps * caps, GstVideoFormat * format,
ok = FALSE; ok = FALSE;
} }
} else if ((depth == 15 || depth == 16) && bpp == 16 && } else if ((depth == 15 || depth == 16) && bpp == 16 &&
endianness == G_BIG_ENDIAN) { endianness == G_BYTE_ORDER) {
*format = gst_video_format_from_rgb16_masks (red_mask, green_mask, *format = gst_video_format_from_rgb16_masks (red_mask, green_mask,
blue_mask); blue_mask);
if (*format == GST_VIDEO_FORMAT_UNKNOWN) { if (*format == GST_VIDEO_FORMAT_UNKNOWN) {
@ -513,9 +513,9 @@ gst_video_parse_caps_pixel_aspect_ratio (GstCaps * caps, int *par_n, int *par_d)
* Returns: a new #GstCaps object, or NULL if there was an error * Returns: a new #GstCaps object, or NULL if there was an error
*/ */
GstCaps * GstCaps *
gst_video_format_new_caps_interlaced (GstVideoFormat format, int width, gst_video_format_new_caps_interlaced (GstVideoFormat format,
int height, int framerate_n, int framerate_d, int par_n, int par_d, int width, int height, int framerate_n, int framerate_d, int par_n,
gboolean interlaced) int par_d, gboolean interlaced)
{ {
GstCaps *res; GstCaps *res;
@ -545,8 +545,8 @@ gst_video_format_new_caps_interlaced (GstVideoFormat format, int width,
* Returns: a new #GstCaps object, or NULL if there was an error * Returns: a new #GstCaps object, or NULL if there was an error
*/ */
GstCaps * GstCaps *
gst_video_format_new_caps (GstVideoFormat format, int width, int height, gst_video_format_new_caps (GstVideoFormat format, int width,
int framerate_n, int framerate_d, int par_n, int par_d) int height, int framerate_n, int framerate_d, int par_n, int par_d)
{ {
g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, NULL); g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, NULL);
g_return_val_if_fail (width > 0 && height > 0, NULL); g_return_val_if_fail (width > 0 && height > 0, NULL);
@ -615,14 +615,14 @@ gst_video_format_new_caps (GstVideoFormat format, int width, int height,
mask = 0xff0000; mask = 0xff0000;
} }
red_mask = red_mask =
mask >> (8 * gst_video_format_get_component_offset (format, 0, width, mask >> (8 * gst_video_format_get_component_offset (format, 0,
height)); width, height));
green_mask = green_mask =
mask >> (8 * gst_video_format_get_component_offset (format, 1, width, mask >> (8 * gst_video_format_get_component_offset (format, 1,
height)); width, height));
blue_mask = blue_mask =
mask >> (8 * gst_video_format_get_component_offset (format, 2, width, mask >> (8 * gst_video_format_get_component_offset (format, 2,
height)); width, height));
} else if (bpp == 16) { } else if (bpp == 16) {
switch (format) { switch (format) {
case GST_VIDEO_FORMAT_RGB16: case GST_VIDEO_FORMAT_RGB16:
@ -666,8 +666,8 @@ gst_video_format_new_caps (GstVideoFormat format, int width, int height,
"pixel-aspect-ratio", GST_TYPE_FRACTION, par_n, par_d, NULL); "pixel-aspect-ratio", GST_TYPE_FRACTION, par_n, par_d, NULL);
if (have_alpha) { if (have_alpha) {
alpha_mask = alpha_mask =
mask >> (8 * gst_video_format_get_component_offset (format, 3, width, mask >> (8 * gst_video_format_get_component_offset (format, 3,
height)); width, height));
gst_caps_set_simple (caps, "alpha_mask", G_TYPE_INT, alpha_mask, NULL); gst_caps_set_simple (caps, "alpha_mask", G_TYPE_INT, alpha_mask, NULL);
} }
return caps; return caps;
@ -869,8 +869,8 @@ gst_video_format_from_rgb32_masks (int red_mask, int green_mask, int blue_mask)
} }
static GstVideoFormat static GstVideoFormat
gst_video_format_from_rgba32_masks (int red_mask, int green_mask, int blue_mask, gst_video_format_from_rgba32_masks (int red_mask, int green_mask,
int alpha_mask) int blue_mask, int alpha_mask)
{ {
if (red_mask == 0xff000000 && green_mask == 0x00ff0000 && if (red_mask == 0xff000000 && green_mask == 0x00ff0000 &&
blue_mask == 0x0000ff00 && alpha_mask == 0x000000ff) { blue_mask == 0x0000ff00 && alpha_mask == 0x000000ff) {
@ -1297,8 +1297,8 @@ gst_video_format_get_pixel_stride (GstVideoFormat format, int component)
* Returns: width of component @component * Returns: width of component @component
*/ */
int int
gst_video_format_get_component_width (GstVideoFormat format, int component, gst_video_format_get_component_width (GstVideoFormat format,
int width) int component, int width)
{ {
g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0); g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
g_return_val_if_fail (component >= 0 && component <= 3, 0); g_return_val_if_fail (component >= 0 && component <= 3, 0);
@ -1369,8 +1369,8 @@ gst_video_format_get_component_width (GstVideoFormat format, int component,
* Returns: height of component @component * Returns: height of component @component
*/ */
int int
gst_video_format_get_component_height (GstVideoFormat format, int component, gst_video_format_get_component_height (GstVideoFormat format,
int height) int component, int height)
{ {
g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0); g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
g_return_val_if_fail (component >= 0 && component <= 3, 0); g_return_val_if_fail (component >= 0 && component <= 3, 0);
@ -1440,8 +1440,8 @@ gst_video_format_get_component_height (GstVideoFormat format, int component,
* Returns: offset of component @component * Returns: offset of component @component
*/ */
int int
gst_video_format_get_component_offset (GstVideoFormat format, int component, gst_video_format_get_component_offset (GstVideoFormat format,
int width, int height) int component, int width, int height)
{ {
g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0); g_return_val_if_fail (format != GST_VIDEO_FORMAT_UNKNOWN, 0);
g_return_val_if_fail (component >= 0 && component <= 3, 0); g_return_val_if_fail (component >= 0 && component <= 3, 0);

6
gst-libs/gst/video/video.h
View file

@ -96,7 +96,7 @@ typedef enum {
GST_VIDEO_FORMAT_GRAY16_LE, GST_VIDEO_FORMAT_GRAY16_LE,
GST_VIDEO_FORMAT_v308, GST_VIDEO_FORMAT_v308,
GST_VIDEO_FORMAT_Y800, GST_VIDEO_FORMAT_Y800,
GST_VIDEO_FORMAT_Y16 GST_VIDEO_FORMAT_Y16,
GST_VIDEO_FORMAT_RGB16, GST_VIDEO_FORMAT_RGB16,
GST_VIDEO_FORMAT_BGR16, GST_VIDEO_FORMAT_BGR16,
GST_VIDEO_FORMAT_RGB15, GST_VIDEO_FORMAT_RGB15,
@ -182,7 +182,7 @@ typedef enum {
"video/x-raw-rgb, " \ "video/x-raw-rgb, " \
"bpp = (int) 16, " \ "bpp = (int) 16, " \
"depth = (int) 16, " \ "depth = (int) 16, " \
"endianness = (int) BIG_ENDIAN, " \ "endianness = (int) BYTE_ORDER, " \
"red_mask = (int) " GST_VIDEO_COMP ## R ## _MASK_16 ", " \ "red_mask = (int) " GST_VIDEO_COMP ## R ## _MASK_16 ", " \
"green_mask = (int) " GST_VIDEO_COMP ## G ## _MASK_16 ", " \ "green_mask = (int) " GST_VIDEO_COMP ## G ## _MASK_16 ", " \
"blue_mask = (int) " GST_VIDEO_COMP ## B ## _MASK_16 ", " \ "blue_mask = (int) " GST_VIDEO_COMP ## B ## _MASK_16 ", " \
@ -194,7 +194,7 @@ typedef enum {
"video/x-raw-rgb, " \ "video/x-raw-rgb, " \
"bpp = (int) 16, " \ "bpp = (int) 16, " \
"depth = (int) 15, " \ "depth = (int) 15, " \
"endianness = (int) BIG_ENDIAN, " \ "endianness = (int) BYTE_ORDER, " \
"red_mask = (int) " GST_VIDEO_COMP ## R ## _MASK_15 ", " \ "red_mask = (int) " GST_VIDEO_COMP ## R ## _MASK_15 ", " \
"green_mask = (int) " GST_VIDEO_COMP ## G ## _MASK_15 ", " \ "green_mask = (int) " GST_VIDEO_COMP ## G ## _MASK_15 ", " \
"blue_mask = (int) " GST_VIDEO_COMP ## B ## _MASK_15 ", " \ "blue_mask = (int) " GST_VIDEO_COMP ## B ## _MASK_15 ", " \