mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoconvert: use one matrix function

Browse source 
Use only one matrix function pointer, let the implementation cast the pixels to
the right size.
This commit is contained in:
Wim Taymans 2013-03-30 17:20:42 +01:00
parent 43a9bfae78
commit bc4238f959
2 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
gst/videoconvert/videoconvert.c
View file

@ -33,10 +33,10 @@
static void videoconvert_convert_generic (VideoConvert * convert, static void videoconvert_convert_generic (VideoConvert * convert,
GstVideoFrame * dest, const GstVideoFrame * src); GstVideoFrame * dest, const GstVideoFrame * src);
static void videoconvert_convert_matrix (VideoConvert * convert, static void videoconvert_convert_matrix8 (VideoConvert * convert,
guint8 * pixels); gpointer pixels);
static void videoconvert_convert_matrix16 (VideoConvert * convert, static void videoconvert_convert_matrix16 (VideoConvert * convert,
guint16 * pixels); gpointer pixels);
static gboolean videoconvert_convert_lookup_fastpath (VideoConvert * convert); static gboolean videoconvert_convert_lookup_fastpath (VideoConvert * convert);
static gboolean videoconvert_convert_compute_matrix (VideoConvert * convert); static gboolean videoconvert_convert_compute_matrix (VideoConvert * convert);
static void videoconvert_dither_verterr (VideoConvert * convert, static void videoconvert_dither_verterr (VideoConvert * convert,
@ -121,16 +121,17 @@ videoconvert_convert_convert (VideoConvert * convert,
#define SCALE_F ((float) (1 << SCALE)) #define SCALE_F ((float) (1 << SCALE))
static void static void
videoconvert_convert_matrix (VideoConvert * convert, guint8 * pixels) videoconvert_convert_matrix8 (VideoConvert * convert, gpointer pixels)
{ {
int i; int i;
int r, g, b; int r, g, b;
int y, u, v; int y, u, v;
guint8 *p = pixels;
for (i = 0; i < convert->width; i++) { for (i = 0; i < convert->width; i++) {
r = pixels[i * 4 + 1]; r = p[i * 4 + 1];
g = pixels[i * 4 + 2]; g = p[i * 4 + 2];
b = pixels[i * 4 + 3]; b = p[i * 4 + 3];
y = (convert->cmatrix[0][0] * r + convert->cmatrix[0][1] * g + y = (convert->cmatrix[0][0] * r + convert->cmatrix[0][1] * g +
convert->cmatrix[0][2] * b + convert->cmatrix[0][3]) >> SCALE; convert->cmatrix[0][2] * b + convert->cmatrix[0][3]) >> SCALE;
@ -139,23 +140,24 @@ videoconvert_convert_matrix (VideoConvert * convert, guint8 * pixels)
v = (convert->cmatrix[2][0] * r + convert->cmatrix[2][1] * g + v = (convert->cmatrix[2][0] * r + convert->cmatrix[2][1] * g +
convert->cmatrix[2][2] * b + convert->cmatrix[2][3]) >> SCALE; convert->cmatrix[2][2] * b + convert->cmatrix[2][3]) >> SCALE;
pixels[i * 4 + 1] = CLAMP (y, 0, 255); p[i * 4 + 1] = CLAMP (y, 0, 255);
pixels[i * 4 + 2] = CLAMP (u, 0, 255); p[i * 4 + 2] = CLAMP (u, 0, 255);
pixels[i * 4 + 3] = CLAMP (v, 0, 255); p[i * 4 + 3] = CLAMP (v, 0, 255);
} }
} }
static void static void
videoconvert_convert_matrix16 (VideoConvert * convert, guint16 * pixels) videoconvert_convert_matrix16 (VideoConvert * convert, gpointer pixels)
{ {
int i; int i;
int r, g, b; int r, g, b;
int y, u, v; int y, u, v;
guint16 *p = pixels;
for (i = 0; i < convert->width; i++) { for (i = 0; i < convert->width; i++) {
r = pixels[i * 4 + 1]; r = p[i * 4 + 1];
g = pixels[i * 4 + 2]; g = p[i * 4 + 2];
b = pixels[i * 4 + 3]; b = p[i * 4 + 3];
y = (convert->cmatrix[0][0] * r + convert->cmatrix[0][1] * g + y = (convert->cmatrix[0][0] * r + convert->cmatrix[0][1] * g +
convert->cmatrix[0][2] * b + convert->cmatrix[0][3]) >> SCALE; convert->cmatrix[0][2] * b + convert->cmatrix[0][3]) >> SCALE;
@ -164,9 +166,9 @@ videoconvert_convert_matrix16 (VideoConvert * convert, guint16 * pixels)
v = (convert->cmatrix[2][0] * r + convert->cmatrix[2][1] * g + v = (convert->cmatrix[2][0] * r + convert->cmatrix[2][1] * g +
convert->cmatrix[2][2] * b + convert->cmatrix[2][3]) >> SCALE; convert->cmatrix[2][2] * b + convert->cmatrix[2][3]) >> SCALE;
pixels[i * 4 + 1] = CLAMP (y, 0, 65535); p[i * 4 + 1] = CLAMP (y, 0, 65535);
pixels[i * 4 + 2] = CLAMP (u, 0, 65535); p[i * 4 + 2] = CLAMP (u, 0, 65535);
pixels[i * 4 + 3] = CLAMP (v, 0, 65535); p[i * 4 + 3] = CLAMP (v, 0, 65535);
} }
} }
@ -238,13 +240,14 @@ videoconvert_convert_compute_matrix (VideoConvert * convert)
in_info->colorimetry.matrix == out_info->colorimetry.matrix) { in_info->colorimetry.matrix == out_info->colorimetry.matrix) {
GST_DEBUG ("using identity color transform"); GST_DEBUG ("using identity color transform");
convert->matrix = NULL; convert->matrix = NULL;
convert->matrix16 = NULL;
return TRUE; return TRUE;
} }
/* calculate intermediate format for the matrix. When unpacking, we expand /* calculate intermediate format for the matrix. When unpacking, we expand
* input to 16 when one of the inputs is 16 bits */ * input to 16 when one of the inputs is 16 bits */
if (convert->in_bits == 16 || convert->out_bits == 16) { if (convert->in_bits == 16 || convert->out_bits == 16) {
convert->matrix = videoconvert_convert_matrix16;
if (GST_VIDEO_FORMAT_INFO_IS_RGB (suinfo)) if (GST_VIDEO_FORMAT_INFO_IS_RGB (suinfo))
suinfo = gst_video_format_get_info (GST_VIDEO_FORMAT_ARGB64); suinfo = gst_video_format_get_info (GST_VIDEO_FORMAT_ARGB64);
else else
@ -254,6 +257,8 @@ videoconvert_convert_compute_matrix (VideoConvert * convert)
duinfo = gst_video_format_get_info (GST_VIDEO_FORMAT_ARGB64); duinfo = gst_video_format_get_info (GST_VIDEO_FORMAT_ARGB64);
else else
duinfo = gst_video_format_get_info (GST_VIDEO_FORMAT_AYUV64); duinfo = gst_video_format_get_info (GST_VIDEO_FORMAT_AYUV64);
} else {
convert->matrix = videoconvert_convert_matrix8;
} }
color_matrix_set_identity (&dst); color_matrix_set_identity (&dst);
@ -306,9 +311,6 @@ videoconvert_convert_compute_matrix (VideoConvert * convert)
GST_DEBUG ("[%6d %6d %6d %6d]", convert->cmatrix[3][0], GST_DEBUG ("[%6d %6d %6d %6d]", convert->cmatrix[3][0],
convert->cmatrix[3][1], convert->cmatrix[3][2], convert->cmatrix[3][3]); convert->cmatrix[3][1], convert->cmatrix[3][2], convert->cmatrix[3][3]);
convert->matrix = videoconvert_convert_matrix;
convert->matrix16 = videoconvert_convert_matrix16;
return TRUE; return TRUE;
/* ERRORS */ /* ERRORS */
@ -421,8 +423,8 @@ videoconvert_convert_generic (VideoConvert * convert, GstVideoFrame * dest,
} }
if (out_bits == 16 || in_bits == 16) { if (out_bits == 16 || in_bits == 16) {
if (convert->matrix16) if (convert->matrix)
convert->matrix16 (convert, tmpline16); convert->matrix (convert, tmpline16);
if (convert->dither16) if (convert->dither16)
convert->dither16 (convert, tmpline16, j); convert->dither16 (convert, tmpline16, j);
tmpline8 += width * 8; tmpline8 += width * 8;

5
gst/videoconvert/videoconvert.h
View file

@ -51,9 +51,8 @@ struct _VideoConvert {
gpointer tmpline; gpointer tmpline;
guint16 *errline; guint16 *errline;
void (*convert) (VideoConvert *convert, GstVideoFrame *dest, const GstVideoFrame *src); void (*convert) (VideoConvert *convert, GstVideoFrame *dest, const GstVideoFrame *src);
void (*matrix) (VideoConvert *convert, guint8 * pixels); void (*matrix) (VideoConvert *convert, gpointer pixels);
void (*matrix16) (VideoConvert *convert, guint16 * pixels);
void (*dither16) (VideoConvert *convert, guint16 * pixels, int j); void (*dither16) (VideoConvert *convert, guint16 * pixels, int j);
}; };