mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 21:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM GOOD] Add directdrawsink to build and dist it, so it gets built when compiling with MingW on win32 and the required headers...

Browse source 
Original commit message from CVS:
Patch by: Vincent Torri  <vtorri at univ-evry fr>
* configure.ac:
* sys/Makefile.am:
* sys/directdraw/Makefile.am:
Add directdrawsink to build and dist it, so it gets built when
compiling with MingW on win32 and the required headers and libraries
are available (fixes: #392313).
* sys/directdraw/gstdirectdrawsink.c:
(gst_directdrawsink_center_rect), (gst_directdrawsink_show_frame),
(gst_directdrawsink_setup_ddraw),
(gst_directdrawsink_surface_create):
Comment out some unused things and fix some printf format issues in
order to avoid warnings when buildling with MingW (#392313).
This commit is contained in:
Vincent Torri 2007-01-03 19:54:33 +00:00 committed by Jan Schmidt
parent c807b70709
commit 7a8bf9900c
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sys/directdraw/Makefile.am Normal file
View file

@ -0,0 +1,9 @@
plugin_LTLIBRARIES = libgstdirectdrawsink.la
libgstdirectdrawsink_la_SOURCES = gstdirectdrawsink.c gstdirectdrawplugin.c
libgstdirectdrawsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS)
libgstdirectdrawsink_la_LIBADD = $(DIRECTDRAW_LIBS) \
$(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-lgstinterfaces-$(GST_MAJORMINOR)
libgstdirectdrawsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)

17
sys/directdraw/gstdirectdrawsink.c
View file

@ -168,6 +168,7 @@ gst_ddrawvideosink_get_format_from_caps (GstCaps * caps,
return ret; return ret;
} }
/*
static GstCaps * static GstCaps *
gst_ddrawvideosink_get_caps_from_format (DDPIXELFORMAT pixel_format) gst_ddrawvideosink_get_caps_from_format (DDPIXELFORMAT pixel_format)
{ {
@ -201,6 +202,7 @@ gst_ddrawvideosink_get_caps_from_format (DDPIXELFORMAT pixel_format)
return caps; return caps;
} }
*/
static void static void
gst_directdrawsink_center_rect (RECT src, RECT dst, RECT * result) gst_directdrawsink_center_rect (RECT src, RECT dst, RECT * result)
@ -241,7 +243,7 @@ gst_directdrawsink_center_rect (RECT src, RECT dst, RECT * result)
} }
GST_CAT_INFO (directdrawsink_debug, GST_CAT_INFO (directdrawsink_debug,
"source is %dx%d dest is %dx%d, result is %dx%d with x,y %dx%d", "source is %ldx%ld dest is %ldx%ld, result is %ldx%ld with x,y %ldx%ld",
src_width, src_height, dst_width, dst_heigth, src_width, src_height, dst_width, dst_heigth,
result->right - result->left, result->bottom - result->top, result->left, result->right - result->left, result->bottom - result->top, result->left,
result->right); result->right);
@ -1189,8 +1191,7 @@ gst_directdrawsink_show_frame (GstBaseSink * bsink, GstBuffer * buf)
"IDirectDrawSurface_Blt returned %s", DDErrorString (hRes)); "IDirectDrawSurface_Blt returned %s", DDErrorString (hRes));
else else
GST_CAT_INFO (directdrawsink_debug, GST_CAT_INFO (directdrawsink_debug,
"allocated surface was blit to our primary", "allocated surface was blit to our primary");
DDErrorString (hRes));
} }
} }
} }
@ -1212,7 +1213,7 @@ gst_directdrawsink_setup_ddraw (GstDirectDrawSink * ddrawsink)
/*UUID IDirectDraw7_ID; /*UUID IDirectDraw7_ID;
//IDirectDraw_QueryInterface() //IDirectDraw_QueryInterface()
/*create an instance of the ddraw object create an instance of the ddraw object
hRes = DirectDrawCreateEx (DDCREATE_EMULATIONONLY, (void**)&ddrawsink->ddraw_object, hRes = DirectDrawCreateEx (DDCREATE_EMULATIONONLY, (void**)&ddrawsink->ddraw_object,
(REFIID)IID_IDirectDraw7, NULL); (REFIID)IID_IDirectDraw7, NULL);
*/ */
@ -1679,7 +1680,7 @@ gst_directdrawsink_surface_create (GstDirectDrawSink * ddrawsink,
if (surf_lock_desc.lPitch != pitch) { if (surf_lock_desc.lPitch != pitch) {
GST_CAT_INFO (directdrawsink_debug, GST_CAT_INFO (directdrawsink_debug,
"DDraw stride/pitch %d isn't as expected value %d, let's continue allocating buffer.", "DDraw stride/pitch %ld isn't as expected value %d, let's continue allocating buffer.",
surf_lock_desc.lPitch, pitch); surf_lock_desc.lPitch, pitch);
/*Unlock the surface as we will change it to use system memory with a GStreamer compatible pitch */ /*Unlock the surface as we will change it to use system memory with a GStreamer compatible pitch */
@ -1688,7 +1689,7 @@ gst_directdrawsink_surface_create (GstDirectDrawSink * ddrawsink,
} }
GST_CAT_INFO (directdrawsink_debug, GST_CAT_INFO (directdrawsink_debug,
"allocating a surface of %d bytes (stride=%d)\n", size, "allocating a surface of %d bytes (stride=%ld)\n", size,
surf_lock_desc.lPitch); surf_lock_desc.lPitch);
GST_BUFFER_DATA (surface) = surf_lock_desc.lpSurface; GST_BUFFER_DATA (surface) = surf_lock_desc.lpSurface;
GST_BUFFER_SIZE (surface) = surf_lock_desc.lPitch * surface->height; GST_BUFFER_SIZE (surface) = surf_lock_desc.lPitch * surface->height;
@ -1718,7 +1719,9 @@ gst_directdrawsink_surface_create (GstDirectDrawSink * ddrawsink,
/* Keep a ref to our sink */ /* Keep a ref to our sink */
surface->ddrawsink = gst_object_ref (ddrawsink); surface->ddrawsink = gst_object_ref (ddrawsink);
beach: /*
beach:
*/
return surface; return surface;
} }