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

eglglessink: Fix EGL attribs var naming

Browse source
This commit is contained in:
Reynaldo H. Verdejo Pinochet 2012-09-18 10:31:26 -03:00 committed by Sebastian Dröge
parent c2cf1fa639
commit 22eb374b57
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/eglgles/gsteglglessink.c
View file

@ -185,7 +185,7 @@ enum
}; };
/* will probably move elsewhere */ /* will probably move elsewhere */
static EGLint eglglessink_RGBA8888_config[] = { static EGLint eglglessink_RGBA8888_attribs[] = {
EGL_RED_SIZE, 8, EGL_RED_SIZE, 8,
EGL_GREEN_SIZE, 8, EGL_GREEN_SIZE, 8,
EGL_BLUE_SIZE, 8, EGL_BLUE_SIZE, 8,
@ -193,14 +193,14 @@ static EGLint eglglessink_RGBA8888_config[] = {
EGL_NONE EGL_NONE
}; };
static EGLint eglglessink_RGB888_config[] = { static EGLint eglglessink_RGB888_attribs[] = {
EGL_RED_SIZE, 8, EGL_RED_SIZE, 8,
EGL_GREEN_SIZE, 8, EGL_GREEN_SIZE, 8,
EGL_BLUE_SIZE, 8, EGL_BLUE_SIZE, 8,
EGL_NONE EGL_NONE
}; };
static EGLint eglglessink_RGB565_config[] = { static EGLint eglglessink_RGB565_attribs[] = {
EGL_RED_SIZE, 5, EGL_RED_SIZE, 5,
EGL_GREEN_SIZE, 6, EGL_GREEN_SIZE, 6,
EGL_BLUE_SIZE, 5, EGL_BLUE_SIZE, 5,
@ -778,11 +778,11 @@ gst_eglglessink_fill_supported_fbuffer_configs (GstEglGlesSink * eglglessink)
/* Init supported format/caps list */ /* Init supported format/caps list */
g_mutex_lock (eglglessink->flow_lock); g_mutex_lock (eglglessink->flow_lock);
if (eglChooseConfig (eglglessink->display, eglglessink_RGB888_config, if (eglChooseConfig (eglglessink->display, eglglessink_RGB888_attribs,
NULL, 1, &cfg_number) != EGL_FALSE) { NULL, 1, &cfg_number) != EGL_FALSE) {
format = g_new0 (GstEglGlesImageFmt, 1); format = g_new0 (GstEglGlesImageFmt, 1);
format->fmt = GST_EGLGLESSINK_IMAGE_RGB888; format->fmt = GST_EGLGLESSINK_IMAGE_RGB888;
format->eglcfg = eglglessink_RGB888_config; format->attribs = eglglessink_RGB888_attribs;
format->caps = format->caps =
gst_caps_new_simple ("video/x-raw-rgb", "bpp", G_TYPE_INT, 24, NULL); gst_caps_new_simple ("video/x-raw-rgb", "bpp", G_TYPE_INT, 24, NULL);
eglglessink->supported_fmts = eglglessink->supported_fmts =
@ -791,11 +791,11 @@ gst_eglglessink_fill_supported_fbuffer_configs (GstEglGlesSink * eglglessink)
} else } else
GST_INFO_OBJECT (eglglessink, "EGL display doesn't support RGB888 config"); GST_INFO_OBJECT (eglglessink, "EGL display doesn't support RGB888 config");
if (eglChooseConfig (eglglessink->display, eglglessink_RGB565_config, if (eglChooseConfig (eglglessink->display, eglglessink_RGB565_attribs,
NULL, 1, &cfg_number) != EGL_FALSE) { NULL, 1, &cfg_number) != EGL_FALSE) {
format = g_new0 (GstEglGlesImageFmt, 1); format = g_new0 (GstEglGlesImageFmt, 1);
format->fmt = GST_EGLGLESSINK_IMAGE_RGB565; format->fmt = GST_EGLGLESSINK_IMAGE_RGB565;
format->eglcfg = eglglessink_RGB565_config; format->attribs = eglglessink_RGB565_attribs;
format->caps = format->caps =
gst_caps_new_simple ("video/x-raw-rgb", "bpp", G_TYPE_INT, 16, NULL); gst_caps_new_simple ("video/x-raw-rgb", "bpp", G_TYPE_INT, 16, NULL);
eglglessink->supported_fmts = eglglessink->supported_fmts =
@ -804,11 +804,11 @@ gst_eglglessink_fill_supported_fbuffer_configs (GstEglGlesSink * eglglessink)
} else } else
GST_INFO_OBJECT (eglglessink, "EGL display doesn't support RGB565 config"); GST_INFO_OBJECT (eglglessink, "EGL display doesn't support RGB565 config");
if (eglChooseConfig (eglglessink->display, eglglessink_RGBA8888_config, if (eglChooseConfig (eglglessink->display, eglglessink_RGBA8888_attribs,
NULL, 1, &cfg_number) != EGL_FALSE) { NULL, 1, &cfg_number) != EGL_FALSE) {
format = g_new0 (GstEglGlesImageFmt, 1); format = g_new0 (GstEglGlesImageFmt, 1);
format->fmt = GST_EGLGLESSINK_IMAGE_RGBA8888; format->fmt = GST_EGLGLESSINK_IMAGE_RGBA8888;
format->eglcfg = eglglessink_RGBA8888_config; format->attribs = eglglessink_RGBA8888_attribs;
format->caps = gst_caps_new_simple ("video/x-raw-rgb", "depth", G_TYPE_INT, 24, "bpp", G_TYPE_INT, 32, NULL); /* proly doesn't work for rgba */ format->caps = gst_caps_new_simple ("video/x-raw-rgb", "depth", G_TYPE_INT, 24, "bpp", G_TYPE_INT, 32, NULL); /* proly doesn't work for rgba */
eglglessink->supported_fmts = g_list_append eglglessink->supported_fmts = g_list_append
(eglglessink->supported_fmts, format); (eglglessink->supported_fmts, format);
@ -1363,8 +1363,9 @@ gst_eglglessink_choose_config (GstEglGlesSink * eglglessink)
EGLint con_attribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE }; EGLint con_attribs[] = { EGL_CONTEXT_CLIENT_VERSION, 2, EGL_NONE };
GLint egl_configs; GLint egl_configs;
if ((eglChooseConfig (eglglessink->display, eglglessink->selected_fmt->eglcfg, if ((eglChooseConfig (eglglessink->display,
&eglglessink->config, 1, &egl_configs)) == EGL_FALSE) { eglglessink->selected_fmt->attribs, &eglglessink->config, 1,
&egl_configs)) == EGL_FALSE) {
show_egl_error ("eglChooseConfig"); show_egl_error ("eglChooseConfig");
GST_ERROR_OBJECT (eglglessink, "eglChooseConfig failed"); GST_ERROR_OBJECT (eglglessink, "eglChooseConfig failed");
goto HANDLE_EGL_ERROR; goto HANDLE_EGL_ERROR;

6
ext/eglgles/gsteglglessink.h
View file

@ -96,9 +96,9 @@ typedef struct _coord
struct _GstEglGlesImageFmt struct _GstEglGlesImageFmt
{ {
gint fmt; gint fmt; /* Private identifier */
const EGLint *eglcfg; const EGLint *attribs; /* EGL Attributes */
GstCaps *caps; GstCaps *caps; /* Matching caps for the attribs */
}; };
/* XXX: Maybe use GstVideoRectangle for the image data? */ /* XXX: Maybe use GstVideoRectangle for the image data? */