diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | ext/Makefile.am | 9 | ||||
| -rw-r--r-- | ext/swfdec/Makefile.am | 4 | ||||
| -rw-r--r-- | ext/swfdec/gstswfdec.c | 459 | ||||
| -rw-r--r-- | ext/swfdec/gstswfdec.h | 26 |
6 files changed, 382 insertions, 134 deletions
@@ -1,3 +1,12 @@ +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), diff --git a/configure.ac b/configure.ac index 18fa668c..c895edb3 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/ext/Makefile.am b/ext/Makefile.am index 0d09da18..5d3d510c 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -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 diff --git a/ext/swfdec/Makefile.am b/ext/swfdec/Makefile.am index 6207e275..d4e989f8 100644 --- a/ext/swfdec/Makefile.am +++ b/ext/swfdec/Makefile.am @@ -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 diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c index b9e12d71..a86a0a6a 100644 --- a/ext/swfdec/gstswfdec.c +++ b/ext/swfdec/gstswfdec.c @@ -36,6 +36,7 @@ GST_ELEMENT_DETAILS ("SWF video decoder", /* Swfdec signals and args */ enum { + SIGNAL_EMBED_URL, /* FILL ME */ LAST_SIGNAL }; @@ -46,11 +47,26 @@ enum /* FILL ME */ }; +#define __GST_VIDEO_CAPS_MAKE_32_new(R, G, B) \ + "video/x-raw-rgb, " \ + "bpp = (int) 32, " \ + "depth = (int) 24, " \ + "endianness = (int) BIG_ENDIAN, " \ + "red_mask = (int) " GST_VIDEO_BYTE ## R ## _MASK_32 ", " \ + "green_mask = (int) " GST_VIDEO_BYTE ## G ## _MASK_32 ", " \ + "blue_mask = (int) " GST_VIDEO_BYTE ## B ## _MASK_32 ", " \ + "width = " GST_VIDEO_SIZE_RANGE ", " \ + "height = " GST_VIDEO_SIZE_RANGE ", " \ + "framerate = (fraction) [ 0, MAX ]" + +#define GST_VIDEO_CAPS_BGRx_new \ + __GST_VIDEO_CAPS_MAKE_32 (3, 2, 1) + static GstStaticPadTemplate video_template_factory = GST_STATIC_PAD_TEMPLATE ("video_00", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRx) + GST_STATIC_CAPS (GST_VIDEO_CAPS_BGRx_new) ); static GstStaticPadTemplate audio_template_factory = @@ -82,17 +98,20 @@ static void gst_swfdec_set_property (GObject * object, guint prop_id, static void gst_swfdec_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); +static gboolean gst_swfdec_sink_event (GstPad * pad, GstEvent * event); + static gboolean gst_swfdec_src_event (GstPad * pad, GstEvent * event); -static gboolean gst_swfdec_src_query (GstPad * pad, GstQueryType type, - GstFormat * format, gint64 * value); +static gboolean gst_swfdec_src_query (GstPad * pad, GstQuery * query); static const GstQueryType *gst_swfdec_get_query_types (GstPad * pad); -static const GstEventMask *gst_swfdec_get_event_masks (GstPad * pad); static GstStateChangeReturn gst_swfdec_change_state (GstElement * element, GstStateChange transition); +static GstFlowReturn gst_swfdec_chain (GstPad * pad, GstBuffer * buffer); +static void gst_swfdec_render (GstSwfdec * swfdec, int ret); static GstElementClass *parent_class = NULL; +static guint gst_swfdec_signals[LAST_SIGNAL]; GType gst_swfdec_get_type (void) @@ -132,6 +151,7 @@ gst_swfdec_base_init (gpointer g_class) gst_element_class_add_pad_template (element_class, gst_static_pad_template_get (&sink_template_factory)); } + static void gst_swfdec_class_init (GstSwfdecClass * klass) { @@ -148,6 +168,12 @@ gst_swfdec_class_init (GstSwfdecClass * klass) gobject_class->dispose = gst_swfdec_dispose; gstelement_class->change_state = gst_swfdec_change_state; + + gst_swfdec_signals[SIGNAL_EMBED_URL] = + g_signal_new ("embed-url", G_TYPE_FROM_CLASS (klass), + G_SIGNAL_RUN_LAST, + G_STRUCT_OFFSET (GstSwfdecClass, embed_url), NULL, NULL, + g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING); } static GstCaps * @@ -161,41 +187,40 @@ gst_swfdec_video_getcaps (GstPad * pad) caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); if (swfdec->have_format) { gst_caps_set_simple (caps, - "framerate", G_TYPE_DOUBLE, swfdec->frame_rate, NULL); + "framerate", GST_TYPE_FRACTION, swfdec->frame_rate_n, + swfdec->frame_rate_d, NULL); } return caps; } -static GstPadLinkReturn -gst_swfdec_video_link (GstPad * pad, const GstCaps * caps) +static gboolean +gst_swfdec_video_link (GstPad * pad, GstCaps * caps) { GstSwfdec *swfdec; GstStructure *structure; int width, height; int ret; + gboolean res = FALSE; swfdec = GST_SWFDEC (gst_pad_get_parent (pad)); - if (!swfdec->have_format) { - return GST_PAD_LINK_DELAYED; - } - structure = gst_caps_get_structure (caps, 0); gst_structure_get_int (structure, "width", &width); gst_structure_get_int (structure, "height", &height); - g_print ("setting size to %d x %d\n", width, height); ret = swfdec_decoder_set_image_size (swfdec->decoder, width, height); if (ret == SWF_OK) { swfdec->width = width; swfdec->height = height; - return GST_PAD_LINK_OK; + res = TRUE; } - return GST_PAD_LINK_REFUSED; + g_object_unref (swfdec); + return res; + } static void @@ -217,78 +242,132 @@ gst_swfdec_buffer_to_swf (GstBuffer * buffer) return sbuf; } -static void -gst_swfdec_loop (GstElement * element) +GstFlowReturn +gst_swfdec_chain (GstPad * pad, GstBuffer * buffer) { - GstSwfdec *swfdec; - GstBuffer *buf = NULL; + GstFlowReturn res = GST_FLOW_OK; int ret; + GstSwfdec *swfdec = GST_SWFDEC (GST_PAD_PARENT (pad)); - g_return_if_fail (element != NULL); - g_return_if_fail (GST_IS_SWFDEC (element)); - - swfdec = GST_SWFDEC (element); - - if (!swfdec->videopad) { - } - + g_static_rec_mutex_lock (&swfdec->mutex); ret = swfdec_decoder_parse (swfdec->decoder); if (ret == SWF_NEEDBITS) { - buf = GST_BUFFER (gst_pad_pull (swfdec->sinkpad)); - if (GST_IS_EVENT (buf)) { - switch (GST_EVENT_TYPE (buf)) { - case GST_EVENT_EOS: - swfdec_decoder_eof (swfdec->decoder); - GST_DEBUG ("got eos"); - break; - default: - GST_DEBUG ("got other event"); - break; - } + guint buf_size; + GstBuffer *prev_buffer; + + buf_size = gst_adapter_available (swfdec->adapter); + if (buf_size) { + prev_buffer = gst_buffer_new_and_alloc (buf_size); + memcpy (GST_BUFFER_DATA (prev_buffer), gst_adapter_peek (swfdec->adapter, + buf_size), buf_size); + gst_adapter_flush (swfdec->adapter, buf_size); - } else { - if (!GST_BUFFER_DATA (buf)) { - GST_DEBUG ("expected non-null buffer"); - } swfdec_decoder_add_buffer (swfdec->decoder, - gst_swfdec_buffer_to_swf (buf)); + gst_swfdec_buffer_to_swf (prev_buffer)); } + + swfdec_decoder_add_buffer (swfdec->decoder, + gst_swfdec_buffer_to_swf (buffer)); + + + } else if (ret == SWF_CHANGE) { + GstCaps *caps; - GstPadLinkReturn link_ret; + double rate; + + /* Let's not depend on features that are only in CVS */ +#ifdef HAVE_SWFDEC_0_3_5 + GstTagList *taglist; +#endif + + gst_adapter_push (swfdec->adapter, buffer); swfdec_decoder_get_image_size (swfdec->decoder, &swfdec->width, &swfdec->height); - swfdec_decoder_get_rate (swfdec->decoder, &swfdec->rate); - swfdec->interval = GST_SECOND / swfdec->rate; + swfdec_decoder_get_rate (swfdec->decoder, &rate); + swfdec->interval = GST_SECOND / rate; + + swfdec->frame_rate_n = (int) (rate * 256.0); + swfdec->frame_rate_d = 256; caps = gst_caps_copy (gst_pad_get_pad_template_caps (swfdec->videopad)); - swfdec_decoder_get_rate (swfdec->decoder, &swfdec->frame_rate); gst_caps_set_simple (caps, - "framerate", G_TYPE_DOUBLE, swfdec->frame_rate, - "height", G_TYPE_INT, swfdec->height, - "width", G_TYPE_INT, swfdec->width, NULL); - link_ret = gst_pad_try_set_caps (swfdec->videopad, caps); - if (GST_PAD_LINK_SUCCESSFUL (link_ret)) { + "framerate", GST_TYPE_FRACTION, swfdec->frame_rate_n, + swfdec->frame_rate_d, "height", G_TYPE_INT, swfdec->height, "width", + G_TYPE_INT, swfdec->width, NULL); + if (gst_pad_set_caps (swfdec->videopad, caps)) { /* good */ } else { + gst_caps_unref (caps); GST_ELEMENT_ERROR (swfdec, CORE, NEGOTIATION, (NULL), (NULL)); - return; + res = GST_FLOW_ERROR; + goto done; + } + gst_caps_unref (caps); + + caps = gst_caps_copy (gst_pad_get_pad_template_caps (swfdec->audiopad)); + if (gst_pad_set_caps (swfdec->audiopad, caps)) { + swfdec->have_format = TRUE; + } else { + gst_caps_unref (caps); + GST_ELEMENT_ERROR (swfdec, CORE, NEGOTIATION, (NULL), (NULL)); + res = GST_FLOW_ERROR; + goto done; } - swfdec->have_format = TRUE; + + gst_caps_unref (caps); + + +#ifdef HAVE_SWFDEC_0_3_5 + taglist = gst_tag_list_new (); + gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, + GST_TAG_ENCODER_VERSION, swfdec_decoder_get_version (swfdec->decoder), + NULL); + gst_element_found_tags (GST_ELEMENT (swfdec), taglist); + gst_tag_list_free (taglist); +#endif + } else if (ret == SWF_EOF) { + gst_swfdec_render (swfdec, ret); + gst_task_start (swfdec->task); + } + +done: + g_static_rec_mutex_unlock (&swfdec->mutex); + return res; + +} + +static void +gst_swfdec_loop (GstSwfdec * swfdec) +{ + + gst_swfdec_render (swfdec, swfdec_decoder_parse (swfdec->decoder)); + +} + +static void +gst_swfdec_render (GstSwfdec * swfdec, int ret) +{ + + if (ret == SWF_EOF) { SwfdecBuffer *audio_buffer; SwfdecBuffer *video_buffer; GstBuffer *videobuf; GstBuffer *audiobuf; gboolean ret; + const char *url; + + swfdec_decoder_set_mouse (swfdec->decoder, swfdec->x, swfdec->y, + swfdec->button); ret = swfdec_render_iterate (swfdec->decoder); - if (!ret) { - gst_pad_push (swfdec->videopad, GST_DATA (gst_event_new (GST_EVENT_EOS))); - gst_pad_push (swfdec->audiopad, GST_DATA (gst_event_new (GST_EVENT_EOS))); - gst_element_set_eos (GST_ELEMENT (swfdec)); + if (!ret) { + gst_task_stop (swfdec->task); + gst_pad_push_event (swfdec->videopad, gst_event_new_eos ()); + gst_pad_push_event (swfdec->audiopad, gst_event_new_eos ()); return; } @@ -301,36 +380,67 @@ gst_swfdec_loop (GstElement * element) GST_DEBUG ("sending discont %" G_GINT64_FORMAT, swfdec->timestamp); - event = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, - swfdec->timestamp, GST_FORMAT_UNDEFINED); - gst_pad_push (swfdec->videopad, GST_DATA (event)); + event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, + swfdec->timestamp, GST_CLOCK_TIME_NONE, 0); + gst_pad_push_event (swfdec->videopad, event); - event = gst_event_new_discontinuous (FALSE, GST_FORMAT_TIME, - swfdec->timestamp, GST_FORMAT_UNDEFINED); - gst_pad_push (swfdec->audiopad, GST_DATA (event)); + event = gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, + swfdec->timestamp, GST_CLOCK_TIME_NONE, 0); + gst_pad_push_event (swfdec->audiopad, event); swfdec->send_discont = FALSE; } GST_DEBUG ("pushing image/sound %" G_GINT64_FORMAT, swfdec->timestamp); - video_buffer = swfdec_render_get_image (swfdec->decoder); - videobuf = gst_buffer_new (); - GST_BUFFER_DATA (videobuf) = video_buffer->data; - GST_BUFFER_SIZE (videobuf) = video_buffer->length; - GST_BUFFER_TIMESTAMP (videobuf) = swfdec->timestamp; + if (swfdec->skip_index) { + video_buffer = NULL; + swfdec->skip_index--; + } else { + - gst_pad_push (swfdec->videopad, GST_DATA (videobuf)); + video_buffer = swfdec_render_get_image (swfdec->decoder); + + if (!video_buffer) { + gst_task_stop (swfdec->task); + gst_pad_push_event (swfdec->videopad, gst_event_new_eos ()); + gst_pad_push_event (swfdec->audiopad, gst_event_new_eos ()); + return; + } + + swfdec->skip_index = swfdec->skip_frames - 1; + + videobuf = gst_buffer_new (); + GST_BUFFER_DATA (videobuf) = video_buffer->data; + GST_BUFFER_SIZE (videobuf) = video_buffer->length; + GST_BUFFER_TIMESTAMP (videobuf) = swfdec->timestamp; + gst_buffer_set_caps (videobuf, GST_PAD_CAPS (swfdec->videopad)); + + gst_pad_push (swfdec->videopad, videobuf); + + } audio_buffer = swfdec_render_get_audio (swfdec->decoder); - audiobuf = gst_buffer_new (); - GST_BUFFER_DATA (audiobuf) = audio_buffer->data; - GST_BUFFER_SIZE (audiobuf) = audio_buffer->length; - GST_BUFFER_TIMESTAMP (audiobuf) = swfdec->timestamp; - gst_pad_push (swfdec->audiopad, GST_DATA (audiobuf)); + if (audio_buffer) { + + audiobuf = gst_buffer_new (); + GST_BUFFER_DATA (audiobuf) = audio_buffer->data; + GST_BUFFER_SIZE (audiobuf) = audio_buffer->length; + GST_BUFFER_TIMESTAMP (audiobuf) = swfdec->timestamp; + gst_buffer_set_caps (audiobuf, GST_PAD_CAPS (swfdec->audiopad)); + + gst_pad_push (swfdec->audiopad, audiobuf); + + } swfdec->timestamp += swfdec->interval; + + url = swfdec_decoder_get_url (swfdec->decoder); + if (url) { + g_signal_emit (G_OBJECT (swfdec), gst_swfdec_signals[SIGNAL_EMBED_URL], + 0, url); + } } } @@ -343,17 +453,20 @@ gst_swfdec_init (GstSwfdec * swfdec) (&sink_template_factory), "sink"); gst_element_add_pad (GST_ELEMENT (swfdec), swfdec->sinkpad); + gst_pad_set_chain_function (swfdec->sinkpad, gst_swfdec_chain); + gst_pad_set_event_function (swfdec->sinkpad, gst_swfdec_sink_event); + swfdec->videopad = gst_pad_new_from_template (gst_static_pad_template_get (&video_template_factory), "video_00"); gst_pad_set_query_function (swfdec->videopad, gst_swfdec_src_query); gst_pad_set_getcaps_function (swfdec->videopad, gst_swfdec_video_getcaps); - gst_pad_set_link_function (swfdec->videopad, gst_swfdec_video_link); + gst_pad_set_setcaps_function (swfdec->videopad, gst_swfdec_video_link); gst_pad_set_event_function (swfdec->videopad, gst_swfdec_src_event); - gst_pad_set_event_mask_function (swfdec->videopad, - gst_swfdec_get_event_masks); + gst_pad_set_query_type_function (swfdec->videopad, gst_swfdec_get_query_types); + gst_element_add_pad (GST_ELEMENT (swfdec), swfdec->videopad); swfdec->audiopad = @@ -361,13 +474,12 @@ gst_swfdec_init (GstSwfdec * swfdec) (&audio_template_factory), "audio_00"); gst_pad_set_query_function (swfdec->audiopad, gst_swfdec_src_query); gst_pad_set_event_function (swfdec->audiopad, gst_swfdec_src_event); - gst_pad_set_event_mask_function (swfdec->audiopad, - gst_swfdec_get_event_masks); + gst_pad_set_query_type_function (swfdec->audiopad, gst_swfdec_get_query_types); + gst_element_add_pad (GST_ELEMENT (swfdec), swfdec->audiopad); - gst_element_set_loop_function (GST_ELEMENT (swfdec), gst_swfdec_loop); /* initialize the swfdec decoder state */ swfdec->decoder = swfdec_decoder_new (); @@ -375,9 +487,19 @@ gst_swfdec_init (GstSwfdec * swfdec) swfdec_decoder_set_colorspace (swfdec->decoder, SWF_COLORSPACE_RGB888); - GST_OBJECT_FLAG_SET (GST_ELEMENT (swfdec), GST_ELEMENT_EVENT_AWARE); + swfdec->frame_rate_n = 0; + swfdec->frame_rate_d = 1; + swfdec->x = -1; + swfdec->y = -1; + + swfdec->skip_frames = 2; + swfdec->skip_index = 0; + + swfdec->adapter = gst_adapter_new (); + swfdec->task = gst_task_create ((GstTaskFunction) gst_swfdec_loop, swfdec); + g_static_rec_mutex_init (&swfdec->mutex); + gst_task_set_lock (swfdec->task, &swfdec->mutex); - swfdec->frame_rate = 0.; } static void @@ -385,6 +507,13 @@ gst_swfdec_dispose (GObject * object) { GstSwfdec *swfdec = GST_SWFDEC (object); + gst_task_stop (swfdec->task); + gst_task_join (swfdec->task); + gst_object_unref (swfdec->task); + g_static_rec_mutex_free (&swfdec->mutex); + + g_object_unref (swfdec->adapter); + swfdec_decoder_free (swfdec->decoder); G_OBJECT_CLASS (parent_class)->dispose (object); @@ -394,8 +523,8 @@ static const GstQueryType * gst_swfdec_get_query_types (GstPad * pad) { static const GstQueryType gst_swfdec_query_types[] = { - GST_QUERY_TOTAL, GST_QUERY_POSITION, + GST_QUERY_DURATION, 0 }; @@ -403,18 +532,41 @@ gst_swfdec_get_query_types (GstPad * pad) } static gboolean -gst_swfdec_src_query (GstPad * pad, GstQueryType type, - GstFormat * format, gint64 * value) +gst_swfdec_src_query (GstPad * pad, GstQuery * query) { gboolean res = TRUE; GstSwfdec *swfdec; swfdec = GST_SWFDEC (gst_pad_get_parent (pad)); - switch (type) { - case GST_QUERY_TOTAL: + switch (GST_QUERY_TYPE (query)) { + case GST_QUERY_POSITION: { - switch (*format) { + GstFormat format; + gint64 value; + + gst_query_parse_position (query, &format, NULL); + + switch (format) { + case GST_FORMAT_TIME: + value = swfdec_render_get_frame_index (swfdec->decoder) * + swfdec->interval; + gst_query_set_position (query, GST_FORMAT_TIME, value); + res = TRUE; + default: + res = FALSE; + break; + } + break; + } + case GST_QUERY_DURATION: + { + GstFormat format; + gint64 value; + + gst_query_parse_duration (query, &format, NULL); + + switch (format) { case GST_FORMAT_TIME: { int n_frames; @@ -423,7 +575,8 @@ gst_swfdec_src_query (GstPad * pad, GstQueryType type, res = FALSE; ret = swfdec_decoder_get_n_frames (swfdec->decoder, &n_frames); if (ret == SWF_OK) { - *value = n_frames * swfdec->interval; + value = n_frames * swfdec->interval; + gst_query_set_duration (query, GST_FORMAT_TIME, value); res = TRUE; } break; @@ -434,37 +587,50 @@ gst_swfdec_src_query (GstPad * pad, GstQueryType type, } break; } - case GST_QUERY_POSITION: - { - switch (*format) { - case GST_FORMAT_TIME: - *value = swfdec_render_get_frame_index (swfdec->decoder) * - swfdec->interval; - res = TRUE; - default: - res = FALSE; - break; - } - break; - } default: res = FALSE; break; } + g_object_unref (swfdec); return res; } -static const GstEventMask * +#if 0 gst_swfdec_get_event_masks (GstPad * pad) { static const GstEventMask gst_swfdec_event_masks[] = { {GST_EVENT_SEEK, GST_SEEK_METHOD_SET | GST_SEEK_FLAG_FLUSH}, + {GST_EVENT_NAVIGATION, 0}, {0,} }; return gst_swfdec_event_masks; } +#endif + +static gboolean +gst_swfdec_sink_event (GstPad * pad, GstEvent * event) +{ + GstSwfdec *swfdec; + gboolean ret; + + swfdec = GST_SWFDEC (GST_PAD_PARENT (pad)); + + switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_EOS: + swfdec_decoder_eof (swfdec->decoder); + gst_task_start (swfdec->task); + gst_event_unref (event); + ret = TRUE; + break; + default: + ret = gst_pad_event_default (pad, event); + break; + } + + return ret; +} static gboolean gst_swfdec_src_event (GstPad * pad, GstEvent * event) @@ -472,10 +638,7 @@ gst_swfdec_src_event (GstPad * pad, GstEvent * event) gboolean res = TRUE; GstSwfdec *swfdec; - //static const GstFormat formats[] = { GST_FORMAT_TIME, GST_FORMAT_BYTES }; - #define MAX_SEEK_FORMATS 1 /* we can only do time seeking for now */ - //gint i; swfdec = GST_SWFDEC (gst_pad_get_parent (pad)); @@ -483,11 +646,20 @@ gst_swfdec_src_event (GstPad * pad, GstEvent * event) /* the all-formats seek logic */ case GST_EVENT_SEEK: { + gdouble rate; + GstFormat format; + GstSeekFlags flags; + GstSeekType start_type, stop_type; + gint64 start, stop; + int new_frame; int ret; int n_frames; - new_frame = event->event_data.seek.offset / swfdec->interval; + gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start, + &stop_type, &stop); + + new_frame = start / swfdec->interval; ret = swfdec_decoder_get_n_frames (swfdec->decoder, &n_frames); if (new_frame >= 0 && new_frame < n_frames) { @@ -497,10 +669,11 @@ gst_swfdec_src_event (GstPad * pad, GstEvent * event) swfdec_render_seek (swfdec->decoder, new_frame); GST_DEBUG ("sending flush event\n"); - event = gst_event_new (GST_EVENT_FLUSH); - gst_pad_push (swfdec->videopad, GST_DATA (event)); - event = gst_event_new (GST_EVENT_FLUSH); - gst_pad_push (swfdec->audiopad, GST_DATA (event)); + + event = gst_event_new_flush_start (); + gst_pad_push_event (swfdec->videopad, event); + event = gst_event_new_flush_start (); + gst_pad_push_event (swfdec->audiopad, event); swfdec->send_discont = TRUE; swfdec->seek_frame = new_frame; @@ -509,11 +682,36 @@ gst_swfdec_src_event (GstPad * pad, GstEvent * event) res = TRUE; break; } + case GST_EVENT_NAVIGATION: + { + const GstStructure *structure = gst_event_get_structure (event); + const char *type; + + type = gst_structure_get_string (structure, "event"); + GST_DEBUG ("got nav event %s", type); + if (g_str_equal (type, "mouse-move")) { + gst_structure_get_double (structure, "pointer_x", &swfdec->x); + gst_structure_get_double (structure, "pointer_y", &swfdec->y); + } else if (g_str_equal (type, "mouse-button-press")) { + gst_structure_get_double (structure, "pointer_x", &swfdec->x); + gst_structure_get_double (structure, "pointer_y", &swfdec->y); + swfdec->button = 1; + } else if (g_str_equal (type, "mouse-button-release")) { + gst_structure_get_double (structure, "pointer_x", &swfdec->x); + gst_structure_get_double (structure, "pointer_y", &swfdec->y); + swfdec->button = 0; + } + break; + } default: - res = FALSE; + res = gst_pad_event_default (pad, event); + event = NULL; break; } - gst_event_unref (event); + if (event) { + gst_event_unref (event); + } + gst_object_unref (swfdec); return res; } @@ -521,17 +719,21 @@ static GstStateChangeReturn gst_swfdec_change_state (GstElement * element, GstStateChange transition) { GstSwfdec *swfdec = GST_SWFDEC (element); + GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; switch (transition) { case GST_STATE_CHANGE_NULL_TO_READY: break; case GST_STATE_CHANGE_READY_TO_PAUSED: { - //gst_swfdec_vo_open (swfdec); - //swfdec_decoder_new (swfdec->decoder, swfdec->accel, swfdec->vo); - - //swfdec->decoder->is_sequence_needed = 1; - //swfdec->decoder->frame_rate_code = 0; + gst_adapter_clear (swfdec->adapter); + /* + gst_swfdec_vo_open (swfdec); + swfdec_decoder_new (swfdec->decoder, swfdec->accel, swfdec->vo); + + swfdec->decoder->is_sequence_needed = 1; + swfdec->decoder->frame_rate_code = 0; + */ swfdec->timestamp = 0; swfdec->closed = FALSE; @@ -544,8 +746,18 @@ gst_swfdec_change_state (GstElement * element, GstStateChange transition) break; } case GST_STATE_CHANGE_PAUSED_TO_PLAYING: + gst_task_start (swfdec->task); + break; + default: break; + } + + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + + switch (transition) { case GST_STATE_CHANGE_PLAYING_TO_PAUSED: + gst_task_pause (swfdec->task); + gst_task_join (swfdec->task); break; case GST_STATE_CHANGE_PAUSED_TO_READY: /* if we are not closed by an EOS event do so now, this cen send a few frames but @@ -554,15 +766,18 @@ gst_swfdec_change_state (GstElement * element, GstStateChange transition) /*swf_close (swfdec->decoder); */ swfdec->closed = TRUE; } - //gst_swfdec_vo_destroy (swfdec); + /* gst_swfdec_vo_destroy (swfdec); */ break; case GST_STATE_CHANGE_READY_TO_NULL: + gst_task_stop (swfdec->task); + gst_task_join (swfdec->task); break; default: break; } - return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + return ret; + } static void @@ -571,6 +786,7 @@ gst_swfdec_set_property (GObject * object, guint prop_id, const GValue * value, { GstSwfdec *src; + /* it's not null if we got it, but it might not be ours */ g_return_if_fail (GST_IS_SWFDEC (object)); src = GST_SWFDEC (object); @@ -586,6 +802,7 @@ gst_swfdec_get_property (GObject * object, guint prop_id, GValue * value, { GstSwfdec *swfdec; + /* it's not null if we got it, but it might not be ours */ g_return_if_fail (GST_IS_SWFDEC (object)); swfdec = GST_SWFDEC (object); @@ -598,7 +815,7 @@ gst_swfdec_get_property (GObject * object, guint prop_id, GValue * value, void art_warn (const char *fmt, ...) { - GST_ERROR ("caught art_warn"); + GST_LOG ("caught art_warn"); } static gboolean diff --git a/ext/swfdec/gstswfdec.h b/ext/swfdec/gstswfdec.h index ea8bc59f..66e68eff 100644 --- a/ext/swfdec/gstswfdec.h +++ b/ext/swfdec/gstswfdec.h @@ -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); |