mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoconvert: fix offset and scale for GRAY

Browse source 
Fix the calculation of the offset and scale values for GRAY formats. We also
need to set the offset and base of the chroma values to match what the unpack
function creates.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=679612
This commit is contained in:
Wim Taymans 2012-07-10 11:06:02 +02:00
parent 566b5c4d1d
commit aa261162d2
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/videoconvert/videoconvert.c
View file

@ -221,7 +221,8 @@ get_offset_scale (const GstVideoFormatInfo * finfo, GstVideoColorRange range,
break; break;
} }
if (GST_VIDEO_FORMAT_INFO_IS_YUV (finfo)) { if (GST_VIDEO_FORMAT_INFO_IS_YUV (finfo) ||
GST_VIDEO_FORMAT_INFO_IS_GRAY (finfo)) {
offset[0] = 0; offset[0] = 0;
offset[1] = baseL; offset[1] = baseL;
offset[2] = offset[3] = baseC; offset[2] = offset[3] = baseC;
@ -233,15 +234,12 @@ get_offset_scale (const GstVideoFormatInfo * finfo, GstVideoColorRange range,
offset[1] = offset[2] = offset[3] = baseL; offset[1] = offset[2] = offset[3] = baseL;
scale[0] = 0; scale[0] = 0;
scale[1] = scale[2] = scale[3] = maxL - minL; scale[1] = scale[2] = scale[3] = maxL - minL;
} else if (GST_VIDEO_FORMAT_INFO_IS_GRAY (finfo)) {
offset[0] = offset[2] = offset[3] = 0;
offset[1] = baseL;
scale[0] = scale[2] = scale[3] = 0;
scale[1] = maxL - minL;
} else { } else {
offset[0] = offset[1] = offset[2] = offset[3] = 0; offset[0] = offset[1] = offset[2] = offset[3] = 0;
scale[0] = scale[1] = scale[2] = scale[3] = (maxL - minL); scale[0] = scale[1] = scale[2] = scale[3] = (maxL - minL);
} }
GST_DEBUG ("scale: %d %d %d %d", scale[0], scale[1], scale[2], scale[3]);
GST_DEBUG ("offset: %d %d %d %d", offset[0], offset[1], offset[2], offset[3]);
} }
static gboolean static gboolean
@ -273,6 +271,7 @@ get_Kr_Kb (GstVideoColorMatrix matrix, gdouble * Kr, gdouble * Kb)
*Kb = 0.087; *Kb = 0.087;
break; break;
} }
GST_DEBUG ("matrix: %d, Kr %f, Kb %f", matrix, *Kr, *Kb);
return res; return res;
} }
@ -319,12 +318,14 @@ videoconvert_convert_compute_matrix (VideoConvert * convert)
else else
depth = 8; depth = 8;
GST_DEBUG ("depth: %d", depth);
color_matrix_set_identity (&dst); color_matrix_set_identity (&dst);
/* 1, bring color components to [0..1.0] range */ /* 1, bring color components to [0..1.0] range */
get_offset_scale (sfinfo, in_info->colorimetry.range, depth, offset, scale); get_offset_scale (sfinfo, in_info->colorimetry.range, depth, offset, scale);
color_matrix_offset_components (&dst, -offset[1], -offset[2], -offset[3]); color_matrix_offset_components (&dst, -offset[1], -offset[2], -offset[3]);
color_matrix_scale_components (&dst, 1 / ((float) scale[1]), color_matrix_scale_components (&dst, 1 / ((float) scale[1]),
1 / ((float) scale[2]), 1 / ((float) scale[3])); 1 / ((float) scale[2]), 1 / ((float) scale[3]));
@ -348,6 +349,7 @@ videoconvert_convert_compute_matrix (VideoConvert * convert)
get_offset_scale (dfinfo, out_info->colorimetry.range, depth, offset, scale); get_offset_scale (dfinfo, out_info->colorimetry.range, depth, offset, scale);
color_matrix_scale_components (&dst, (float) scale[1], (float) scale[2], color_matrix_scale_components (&dst, (float) scale[1], (float) scale[2],
(float) scale[3]); (float) scale[3]);
color_matrix_offset_components (&dst, offset[1], offset[2], offset[3]); color_matrix_offset_components (&dst, offset[1], offset[2], offset[3]);
/* because we're doing 8-bit matrix coefficients */ /* because we're doing 8-bit matrix coefficients */