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

[593/906] testsrc/imagesink: update for up/download API changes

Browse source
This commit is contained in:
Matthew Waters 2012-09-25 16:03:01 +10:00
parent fad1b94c41
commit aef7f01a62
2 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gl/gstglimagesink.c
View file

@ -484,10 +484,10 @@ gst_glimage_sink_set_caps (GstBaseSink * bsink, GstCaps * caps)
GST_VIDEO_INFO_FORMAT (&vinfo), width, height);
glimage_sink->upload = gst_gl_display_find_upload (glimage_sink->display,
GST_VIDEO_INFO_FORMAT (&vinfo), width, height);
GST_VIDEO_INFO_FORMAT (&vinfo), width, height, width, height);
gst_gl_upload_init_format (glimage_sink->upload,
GST_VIDEO_INFO_FORMAT (&vinfo), width, height);
GST_VIDEO_INFO_FORMAT (&vinfo), width, height, width, height);
gst_gl_display_set_client_reshape_callback (glimage_sink->display,
glimage_sink->clientReshapeCallback);

19
gst/gl/gstgltestsrc.c
View file

@ -306,6 +306,7 @@ gst_gl_test_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps)
{
GstVideoInfo vinfo;
GstGLTestSrc *gltestsrc = GST_GL_TEST_SRC (bsrc);
guint out_width, out_height;
GST_DEBUG ("setcaps");
@ -314,29 +315,23 @@ gst_gl_test_src_setcaps (GstBaseSrc * bsrc, GstCaps * caps)
gltestsrc->out_info = vinfo;
gltestsrc->negotiated = TRUE;
out_width = GST_VIDEO_INFO_WIDTH (&gltestsrc->out_info);
out_height = GST_VIDEO_INFO_HEIGHT (&gltestsrc->out_info);
if (!gst_gl_display_gen_fbo (gltestsrc->display,
GST_VIDEO_INFO_WIDTH (&gltestsrc->out_info),
GST_VIDEO_INFO_HEIGHT (&gltestsrc->out_info),
if (!gst_gl_display_gen_fbo (gltestsrc->display, out_width, out_height,
&gltestsrc->fbo, &gltestsrc->depthbuffer))
goto display_error;
if (gltestsrc->out_tex_id)
gst_gl_display_del_texture (gltestsrc->display, &gltestsrc->out_tex_id);
gst_gl_display_gen_texture (gltestsrc->display, &gltestsrc->out_tex_id,
GST_VIDEO_INFO_FORMAT (&gltestsrc->out_info),
GST_VIDEO_INFO_WIDTH (&gltestsrc->out_info),
GST_VIDEO_INFO_HEIGHT (&gltestsrc->out_info));
GST_VIDEO_FORMAT_RGBA, out_width, out_height);
gltestsrc->download = gst_gl_display_find_download (gltestsrc->display,
GST_VIDEO_INFO_FORMAT (&gltestsrc->out_info),
GST_VIDEO_INFO_WIDTH (&gltestsrc->out_info),
GST_VIDEO_INFO_HEIGHT (&gltestsrc->out_info));
GST_VIDEO_INFO_FORMAT (&gltestsrc->out_info), out_width, out_height);
gst_gl_download_init_format (gltestsrc->download,
GST_VIDEO_INFO_FORMAT (&gltestsrc->out_info),
GST_VIDEO_INFO_WIDTH (&gltestsrc->out_info),
GST_VIDEO_INFO_HEIGHT (&gltestsrc->out_info));
GST_VIDEO_INFO_FORMAT (&gltestsrc->out_info), out_width, out_height);
return TRUE;