From: Julien Isorce Date: Mon, 19 May 2008 16:57:39 +0000 (+0000) Subject: [069/906] add gstreamer license X-Git-Tag: 1.19.3~511^2~1989^2~2190 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee488f6e6f575e4a93232bd66713c85d877a0c00;p=platform%2Fupstream%2Fgstreamer.git [069/906] add gstreamer license git-svn-id: svn://svn.wobow.com/GStreamer_playground/gst-plugins-gl@435 93df14bb-0f41-7a43-8087-d3e2a2f0e464 --- diff --git a/gst-libs/gst/gl/gstglbuffer.c b/gst-libs/gst/gl/gstglbuffer.c index aaa3967..40eb4dd 100644 --- a/gst-libs/gst/gl/gstglbuffer.c +++ b/gst-libs/gst/gl/gstglbuffer.c @@ -1,3 +1,23 @@ +/* + * GStreamer + * Copyright (C) 2008 Julien Isorce + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/gst-libs/gst/gl/gstglbuffer.h b/gst-libs/gst/gl/gstglbuffer.h index cfb3a4f..cf7aaaa 100644 --- a/gst-libs/gst/gl/gstglbuffer.h +++ b/gst-libs/gst/gl/gstglbuffer.h @@ -1,3 +1,23 @@ +/* + * GStreamer + * Copyright (C) 2008 Julien Isorce + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #ifndef _GST_GL_BUFFER_H_ #define _GST_GL_BUFFER_H_ diff --git a/gst-libs/gst/gl/gstgldisplay.c b/gst-libs/gst/gl/gstgldisplay.c index 5b9cc9e..1f2604c 100644 --- a/gst-libs/gst/gl/gstgldisplay.c +++ b/gst-libs/gst/gl/gstgldisplay.c @@ -1,3 +1,23 @@ +/* + * GStreamer + * Copyright (C) 2008 Julien Isorce + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -379,11 +399,8 @@ gst_gl_display_glutCreateWindow (GstGLDisplay *display) glutInitWindowSize(display->glcontext_width, display->glcontext_height); //create opengl context -#if WIN32 - sprintf_s(buffer, 5, "%d", glutWinId); -#else sprintf(buffer, "%d", glutWinId); -#endif + display->title = g_string_append (display->title, buffer); glutWinId = glutCreateWindow (display->title->str, display->winId); @@ -563,18 +580,13 @@ gst_gl_display_glutCreateWindow (GstGLDisplay *display) g_print ("Context %d, ARB_fragment_program supported: yes\n", glutWinId); //from video to texture -#if WIN32 - sprintf_s (program, 2048, display->textFProgram_YUY2_UYVY, 'r', 'g', 'a'); -#else - sprintf (program, display->textFProgram_YUY2_UYVY, 'r', 'g', 'a'); -#endif + + sprintf (program, display->textFProgram_YUY2_UYVY, 'r', 'g', 'a'); + display->GLSLProgram_YUY2 = gst_gl_display_loadGLSLprogram (program); -#if WIN32 - sprintf_s (program, 2048, display->textFProgram_YUY2_UYVY, 'a', 'b', 'r'); -#else - sprintf (program, display->textFProgram_YUY2_UYVY, 'a', 'b', 'r'); -#endif + sprintf (program, display->textFProgram_YUY2_UYVY, 'a', 'b', 'r'); + display->GLSLProgram_UYVY = gst_gl_display_loadGLSLprogram (program); display->GLSLProgram_I420_YV12 = gst_gl_display_loadGLSLprogram (display->textFProgram_I420_YV12); @@ -1044,8 +1056,6 @@ void gst_gl_display_set_windowId (GstGLDisplay* display, gulong winId) { static gint glheight = 0; - - //g_print ("Display::gst_gl_display_set_windowId\n"); gst_gl_display_lock (display); gst_gl_display_postMessage (GST_GL_DISPLAY_ACTION_DESTROY, display); diff --git a/gst-libs/gst/gl/gstgldisplay.h b/gst-libs/gst/gl/gstgldisplay.h index abb4bcc..9130d30 100644 --- a/gst-libs/gst/gl/gstgldisplay.h +++ b/gst-libs/gst/gl/gstgldisplay.h @@ -1,3 +1,23 @@ +/* + * GStreamer + * Copyright (C) 2008 Julien Isorce + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + #ifndef __GST_GL_H__ #define __GST_GL_H__