mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

glutils: privatise matrix multiplication/videoaffinetransformation retrieval

Browse source
This commit is contained in:
Matthew Waters 2017-01-13 11:06:39 +11:00
parent 4315a4b54d
commit 4de388278a
7 changed files with 66 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/libs/gst-plugins-bad-libs-sections.txt
View file

@ -1624,8 +1624,6 @@ gst_gl_get_plane_start
gst_gl_value_get_texture_target_mask
gst_gl_value_set_texture_target
gst_gl_value_set_texture_target_from_mask
gst_gl_get_affine_transformation_meta_as_ndc
gst_gl_multiply_matrix4
gst_gl_check_extension
</SECTION>

60
ext/gl/gstglutils.c
View file

@ -105,3 +105,63 @@ gst_gl_context_gen_shader (GstGLContext * context, const gchar * vert_src,
return *shader != NULL;
}
static const gfloat identity_matrix[] = {
1.0f, 0.0f, 0.0, 0.0f,
0.0f, 1.0f, 0.0, 0.0f,
0.0f, 0.0f, 1.0, 0.0f,
0.0f, 0.0f, 0.0, 1.0f,
};
static const gfloat from_ndc_matrix[] = {
0.5f, 0.0f, 0.0, 0.5f,
0.0f, 0.5f, 0.0, 0.5f,
0.0f, 0.0f, 0.5, 0.5f,
0.0f, 0.0f, 0.0, 1.0f,
};
static const gfloat to_ndc_matrix[] = {
2.0f, 0.0f, 0.0, -1.0f,
0.0f, 2.0f, 0.0, -1.0f,
0.0f, 0.0f, 2.0, -1.0f,
0.0f, 0.0f, 0.0, 1.0f,
};
void
gst_gl_multiply_matrix4 (const gfloat * a, const gfloat * b, gfloat * result)
{
int i, j, k;
gfloat tmp[16] = { 0.0f };
if (!a || !b || !result)
return;
for (i = 0; i < 4; i++) {
for (j = 0; j < 4; j++) {
for (k = 0; k < 4; k++) {
tmp[i + (j * 4)] += a[i + (k * 4)] * b[k + (j * 4)];
}
}
}
for (i = 0; i < 16; i++)
result[i] = tmp[i];
}
void
gst_gl_get_affine_transformation_meta_as_ndc (GstVideoAffineTransformationMeta *
meta, gfloat * matrix)
{
if (!meta) {
int i;
for (i = 0; i < 16; i++) {
matrix[i] = identity_matrix[i];
}
} else {
gfloat tmp[16] = { 0.0f };
gst_gl_multiply_matrix4 (from_ndc_matrix, meta->matrix, tmp);
gst_gl_multiply_matrix4 (tmp, to_ndc_matrix, matrix);
}
}

3
ext/gl/gstglutils.h
View file

@ -28,6 +28,9 @@ G_BEGIN_DECLS
gboolean gst_gl_context_gen_shader (GstGLContext * context,
const gchar * shader_vertex_source,
const gchar * shader_fragment_source, GstGLShader ** shader);
void gst_gl_multiply_matrix4 (const gfloat * a, const gfloat * b, gfloat * result);
void gst_gl_get_affine_transformation_meta_as_ndc (GstVideoAffineTransformationMeta *
meta, gfloat * matrix);
G_END_DECLS

2
gst-libs/gst/gl/gstglutils.c
View file

@ -722,7 +722,7 @@ static const gfloat to_ndc_matrix[] = {
0.0f, 0.0f, 0.0, 1.0f,
};
void
static void
gst_gl_multiply_matrix4 (const gfloat * a, const gfloat * b, gfloat * result)
{
int i, j, k;

6
gst-libs/gst/gl/gstglutils.h
View file

@ -56,12 +56,6 @@ gboolean gst_gl_value_set_texture_target (GValue * value, GstGLTextureTarget tar
GST_EXPORT
GstGLTextureTarget gst_gl_value_get_texture_target_mask (const GValue * value);
GST_EXPORT
void gst_gl_multiply_matrix4 (const gfloat * a, const gfloat * b, gfloat * result);
GST_EXPORT
void gst_gl_get_affine_transformation_meta_as_ndc (GstVideoAffineTransformationMeta *
meta, gfloat * matrix);
G_END_DECLS
#endif /* __GST_GL_UTILS_H__ */

1
gst-libs/gst/gl/gstglutils_private.h
View file

@ -26,6 +26,7 @@
G_BEGIN_DECLS
gboolean gst_gl_run_query (GstElement * element, GstQuery * query, GstPadDirection direction);
void gst_gl_get_affine_transformation_meta_as_ndc (GstVideoAffineTransformationMeta * meta, gfloat * matrix);
G_END_DECLS

1
gst-libs/gst/gl/gstglviewconvert.c
View file

@ -34,6 +34,7 @@
#include "gstglviewconvert.h"
#include "gstglsl_private.h"
#include "gstglutils_private.h"
#include <gst/video/gstvideoaffinetransformationmeta.h>
#define USING_OPENGL(context) (gst_gl_context_check_gl_version (context, GST_GL_API_OPENGL, 1, 0))