Menu
▾
▴
[gst-cvs] dolphy gst-plugins: gst-plugins/ gst-plugins/ext/ gst-plugins/ext/directfb/ gst-plugins/sys/xvimage/
|
From: <do...@fr...> - 2004-11-28 19:28:31
|
CVS Root: /cvs/gstreamer
Module: gst-plugins
Changes by: dolphy
Date: Sun Nov 28 2004 11:08:57 PST
Log message:
2004-11-28 Julien MOUTTE <ju...@mo...>
* configure.ac:
* ext/Makefile.am:
* ext/directfb/Makefile.am:
* ext/directfb/directfbvideosink.c: (gst_directfbvideosink_create),
(gst_directfbvideosink_get_pixel_format),
(gst_directfbvideosink_get_format_from_fourcc),
(gst_directfbvideosink_fixate), (gst_directfbvideosink_getcaps),
(gst_directfbvideosink_sink_link),
(gst_directfbvideosink_change_state),
(gst_directfbvideosink_chain), (gst_directfbvideosink_buffer_free),
(gst_directfbvideosink_buffer_alloc),
(gst_directfbvideosink_interface_supported),
(gst_directfbvideosink_interface_init),
(gst_directfbvideosink_navigation_send_event),
(gst_directfbvideosink_navigation_init),
(gst_directfbvideosink_set_property),
(gst_directfbvideosink_get_property),
(gst_directfbvideosink_finalize), (gst_directfbvideosink_init),
(gst_directfbvideosink_base_init),
(gst_directfbvideosink_class_init),
(gst_directfbvideosink_get_type), (plugin_init):
* ext/directfb/directfbvideosink.h: Adding a first version of
directfbvideosink.
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_init): Initializing some
more.
Modified files:
. : ChangeLog configure.ac
ext : Makefile.am
sys/xvimage : xvimagesink.c
Added files:
ext/directfb : Makefile.am directfbvideosink.c
directfbvideosink.h
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1339&r2=1.1340
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.494&r2=1.495
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/Makefile.am.diff?r1=1.115&r2=1.116
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/directfb/Makefile.am?rev=1.1&content-type=text/vnd.viewcvs-markup
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/directfb/directfbvideosink.c?rev=1.1&content-type=text/vnd.viewcvs-markup
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/directfb/directfbvideosink.h?rev=1.1&content-type=text/vnd.viewcvs-markup
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/sys/xvimage/xvimagesink.c.diff?r1=1.93&r2=1.94
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.1339
retrieving revision 1.1340
diff -u -d -r1.1339 -r1.1340
--- ChangeLog 28 Nov 2004 18:26:36 -0000 1.1339
+++ ChangeLog 28 Nov 2004 19:08:44 -0000 1.1340
@@ -1,3 +1,31 @@
+2004-11-28 Julien MOUTTE <ju...@mo...>
+
+ * configure.ac:
+ * ext/Makefile.am:
+ * ext/directfb/Makefile.am:
+ * ext/directfb/directfbvideosink.c: (gst_directfbvideosink_create),
+ (gst_directfbvideosink_get_pixel_format),
+ (gst_directfbvideosink_get_format_from_fourcc),
+ (gst_directfbvideosink_fixate), (gst_directfbvideosink_getcaps),
+ (gst_directfbvideosink_sink_link),
+ (gst_directfbvideosink_change_state),
+ (gst_directfbvideosink_chain), (gst_directfbvideosink_buffer_free),
+ (gst_directfbvideosink_buffer_alloc),
+ (gst_directfbvideosink_interface_supported),
+ (gst_directfbvideosink_interface_init),
+ (gst_directfbvideosink_navigation_send_event),
+ (gst_directfbvideosink_navigation_init),
+ (gst_directfbvideosink_set_property),
+ (gst_directfbvideosink_get_property),
+ (gst_directfbvideosink_finalize), (gst_directfbvideosink_init),
+ (gst_directfbvideosink_base_init),
+ (gst_directfbvideosink_class_init),
+ (gst_directfbvideosink_get_type), (plugin_init):
+ * ext/directfb/directfbvideosink.h: Adding a first version of
+ directfbvideosink.
+ * sys/xvimage/xvimagesink.c: (gst_xvimagesink_init): Initializing some
+ more.
2004-11-28 Benjamin Otte <ot...@gn...>
* gst/audioconvert/gstchannelmix.c: (gst_audio_convert_mix):
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins/configure.ac,v
retrieving revision 1.494
retrieving revision 1.495
diff -u -d -r1.494 -r1.495
--- configure.ac 26 Nov 2004 23:10:28 -0000 1.494
+++ configure.ac 28 Nov 2004 19:08:44 -0000 1.495
@@ -828,6 +828,16 @@
AC_SUBST(DIRAC_LIBS)
])
+dnl *** DirectFB ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_DIRECTFB, true)
+GST_CHECK_FEATURE(DIRECTFB, [directfb], directfbvideosink , [
+ translit(dnm, m, l) AC_SUBST(DIRECTFB_LIBS)
+ translit(dnm, m, l) AC_SUBST(DIRECTFB_CFLAGS)
+ dnl check with pkg-config
+ PKG_CHECK_MODULES(DIRECTFB, directfb,
+ HAVE_DIRECTFB="yes", HAVE_DIRECTFB="no")
+])
dnl *** DIVX ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DIVX, true)
GST_CHECK_FEATURE(DIVX, [divx plugins], divx, [
@@ -1946,6 +1956,7 @@
ext/cdaudio/Makefile
ext/cdparanoia/Makefile
ext/dirac/Makefile
+ext/directfb/Makefile
ext/divx/Makefile
ext/dts/Makefile
ext/dv/Makefile
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins/ext/Makefile.am,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- Makefile.am 12 Nov 2004 15:04:55 -0000 1.115
+++ Makefile.am 28 Nov 2004 19:08:44 -0000 1.116
@@ -52,6 +52,12 @@
DIRAC_DIR=
endif
+if USE_DIRECTFB
+DIRECTFB_DIR=directfb
+else
+DIRECTFB_DIR=
+endif
if USE_DIVX
DIVX_DIR=divx
else
@@ -380,6 +386,7 @@
$(CDAUDIO_DIR) \
$(CDPARANOIA_DIR) \
$(DIRAC_DIR) \
+ $(DIRECTFB_DIR) \
$(DIVX_DIR) \
$(DTS_DIR) \
$(DV1394_DIR) \
@@ -442,6 +449,7 @@
cdaudio \
cdparanoia \
dirac \
+ directfb \
divx \
dts \
dv \
--- NEW FILE: Makefile.am ---
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstdirectfbvideosink.la
libgstdirectfbvideosink_la_SOURCES = directfbvideosink.c
libgstdirectfbvideosink_la_CFLAGS = $(GST_CFLAGS) \
$(DIRECTFB_CFLAGS) \
$(GST_OPT_CFLAGS)
libgstdirectfbvideosink_la_LIBADD = $(DIRECTFB_LIBS) \
$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
libgstdirectfbvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = directfbvideosink.h
--- NEW FILE: directfbvideosink.c ---
/* GStreamer DirectFB plugin
* Copyright (C) 2004 Julien MOUTTE <ju...@mo...>
*
* 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
/* Our interfaces */
#include <gst/navigation/navigation.h>
/* Object header */
#include "directfbvideosink.h"
/* Debugging category */
#include <gst/gstinfo.h>
GST_DEBUG_CATEGORY_STATIC (gst_debug_directfbvideosink);
#define GST_CAT_DEFAULT gst_debug_directfbvideosink
/* ElementFactory information */
static GstElementDetails gst_directfbvideosink_details =
GST_ELEMENT_DETAILS ("Video sink",
"Sink/Video",
"A DirectFB based videosink",
"Julien Moutte <ju...@mo...>");
/* Default template */
static GstStaticPadTemplate gst_directfbvideosink_sink_template_factory =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-raw-rgb, "
"framerate = (double) [ 1.0, 100.0 ], "
"width = (int) [ 1, MAX ], "
"height = (int) [ 1, MAX ]; "
"video/x-raw-yuv, "
"width = (int) [ 1, MAX ], " "height = (int) [ 1, MAX ]")
);
/* Signals and args */
enum
{
ARG_0,
ARG_SURFACE,
};
static GstVideoSinkClass *parent_class = NULL;
/* ============================================================= */
/* */
/* Private Methods */
/* Creates internal surface */
static gboolean
gst_directfbvideosink_create (GstDirectFBVideoSink * directfbvideosink)
DFBResult ret;
DFBSurfaceDescription s_dsc;
g_return_val_if_fail (directfbvideosink != NULL, FALSE);
g_return_val_if_fail (GST_IS_DIRECTFBVIDEOSINK (directfbvideosink), FALSE);
/* Creating an internal surface which will be used as GstBuffer, we used
the detected pixel format and video dimensions */
s_dsc.flags = DSDESC_PIXELFORMAT | DSDESC_WIDTH | DSDESC_HEIGHT;
s_dsc.pixelformat = directfbvideosink->pixel_format;
s_dsc.width = directfbvideosink->video_width;
s_dsc.height = directfbvideosink->video_height;
GST_DEBUG_OBJECT (directfbvideosink, "creating our internal surface");
ret = directfbvideosink->directfb->CreateSurface (directfbvideosink->directfb,
&s_dsc, &directfbvideosink->surface);
if (ret != DFB_OK) {
directfbvideosink->surface = NULL;
return FALSE;
}
/* Clearing surface */
directfbvideosink->surface->Clear (directfbvideosink->surface,
0x00, 0x00, 0x00, 0xFF);
return TRUE;
}
gst_directfbvideosink_get_pixel_format (GstDirectFBVideoSink *
directfbvideosink)
/* If we do it all by ourself we create the DirectFB context, get the
primary layer and use a fullscreen configuration */
if (!directfbvideosink->foreign_surface) {
if (!directfbvideosink->directfb) {
GST_DEBUG_OBJECT (directfbvideosink, "initializing DirectFB");
ret = DirectFBInit (0, NULL);
if (ret != DFB_OK)
return FALSE;
ret = DirectFBCreate (&(directfbvideosink->directfb));
}
if (!directfbvideosink->layer) {
ret =
directfbvideosink->directfb->GetDisplayLayer (directfbvideosink->
directfb, DLID_PRIMARY, &directfbvideosink->layer);
directfbvideosink->layer->SetCooperativeLevel (directfbvideosink->layer,
DFSCL_FULLSCREEN);
directfbvideosink->layer->SetBackgroundColor (directfbvideosink->layer,
0x00, 0x00, 0x00, 0xFF);
GST_DEBUG_OBJECT (directfbvideosink, "getting primary surface");
directfbvideosink->layer->GetSurface (directfbvideosink->layer,
&directfbvideosink->primary);
directfbvideosink->primary->GetPixelFormat (directfbvideosink->primary,
&directfbvideosink->pixel_format);
} else {
GST_DEBUG_OBJECT (directfbvideosink, "getting pixel format "
"from foreign surface %p", directfbvideosink->foreign_surface);
directfbvideosink->foreign_surface->GetPixelFormat (directfbvideosink->
foreign_surface, &directfbvideosink->pixel_format);
static DFBSurfacePixelFormat
gst_directfbvideosink_get_format_from_fourcc (GstDirectFBVideoSink *
directfbvideosink, guint32 code)
switch (code) {
case GST_MAKE_FOURCC ('I', '4', '2', '0'):
return DSPF_I420;
case GST_MAKE_FOURCC ('Y', 'V', '1', '2'):
return DSPF_YV12;
case GST_MAKE_FOURCC ('Y', 'U', 'Y', '2'):
return DSPF_YUY2;
case GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y'):
return DSPF_UYVY;
default:{
return DSPF_UNKNOWN;
static GstCaps *
gst_directfbvideosink_fixate (GstPad * pad, const GstCaps * caps)
GstStructure *structure;
GstCaps *newcaps;
if (gst_caps_get_size (caps) > 1)
return NULL;
newcaps = gst_caps_copy (caps);
structure = gst_caps_get_structure (newcaps, 0);
if (gst_caps_structure_fixate_field_nearest_int (structure, "width", 320)) {
return newcaps;
if (gst_caps_structure_fixate_field_nearest_int (structure, "height", 240)) {
if (gst_caps_structure_fixate_field_nearest_double (structure, "framerate",
30.0)) {
gst_caps_free (newcaps);
return NULL;
gst_directfbvideosink_getcaps (GstPad * pad)
GstDirectFBVideoSink *directfbvideosink;
gint bpp = 0;
gboolean is_yuv = FALSE, is_rgb = FALSE;
guint32 gst_format = 0;
GstCaps *caps = NULL;
directfbvideosink = GST_DIRECTFBVIDEOSINK (gst_pad_get_parent (pad));
GST_DEBUG_OBJECT (directfbvideosink, "getcaps called, identifying "
"a valid pixel format");
/* We need a primary surface or a foreign one to get pixel format */
if (!directfbvideosink->primary && !directfbvideosink->foreign_surface) {
gst_directfbvideosink_get_pixel_format (directfbvideosink);
switch (directfbvideosink->pixel_format) {
case DSPF_RGB16:
is_rgb = TRUE;
bpp = 16;
break;
case DSPF_RGB24:
bpp = 24;
case DSPF_RGB32:
bpp = 32;
case DSPF_YUY2:
is_yuv = TRUE;
gst_format = GST_MAKE_FOURCC ('Y', 'U', 'Y', '2');
case DSPF_UYVY:
gst_format = GST_MAKE_FOURCC ('U', 'Y', 'V', 'Y');
case DSPF_I420:
gst_format = GST_MAKE_FOURCC ('I', '4', '2', '0');
case DSPF_YV12:
gst_format = GST_MAKE_FOURCC ('Y', 'V', '1', '2');
default:
GST_ELEMENT_ERROR (directfbvideosink, RESOURCE, WRITE, (NULL),
("Unsupported format %d", directfbvideosink->pixel_format));
if (is_rgb) {
caps = gst_caps_new_simple ("video/x-raw-rgb",
"bpp", G_TYPE_INT, bpp,
"width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
"height", GST_TYPE_INT_RANGE, 1, G_MAXINT,
"framerate", GST_TYPE_DOUBLE_RANGE, 1.0, 100.0, NULL);
} else if (is_yuv) {
caps = gst_caps_new_simple ("video/x-raw-yuv",
"format", GST_TYPE_FOURCC, gst_format,
GST_ELEMENT_ERROR (directfbvideosink, RESOURCE, WRITE, (NULL),
("Unsupported format neither RGB nor YUV"));
return caps;
static GstPadLinkReturn
gst_directfbvideosink_sink_link (GstPad * pad, const GstCaps * caps)
gboolean ret;
gint video_width, video_height;
DFBSurfacePixelFormat pixel_format = DSPF_UNKNOWN;
structure = gst_caps_get_structure (caps, 0);
ret = gst_structure_get_int (structure, "width", &video_width);
ret &= gst_structure_get_int (structure, "height", &video_height);
ret &= gst_structure_get_double (structure, "framerate",
&directfbvideosink->framerate);
if (!ret) {
return GST_PAD_LINK_REFUSED;
/* Check wether we have RGB or YUV video */
if (g_ascii_strcasecmp (gst_structure_get_name (structure),
"video/x-raw-rgb") == 0) {
gint bpp = 0;
gst_structure_get_int (structure, "bpp", &bpp);
GST_DEBUG_OBJECT (directfbvideosink,
"linking with rgb (bpp %d) %dx%d", bpp, video_width, video_height);
switch (bpp) {
case 16:
pixel_format = DSPF_RGB16;
break;
case 24:
pixel_format = DSPF_RGB24;
case 32:
pixel_format = DSPF_RGB32;
} else if (g_ascii_strcasecmp (gst_structure_get_name (structure),
"video/x-raw-yuv") == 0) {
gint im_format = 0;
gst_structure_get_fourcc (structure, "format", &im_format);
"linking with yuv (" GST_FOURCC_FORMAT ") %dx%d",
GST_FOURCC_ARGS (im_format), video_width, video_height);
pixel_format =
gst_directfbvideosink_get_format_from_fourcc (directfbvideosink,
im_format);
if (pixel_format != directfbvideosink->pixel_format) {
directfbvideosink->video_width = video_width;
directfbvideosink->video_height = video_height;
if (gst_directfbvideosink_create (directfbvideosink))
return GST_PAD_LINK_OK;
else
static GstElementStateReturn
gst_directfbvideosink_change_state (GstElement * element)
directfbvideosink = GST_DIRECTFBVIDEOSINK (element);
switch (GST_STATE_TRANSITION (element)) {
case GST_STATE_NULL_TO_READY:
case GST_STATE_READY_TO_PAUSED:
/* Blank surface if we have one */
if (directfbvideosink->foreign_surface) {
directfbvideosink->foreign_surface->Clear (directfbvideosink->
foreign_surface, 0x00, 0x00, 0x00, 0xFF);
}
if (directfbvideosink->primary) {
directfbvideosink->primary->Clear (directfbvideosink->primary,
0x00, 0x00, 0x00, 0xFF);
directfbvideosink->time = 0;
case GST_STATE_PAUSED_TO_PLAYING:
case GST_STATE_PLAYING_TO_PAUSED:
case GST_STATE_PAUSED_TO_READY:
directfbvideosink->framerate = 0;
GST_VIDEOSINK_WIDTH (directfbvideosink) = 0;
GST_VIDEOSINK_HEIGHT (directfbvideosink) = 0;
case GST_STATE_READY_TO_NULL:
if (GST_ELEMENT_CLASS (parent_class)->change_state)
return GST_ELEMENT_CLASS (parent_class)->change_state (element);
return GST_STATE_SUCCESS;
static void
gst_directfbvideosink_chain (GstPad * pad, GstData * data)
GstBuffer *buf = NULL;
g_return_if_fail (GST_IS_PAD (pad));
g_return_if_fail (data != NULL);
if (GST_IS_EVENT (data)) {
gst_pad_event_default (pad, GST_EVENT (data));
return;
buf = GST_BUFFER (data);
/* update time */
if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
directfbvideosink->time = GST_BUFFER_TIMESTAMP (buf);
GST_LOG_OBJECT (directfbvideosink, "clock wait: %" GST_TIME_FORMAT,
GST_TIME_ARGS (directfbvideosink->time));
if (GST_VIDEOSINK_CLOCK (directfbvideosink)) {
gst_element_wait (GST_ELEMENT (directfbvideosink), directfbvideosink->time);
/* Actual drawing */
if (directfbvideosink->surface) {
if (directfbvideosink->surface_locked) {
GST_DEBUG_OBJECT (directfbvideosink, "unlocking surface %p",
directfbvideosink->surface);
directfbvideosink->surface->Unlock (directfbvideosink->surface);
directfbvideosink->surface_locked = FALSE;
if (directfbvideosink->foreign_surface) {
/* FIXME : Check return values */
directfbvideosink->foreign_surface->Blit (directfbvideosink->
foreign_surface, directfbvideosink->surface, NULL, 0, 0);
directfbvideosink->foreign_surface->Flip (directfbvideosink->
foreign_surface, NULL, 0);
} else {
gint width, height;
gdouble video_ratio, screen_ratio;
DFBRectangle dst;
directfbvideosink->primary->GetSize (directfbvideosink->primary,
&width, &height);
video_ratio = (gdouble) directfbvideosink->video_width /
directfbvideosink->video_height;
screen_ratio = (gdouble) width / height;
if (video_ratio > screen_ratio) {
dst.w = width;
dst.h = width / video_ratio;;
dst.x = 0;
dst.y = (height - dst.h) / 2;
} else if (video_ratio < screen_ratio) {
dst.w = height * screen_ratio;
dst.h = height;
dst.x = (width - dst.w) / 2;
dst.y = 0;
} else {
GST_DEBUG_OBJECT (directfbvideosink,
"video output at %dx%d size %dx%d", dst.x, dst.y, dst.w, dst.h);
directfbvideosink->primary->StretchBlit (directfbvideosink->primary,
directfbvideosink->surface, NULL, &dst);
directfbvideosink->primary->Flip (directfbvideosink->primary, NULL, 0);
gst_buffer_unref (buf);
gst_directfbvideosink_buffer_free (GstBuffer * buffer)
directfbvideosink = GST_BUFFER_PRIVATE (buffer);
if ((directfbvideosink->surface) && (directfbvideosink->surface_locked)) {
GST_DEBUG_OBJECT (directfbvideosink, "unlocking surface %p",
directfbvideosink->surface);
directfbvideosink->surface->Unlock (directfbvideosink->surface);
directfbvideosink->surface_locked = FALSE;
static GstBuffer *
gst_directfbvideosink_buffer_alloc (GstPad * pad, guint64 offset, guint size)
GstBuffer *buffer = NULL;
if ((directfbvideosink->surface) && (!directfbvideosink->surface_locked)) {
DFBResult ret;
void *data;
gint pitch = 0;
directfbvideosink->surface_locked = TRUE;
GST_DEBUG_OBJECT (directfbvideosink, "locking surface %p",
ret = directfbvideosink->surface->Lock (directfbvideosink->surface,
DSLF_WRITE, &data, &pitch);
if (ret != DFB_OK) {
GST_DEBUG_OBJECT (directfbvideosink, "failed locking surface %p",
buffer = gst_buffer_new ();
GST_BUFFER_PRIVATE (buffer) = directfbvideosink;
GST_BUFFER_DATA (buffer) = data;
GST_BUFFER_FREE_DATA_FUNC (buffer) = gst_directfbvideosink_buffer_free;
GST_BUFFER_SIZE (buffer) = size;
return buffer;
/* Interfaces stuff */
gst_directfbvideosink_interface_supported (GstImplementsInterface * iface,
GType type)
g_assert (type == GST_TYPE_NAVIGATION);
gst_directfbvideosink_interface_init (GstImplementsInterfaceClass * klass)
klass->supported = gst_directfbvideosink_interface_supported;
gst_directfbvideosink_navigation_send_event (GstNavigation * navigation,
GstStructure * structure)
GstDirectFBVideoSink *directfbvideosink = GST_DIRECTFBVIDEOSINK (navigation);
GstEvent *event;
gint width, height;
double x, y;
if (directfbvideosink->foreign_surface) {
directfbvideosink->foreign_surface->GetSize (directfbvideosink->
foreign_surface, &width, &height);
} else if (directfbvideosink->primary) {
directfbvideosink->primary->GetSize (directfbvideosink->primary,
&width, &height);
/* We don't have any target to adjust coordinates */
width = directfbvideosink->video_width;
height = directfbvideosink->video_height;
event = gst_event_new (GST_EVENT_NAVIGATION);
event->event_data.structure.structure = structure;
/* Converting pointer coordinates to the non scaled geometry */
if (gst_structure_get_double (structure, "pointer_x", &x)) {
x *= directfbvideosink->video_width;
x /= width;
gst_structure_set (structure, "pointer_x", G_TYPE_DOUBLE, x, NULL);
if (gst_structure_get_double (structure, "pointer_y", &y)) {
y *= directfbvideosink->video_height;
y /= height;
gst_structure_set (structure, "pointer_y", G_TYPE_DOUBLE, y, NULL);
gst_pad_send_event (gst_pad_get_peer (GST_VIDEOSINK_PAD (directfbvideosink)),
event);
gst_directfbvideosink_navigation_init (GstNavigationInterface * iface)
iface->send_event = gst_directfbvideosink_navigation_send_event;
/* Properties */
gst_directfbvideosink_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
g_return_if_fail (GST_IS_DIRECTFBVIDEOSINK (object));
directfbvideosink = GST_DIRECTFBVIDEOSINK (object);
switch (prop_id) {
case ARG_SURFACE:
directfbvideosink->foreign_surface = g_value_get_pointer (value);
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
gst_directfbvideosink_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
/* =========================================== */
/* */
/* Init & Class init */
/* Finalize is called only once, dispose can be called multiple times. */
gst_directfbvideosink_finalize (GObject * object)
directfbvideosink->surface->Release (directfbvideosink->surface);
if (directfbvideosink->primary) {
directfbvideosink->primary->Release (directfbvideosink->primary);
directfbvideosink->primary = NULL;
if (directfbvideosink->layer) {
directfbvideosink->layer->Release (directfbvideosink->layer);
directfbvideosink->layer = NULL;
if (directfbvideosink->directfb) {
directfbvideosink->directfb->Release (directfbvideosink->directfb);
directfbvideosink->directfb = NULL;
G_OBJECT_CLASS (parent_class)->finalize (object);
gst_directfbvideosink_init (GstDirectFBVideoSink * directfbvideosink)
GST_VIDEOSINK_PAD (directfbvideosink) =
gst_pad_new_from_template (gst_static_pad_template_get
(&gst_directfbvideosink_sink_template_factory), "sink");
gst_element_add_pad (GST_ELEMENT (directfbvideosink),
GST_VIDEOSINK_PAD (directfbvideosink));
gst_pad_set_chain_function (GST_VIDEOSINK_PAD (directfbvideosink),
gst_directfbvideosink_chain);
gst_pad_set_link_function (GST_VIDEOSINK_PAD (directfbvideosink),
gst_directfbvideosink_sink_link);
gst_pad_set_getcaps_function (GST_VIDEOSINK_PAD (directfbvideosink),
gst_directfbvideosink_getcaps);
gst_pad_set_fixate_function (GST_VIDEOSINK_PAD (directfbvideosink),
gst_directfbvideosink_fixate);
gst_pad_set_bufferalloc_function (GST_VIDEOSINK_PAD (directfbvideosink),
gst_directfbvideosink_buffer_alloc);
directfbvideosink->pixel_format = DSPF_UNKNOWN;
directfbvideosink->video_height = 0;
directfbvideosink->video_width = 0;
directfbvideosink->framerate = 0;
directfbvideosink->directfb = NULL;
directfbvideosink->layer = NULL;
directfbvideosink->surface = NULL;
directfbvideosink->foreign_surface = NULL;
directfbvideosink->primary = NULL;
directfbvideosink->internal_surface = FALSE;
directfbvideosink->surface_locked = FALSE;
GST_FLAG_SET (directfbvideosink, GST_ELEMENT_THREAD_SUGGESTED);
GST_FLAG_SET (directfbvideosink, GST_ELEMENT_EVENT_AWARE);
gst_directfbvideosink_base_init (gpointer g_class)
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_set_details (element_class, &gst_directfbvideosink_details);
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get
(&gst_directfbvideosink_sink_template_factory));
gst_directfbvideosink_class_init (GstDirectFBVideoSinkClass * klass)
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_VIDEOSINK);
g_object_class_install_property (G_OBJECT_CLASS (klass),
ARG_SURFACE,
g_param_spec_pointer ("surface", "Surface",
"The target surface for video", G_PARAM_WRITABLE));
gobject_class->finalize = gst_directfbvideosink_finalize;
gobject_class->set_property = gst_directfbvideosink_set_property;
gobject_class->get_property = gst_directfbvideosink_get_property;
gstelement_class->change_state = gst_directfbvideosink_change_state;
/* Public Methods */
/* Object typing & Creation */
GType
gst_directfbvideosink_get_type (void)
static GType directfbvideosink_type = 0;
if (!directfbvideosink_type) {
static const GTypeInfo directfbvideosink_info = {
sizeof (GstDirectFBVideoSinkClass),
gst_directfbvideosink_base_init,
NULL,
(GClassInitFunc) gst_directfbvideosink_class_init,
sizeof (GstDirectFBVideoSink),
0,
(GInstanceInitFunc) gst_directfbvideosink_init,
};
static const GInterfaceInfo iface_info = {
(GInterfaceInitFunc) gst_directfbvideosink_interface_init,
static const GInterfaceInfo navigation_info = {
(GInterfaceInitFunc) gst_directfbvideosink_navigation_init,
directfbvideosink_type = g_type_register_static (GST_TYPE_VIDEOSINK,
"GstDirectFBVideoSink", &directfbvideosink_info, 0);
g_type_add_interface_static (directfbvideosink_type,
GST_TYPE_IMPLEMENTS_INTERFACE, &iface_info);
g_type_add_interface_static (directfbvideosink_type, GST_TYPE_NAVIGATION,
&navigation_info);
return directfbvideosink_type;
plugin_init (GstPlugin * plugin)
/* Loading the library containing GstVideoSink, our parent object */
if (!gst_library_load ("gstvideo"))
if (!gst_element_register (plugin, "directfbvideosink",
GST_RANK_PRIMARY, GST_TYPE_DIRECTFBVIDEOSINK))
GST_DEBUG_CATEGORY_INIT (gst_debug_directfbvideosink,
"directfbvideosink", 0, "directfbvideosink element");
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"directfbvideosink",
"DirectFB video output plugin",
plugin_init, VERSION, GST_LICENSE, GST_PACKAGE, GST_ORIGIN)
--- NEW FILE: directfbvideosink.h ---
#ifndef __GST_DIRECTFBVIDEOSINK_H__
#define __GST_DIRECTFBVIDEOSINK_H__
#include <gst/video/videosink.h>
#include <directfb.h>
G_BEGIN_DECLS
#define GST_TYPE_DIRECTFBVIDEOSINK (gst_directfbvideosink_get_type())
#define GST_DIRECTFBVIDEOSINK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_DIRECTFBVIDEOSINK, GstDirectFBVideoSink))
#define GST_DIRECTFBVIDEOSINK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_DIRECTFBVIDEOSINK, GstDirectFBVideoSink))
#define GST_IS_DIRECTFBVIDEOSINK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_DIRECTFBVIDEOSINK))
#define GST_IS_DIRECTFBVIDEOSINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_DIRECTFBVIDEOSINK))
typedef struct _GstDirectFBVideoSink GstDirectFBVideoSink;
typedef struct _GstDirectFBVideoSinkClass GstDirectFBVideoSinkClass;
struct _GstDirectFBVideoSink {
/* Our element stuff */
GstVideoSink videosink;
gdouble framerate;
guint video_width, video_height; /* size of incoming video */
GstClockTime time;
IDirectFB *directfb;
IDirectFBDisplayLayer *layer;
IDirectFBSurface *surface;
IDirectFBSurface *foreign_surface;
IDirectFBSurface *primary;
DFBSurfacePixelFormat pixel_format;
gboolean surface_locked;
gboolean internal_surface;
struct _GstDirectFBVideoSinkClass {
GstVideoSinkClass parent_class;
GType gst_directfbvideosink_get_type (void);
G_END_DECLS
#endif /* __GST_DIRECTFBVIDEOSINK_H__ */
Index: xvimagesink.c
RCS file: /cvs/gstreamer/gst-plugins/sys/xvimage/xvimagesink.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- xvimagesink.c 8 Nov 2004 14:31:55 -0000 1.93
+++ xvimagesink.c 28 Nov 2004 19:08:45 -0000 1.94
@@ -1939,6 +1939,8 @@
xvimagesink->cb_changed = FALSE;
xvimagesink->framerate = 0;
+ xvimagesink->video_width = 0;
+ xvimagesink->video_height = 0;
xvimagesink->x_lock = g_mutex_new ();
|