mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 17:20:36 +00:00
Makefile.am: Add win32 MANIFEST
Original commit message from CVS: * Makefile.am: Add win32 MANIFEST * sys/directdraw/gstdirectdrawsink.c: * sys/directdraw/gstdirectdrawsink.h: Clear unused code and add comments. Remove yuv from template caps, it only supports RGB actually. Implement XOverlay interface and remove window and fullscreen properties. Add debug logs. Test for blit capabilities to return only the current colorspace if the hardware can't blit for one colorspace to another. * sys/directsound/gstdirectsoundsink.c: Add some debugs. * win32/MANIFEST: Add VS7 project files and solution. * win32/vs6/gst_plugins_bad.dsw: * win32/vs6/libgstdirectdraw.dsp: * win32/vs6/libgstdirectsound.dsp: * win32/vs6/libgstqtdemux.dsp: Update project files.
This commit is contained in:
Sébastien Moutte
parent
5d4ad6d183
commit
711f00bb88
9 changed files with 463 additions and 258 deletions
24
ChangeLog
24
ChangeLog
|
|
@ -1,3 +1,27 @@
|
|||
2007-02-11 Sébastien Moutte <sebastien@moutte.net>
|
||||
|
||||
* Makefile.am:
|
||||
Add win32 MANIFEST
|
||||
* sys/directdraw/gstdirectdrawsink.c:
|
||||
* sys/directdraw/gstdirectdrawsink.h:
|
||||
Clear unused code and add comments.
|
||||
Remove yuv from template caps, it only supports RGB
|
||||
actually.
|
||||
Implement XOverlay interface and remove window and fullscreen
|
||||
properties.
|
||||
Add debug logs.
|
||||
Test for blit capabilities to return only the current colorspace if
|
||||
the hardware can't blit for one colorspace to another.
|
||||
* sys/directsound/gstdirectsoundsink.c:
|
||||
Add some debugs.
|
||||
* win32/MANIFEST:
|
||||
Add VS7 project files and solution.
|
||||
* win32/vs6/gst_plugins_bad.dsw:
|
||||
* win32/vs6/libgstdirectdraw.dsp:
|
||||
* win32/vs6/libgstdirectsound.dsp:
|
||||
* win32/vs6/libgstqtdemux.dsp:
|
||||
Update project files.
|
||||
|
||||
2007-02-11 Stefan Kost <ensonic@users.sf.net>
|
||||
|
||||
* ext/faad/gstfaad.c:
|
||||
|
|
|
|||
|
|
@ -16,10 +16,16 @@ DIST_SUBDIRS = \
|
|||
m4 common docs tests po \
|
||||
examples
|
||||
|
||||
win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
|
||||
|
||||
debug:
|
||||
echo $(win32)
|
||||
|
||||
EXTRA_DIST = \
|
||||
gst-plugins-bad.spec depcomp \
|
||||
AUTHORS COPYING NEWS README RELEASE REQUIREMENTS \
|
||||
ChangeLog gst-plugins-bad.doap autogen.sh
|
||||
ChangeLog gst-plugins-bad.doap autogen.sh \
|
||||
$(win32)
|
||||
|
||||
DISTCLEANFILES = _stdint.h
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -27,8 +27,9 @@
|
|||
|
||||
#include <gst/gst.h>
|
||||
#include <gst/video/gstvideosink.h>
|
||||
#include <windows.h>
|
||||
#include <gst/interfaces/xoverlay.h>
|
||||
|
||||
#include <windows.h>
|
||||
#include <ddraw.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
|
@ -51,87 +52,76 @@ struct _GstDDrawSurface
|
|||
/* Extension of GstBuffer to store directdraw surfaces */
|
||||
GstBuffer buffer;
|
||||
|
||||
/*directdraw surface */
|
||||
/* directdraw surface */
|
||||
LPDIRECTDRAWSURFACE surface;
|
||||
|
||||
/* surface dimensions */
|
||||
gint width;
|
||||
gint height;
|
||||
|
||||
/*TRUE when surface is locked*/
|
||||
gboolean locked;
|
||||
|
||||
/*TRUE when surface is using a system memory buffer
|
||||
(i'm using system memory when directdraw optimized pitch is not the same as the GStreamer one)*/
|
||||
gboolean system_memory;
|
||||
|
||||
/* pixel format of the encapsulated surface */
|
||||
DDPIXELFORMAT dd_pixel_format;
|
||||
|
||||
/* pointer to parent */
|
||||
GstDirectDrawSink *ddrawsink;
|
||||
};
|
||||
|
||||
|
||||
typedef struct _GstDDDDisplayMode GstDDDisplayMode;
|
||||
|
||||
struct _GstDDDDisplayMode
|
||||
{
|
||||
gint width;
|
||||
gint height;
|
||||
gint bpp;
|
||||
};
|
||||
|
||||
struct _GstDirectDrawSink
|
||||
{
|
||||
GstVideoSink videosink;
|
||||
|
||||
/*directdraw offscreen surfaces pool */
|
||||
/* directdraw offscreen surfaces pool */
|
||||
GSList *buffer_pool;
|
||||
GMutex *pool_lock;
|
||||
|
||||
GSList *display_modes;
|
||||
//GstDDDisplayMode display_mode;
|
||||
|
||||
/*directdraw objects */
|
||||
/* directdraw objects */
|
||||
LPDIRECTDRAW ddraw_object;
|
||||
LPDIRECTDRAWSURFACE primary_surface;
|
||||
LPDIRECTDRAWSURFACE offscreen_surface;
|
||||
LPDIRECTDRAWSURFACE overlays;
|
||||
LPDIRECTDRAWCLIPPER clipper;
|
||||
|
||||
/*DDCAPS DDDriverCaps;
|
||||
DDCAPS DDHELCaps;
|
||||
gboolean can_blit;*/
|
||||
/* last buffer displayed (used for XOverlay interface expose method) */
|
||||
GstBuffer * last_buffer;
|
||||
|
||||
/*Directdraw caps */
|
||||
/* directdraw caps */
|
||||
GstCaps *caps;
|
||||
|
||||
/*handle of the video window */
|
||||
/* video window management */
|
||||
HWND video_window;
|
||||
gboolean our_video_window;
|
||||
HANDLE window_created_signal;
|
||||
gboolean resize_window;
|
||||
|
||||
/*video properties */
|
||||
|
||||
/* video properties */
|
||||
gint video_width, video_height;
|
||||
gint out_width, out_height;
|
||||
//gdouble framerate;
|
||||
gint fps_n;
|
||||
gint fps_d;
|
||||
|
||||
/*properties*/
|
||||
LPDIRECTDRAWSURFACE extern_surface;
|
||||
gboolean keep_aspect_ratio;
|
||||
gboolean fullscreen;
|
||||
|
||||
/*pixel format */
|
||||
DDPIXELFORMAT dd_pixel_format;
|
||||
|
||||
/* thread processing our default window messages */
|
||||
GThread *window_thread;
|
||||
|
||||
gboolean bUseOverlay;
|
||||
gboolean bIsOverlayVisible;
|
||||
/* TRUE when directdraw objects are setup */
|
||||
gboolean setup;
|
||||
|
||||
GMutex *pool_lock;
|
||||
|
||||
/* overlays */
|
||||
gboolean bUseOverlay;
|
||||
gboolean bIsOverlayVisible;
|
||||
guint color_key;
|
||||
/*LPDIRECTDRAWSURFACE extern_surface; */
|
||||
};
|
||||
|
||||
struct _GstDirectDrawSinkClass
|
||||
|
|
|
|||
|
|
@ -5,6 +5,9 @@ win32/vs6/libgstdirectdraw.dsp
|
|||
win32/vs6/libgstdirectsound.dsp
|
||||
win32/vs6/libgstneon.dsp
|
||||
win32/vs6/libgstqtdemux.dsp
|
||||
win32/vs7/gst-plugins-bad.sln
|
||||
win32/vs7/libgstdirectdraw.vcproj
|
||||
win32/vs7/libgstdirectsound.vcproj
|
||||
win32/vs8/gst-plugins-bad.sln
|
||||
win32/vs8/libgstdirectdraw.vcproj
|
||||
win32/vs8/libgstdirectsound.vcproj
|
||||
|
|
|
|||
|
|
@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "libgstcdxaparse"=".\libgstcdxaparse.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Project: "libgstdirectdraw"=".\libgstdirectdraw.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
|
|
@ -51,6 +63,18 @@ Package=<4>
|
|||
|
||||
###############################################################################
|
||||
|
||||
Project: "libgstwaveform"=".\libgstwaveform.dsp" - Package Owner=<4>
|
||||
|
||||
Package=<5>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
Package=<4>
|
||||
{{{
|
||||
}}}
|
||||
|
||||
###############################################################################
|
||||
|
||||
Global:
|
||||
|
||||
Package=<5>
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstvideo-0.10.lib ddraw.lib user32.lib gdi32.lib Rpcrt4.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"./release"
|
||||
# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstinterfaces-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstvideo-0.10.lib ddraw.lib user32.lib gdi32.lib Rpcrt4.lib dxguid.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"./release"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Release\libgstdirectdraw.dll
|
||||
SOURCE="$(InputPath)"
|
||||
|
|
@ -84,7 +84,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstvideo-0.10.lib ddraw.lib user32.lib gdi32.lib Rpcrt4.lib dxguid.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" /libpath:"./debug"
|
||||
# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstinterfaces-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstvideo-0.10.lib ddraw.lib user32.lib gdi32.lib Rpcrt4.lib dxguid.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" /libpath:"./debug"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Debug\libgstdirectdraw.dll
|
||||
SOURCE="$(InputPath)"
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib libgstaudio-0.10.lib glib-2.0.lib gobject-2.0.lib dsound.lib dxerr9.lib user32.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"./release"
|
||||
# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstaudio-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib dsound.lib dxerr9.lib user32.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"./release"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Release\libgstdirectsound.dll
|
||||
SOURCE="$(InputPath)"
|
||||
|
|
@ -84,7 +84,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 libgstaudio-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib dsound.lib dxerr9.lib user32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" /libpath:"./debug"
|
||||
# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstaudio-0.10.lib libgstreamer-0.10.lib libgstbase-0.10.lib dsound.lib dxerr9.lib user32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" /libpath:"./debug"
|
||||
# SUBTRACT LINK32 /incremental:no
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Debug\libgstdirectsound.dll
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ RSC=rc.exe
|
|||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTQTDEMUX_EXPORTS" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTQTDEMUX_EXPORTS" /D "HAVE_CONFIG_H" /YX /FD /c
|
||||
# ADD CPP /nologo /MD /W3 /GX /O2 /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /I "../../../gst-plugins-bad/gst/qtdemux" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTQTDEMUX_EXPORTS" /D "HAVE_CONFIG_H" /YX /FD /c
|
||||
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x40c /d "NDEBUG"
|
||||
|
|
@ -53,7 +53,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0.lib gobject-2.0.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"./release"
|
||||
# ADD LINK32 glib-2.0.lib gobject-2.0.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib /nologo /dll /machine:I386 /libpath:"../../../gstreamer/win32/vs6/release" /libpath:"../../../gst-plugins-base/win32/vs6/release" /libpath:"./release"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Release\libgstqtdemux.dll
|
||||
SOURCE="$(InputPath)"
|
||||
|
|
@ -74,7 +74,7 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\lib\gstreamer-0.10
|
|||
# PROP Ignore_Export_Lib 0
|
||||
# PROP Target_Dir ""
|
||||
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTQTDEMUX_EXPORTS" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTQTDEMUX_EXPORTS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
|
||||
# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../gst-libs" /I "../../../gstreamer" /I "../common" /I "../../../gstreamer/libs" /I "../../../gst-plugins-base/gst-libs" /I "../../../gst-plugins-bad/gst/qtdemux" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBGSTQTDEMUX_EXPORTS" /D "HAVE_CONFIG_H" /YX /FD /GZ /c
|
||||
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
|
||||
# ADD BASE RSC /l 0x40c /d "_DEBUG"
|
||||
|
|
@ -84,7 +84,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 libgstreamer-0.10.lib libgstbase-0.10.lib glib-2.0D.lib gobject-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" /libpath:"./debug"
|
||||
# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib libgstreamer-0.10.lib libgstbase-0.10.lib libgstrtp-0.10.lib /nologo /dll /debug /machine:I386 /pdbtype:sept /libpath:"../../../gstreamer/win32/vs6/debug" /libpath:"../../../gst-plugins-base/win32/vs6/debug" /libpath:"./debug"
|
||||
# Begin Special Build Tool
|
||||
TargetPath=.\Debug\libgstqtdemux.dll
|
||||
SOURCE="$(InputPath)"
|
||||
|
|
@ -102,8 +102,24 @@ PostBuild_Cmds=copy /Y $(TargetPath) c:\gstreamer\debug\lib\gstreamer-0.10
|
|||
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\qtdemux\gstrtpxqtdepay.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\qtdemux\qtdemux.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\qtdemux\qtdemux_dump.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\qtdemux\qtdemux_types.c
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\gst\qtdemux\quicktime.c
|
||||
# End Source File
|
||||
# End Group
|
||||
# Begin Group "Header Files"
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue