Commit b57b82d5 authored by Edgard Gusmão Lima's avatar Edgard Gusmão Lima

swfdec Ported to 0.10.

Original commit message from CVS:
swfdec Ported to 0.10.
parent bf3ce4ca
2005-12-09 Edgard Lima <edgard.lima@indt.org.br>
* configure.ac:
* ext/Makefile.am:
* ext/swfdec/Makefile.am:
* ext/swfdec/gstswfdec.c:
* ext/swfdec/gstswfdec.h:
swfdec Ported to 0.10.
2005-12-07 Edward Hervey <edward@fluendo.com>
* gst/qtdemux/qtdemux.c: (gst_qtdemux_loop_header),
......
......@@ -419,6 +419,14 @@ GST_CHECK_FEATURE(SDL, [SDL plug-in], sdlvideosink, [
AM_PATH_SDL(, HAVE_SDL=yes, HAVE_SDL=no)
])
dnl *** swfdec ***
translit(dnm, m, l) AM_CONDITIONAL(USE_SWFDEC, true)
GST_CHECK_FEATURE(SWFDEC, [swfdec plug-in], swfdec, [
PKG_CHECK_MODULES(SWFDEC, swfdec-0.3 >= 0.3.3, HAVE_SWFDEC=yes, HAVE_SWFDEC=no)
AC_SUBST(SWFDEC_CFLAGS)
AC_SUBST(SWFDEC_LIBS)
])
dnl *** wavpack ***
dnl We ship our own version of the library
translit(dnm, m, l) AM_CONDITIONAL(USE_WAVPACK, true)
......@@ -528,6 +536,7 @@ ext/Makefile
ext/directfb/Makefile
ext/faac/Makefile
ext/faad/Makefile
ext/swfdec/Makefile
ext/wavpack/Makefile
ext/ivorbis/Makefile
ext/gsm/Makefile
......
......@@ -172,11 +172,11 @@ SMOOTHWAVE_DIR=
SNDFILE_DIR=
# endif
# if USE_SWFDEC
# SWFDEC_DIR=swfdec
# else
if USE_SWFDEC
SWFDEC_DIR=swfdec
else
SWFDEC_DIR=
# endif
endif
# if USE_TARKIN
# TARKIN_DIR=tarkin
......@@ -240,4 +240,5 @@ DIST_SUBDIRS= \
libmms \
musepack \
sdl \
swfdec \
wavpack
......@@ -3,8 +3,8 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstswfdec.la
libgstswfdec_la_SOURCES = gstswfdec.c
libgstswfdec_la_CFLAGS = $(GST_CFLAGS) $(SWFDEC_CFLAGS)
libgstswfdec_la_LIBADD = $(SWFDEC_LIBS)
libgstswfdec_la_CFLAGS = $(GST_CFLAGS) $(SWFDEC_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
libgstswfdec_la_LIBADD = $(SWFDEC_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS)
libgstswfdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstswfdec.h
......
This diff is collapsed.
......@@ -23,20 +23,21 @@
#include <gst/gst.h>
#include <gst/base/gstadapter.h>
#include <swfdec.h>
#include <swfdec_render.h>
G_BEGIN_DECLS
#define GST_TYPE_SWFDEC \
#define GST_TYPE_SWFDEC \
(gst_swfdec_get_type())
#define GST_SWFDEC(obj) \
#define GST_SWFDEC(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SWFDEC,GstSwfdec))
#define GST_SWFDEC_CLASS(klass) \
#define GST_SWFDEC_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SWFDEC,GstSwfdec))
#define GST_IS_SWFDEC(obj) \
#define GST_IS_SWFDEC(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SWFDEC))
#define GST_IS_SWFDEC_CLASS(obj) \
#define GST_IS_SWFDEC_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SWFDEC))
typedef struct _GstSwfdec GstSwfdec;
......@@ -51,6 +52,10 @@ struct _GstSwfdec
GstPad *videopad;
GstPad *audiopad;
GstAdapter *adapter;
GstTask *task;
GStaticRecMutex mutex;
SwfdecDecoder *decoder;
gboolean closed;
......@@ -60,10 +65,10 @@ struct _GstSwfdec
gboolean send_discont;
int seek_frame;
double rate;
gint64 timestamp;
gint64 interval;
double frame_rate;
int frame_rate_n;
int frame_rate_d;
/* video state */
gint format;
......@@ -71,11 +76,18 @@ struct _GstSwfdec
gint height;
gint64 total_frames;
double x, y;
int button;
int skip_frames;
int skip_index;
};
struct _GstSwfdecClass
{
GstElementClass parent_class;
void (*embed_url) (GstElement *element, const char *url);
};
GType gst_swfdec_get_type (void);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment