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

osxvideosink: fix support in VM's without hardware acceleration

Browse source
This commit is contained in:
Andoni Morales Alastruey 2013-06-05 17:02:49 +02:00
parent 745be945ce
commit 025f226e60
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sys/osxvideo/cocoawindow.m
View file

@ -379,7 +379,6 @@ const gchar* gst_keycode_to_keyname(gint16 keycode)
- (id) initWithFrame:(NSRect) frame { - (id) initWithFrame:(NSRect) frame {
NSOpenGLPixelFormat *fmt; NSOpenGLPixelFormat *fmt;
NSOpenGLPixelFormatAttribute attribs[] = { NSOpenGLPixelFormatAttribute attribs[] = {
NSOpenGLPFAAccelerated,
NSOpenGLPFANoRecovery, NSOpenGLPFANoRecovery,
NSOpenGLPFADoubleBuffer, NSOpenGLPFADoubleBuffer,
NSOpenGLPFAColorSize, 24, NSOpenGLPFAColorSize, 24,

11
sys/osxvideo/osxvideosink.m
View file

@ -867,9 +867,14 @@ gst_osx_video_sink_get_type (void)
gst_buffer_map (buf, &info, GST_MAP_READ); gst_buffer_map (buf, &info, GST_MAP_READ);
viewdata = (guint8 *) [osxvideosink->osxwindow->gstview getTextureBuffer]; viewdata = (guint8 *) [osxvideosink->osxwindow->gstview getTextureBuffer];
memcpy (viewdata, info.data, info.size); if (G_UNLIKELY (viewdata == NULL)) {
[osxvideosink->osxwindow->gstview displayTexture]; GST_ELEMENT_ERROR (osxvideosink, RESOURCE, WRITE,
gst_buffer_unmap (buf, &info); ("Could not get a texture buffer"), (NULL));
} else {
memcpy (viewdata, info.data, info.size);
[osxvideosink->osxwindow->gstview displayTexture];
gst_buffer_unmap (buf, &info);
}
} }
[object release]; [object release];