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

[367/906] docs: fix GstXvImageSInk -> GstGLImageSink and reindent

Browse source
This commit is contained in:
Stefan Kost 2009-07-31 18:17:55 +03:00 committed by Matthew Waters
parent 6516ecb3cc
commit 26bb5badb8
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/gl/gstglimagesink.c
View file

@ -36,7 +36,7 @@
* Depends on the driver, OpenGL handles hardware accelerated * Depends on the driver, OpenGL handles hardware accelerated
* scaling of video frames. This means that the element will just accept * scaling of video frames. This means that the element will just accept
* incoming video frames no matter their geometry and will then put them to the * incoming video frames no matter their geometry and will then put them to the
* drawable scaling them on the fly. Using the #GstXvImageSink:force-aspect-ratio * drawable scaling them on the fly. Using the #GstGLImageSink:force-aspect-ratio
* property it is possible to enforce scaling with a constant aspect ratio, * property it is possible to enforce scaling with a constant aspect ratio,
* which means drawing black borders around the video frame. * which means drawing black borders around the video frame.
* </para> * </para>
@ -142,9 +142,8 @@ static GstStaticPadTemplate gst_glimage_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ( GST_STATIC_CAPS (GST_GL_VIDEO_CAPS ";"
GST_GL_VIDEO_CAPS ";" GST_VIDEO_CAPS_RGB ";"
GST_VIDEO_CAPS_RGB ";"
GST_VIDEO_CAPS_RGBx ";" GST_VIDEO_CAPS_RGBx ";"
GST_VIDEO_CAPS_RGBA ";" GST_VIDEO_CAPS_RGBA ";"
GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }")) GST_VIDEO_CAPS_YUV ("{ I420, YV12, YUY2, UYVY, AYUV }"))
@ -559,7 +558,6 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf)
gst_gl_display_set_window_id (glimage_sink->display, gst_gl_display_set_window_id (glimage_sink->display,
glimage_sink->window_id); glimage_sink->window_id);
} }
//the buffer is cleared when an other comes in //the buffer is cleared when an other comes in
if (glimage_sink->stored_buffer) { if (glimage_sink->stored_buffer) {
gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer)); gst_buffer_unref (GST_BUFFER_CAST (glimage_sink->stored_buffer));
@ -571,7 +569,7 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf)
//redisplay opengl scene //redisplay opengl scene
if (gl_buffer->texture && if (gl_buffer->texture &&
gst_gl_display_redisplay (glimage_sink->display, gst_gl_display_redisplay (glimage_sink->display,
gl_buffer->texture, gl_buffer->width, gl_buffer->height, gl_buffer->texture, gl_buffer->width, gl_buffer->height,
glimage_sink->keep_aspect_ratio)) glimage_sink->keep_aspect_ratio))
return GST_FLOW_OK; return GST_FLOW_OK;
else else
@ -607,15 +605,15 @@ gst_glimage_sink_expose (GstXOverlay * overlay)
//redisplay opengl scene //redisplay opengl scene
if (glimage_sink->display && glimage_sink->window_id) { if (glimage_sink->display && glimage_sink->window_id) {
if (glimage_sink->window_id != glimage_sink->new_window_id) { if (glimage_sink->window_id != glimage_sink->new_window_id) {
glimage_sink->window_id = glimage_sink->new_window_id; glimage_sink->window_id = glimage_sink->new_window_id;
gst_gl_display_set_window_id (glimage_sink->display, gst_gl_display_set_window_id (glimage_sink->display,
glimage_sink->window_id); glimage_sink->window_id);
} }
gst_gl_display_redisplay (glimage_sink->display, 0, 0, 0, gst_gl_display_redisplay (glimage_sink->display, 0, 0, 0,
glimage_sink->keep_aspect_ratio); glimage_sink->keep_aspect_ratio);
} }
} }