search for: swfdecgstvideo

...clude "swfdec_codec.h" +#include "swfdec_debug.h" + +#define swfdec_cond_wait(cond, mutex) G_STMT_START { \ + g_print ("waiting at %s\n", G_STRLOC); \ + g_cond_wait (cond, mutex); \ + g_print (" done at %s\n", G_STRLOC); \ +}G_STMT_END + +typedef struct _SwfdecGstVideo SwfdecGstVideo; +struct _SwfdecGstVideo { + GMutex * mutex; /* mutex that blocks everything below */ + GCond * cond; /* cond used to signal when stuff below changes */ + volatile int refcount; /* refcount (d'oh) */ + + GstElement * pipeline; /* pipeline that is playing or NULL when...

..., mutex); \ - g_print (" done at %s\n", G_STRLOC); \ -}G_STMT_END -#else -#define swfdec_cond_wait g_cond_wait -#endif - +/* NB: We don't put a colorspace tansform here, we just assume that the codecs + * in GStreamer decode to the native format that we enforce. */ typedef struct _SwfdecGstVideo SwfdecGstVideo; struct _SwfdecGstVideo { SwfdecVideoDecoder decoder; - GMutex * mutex; /* mutex that blocks everything below (NB: locked by default) */ - GCond * cond; /* cond used to signal when stuff below changes */ - volatile int refcount; /* refcount (d'oh) */ - - GstEleme...

...uot;swfdec_codec.h" +#include "swfdec_codec_video.h" #include "swfdec_debug.h" -#if 1 +#if 0 #define swfdec_cond_wait(cond, mutex) G_STMT_START { \ g_print ("waiting at %s\n", G_STRLOC); \ g_cond_wait (cond, mutex); \ @@ -38,6 +38,8 @@ typedef struct _SwfdecGstVideo SwfdecGstVideo; struct _SwfdecGstVideo { + SwfdecVideoDecoder decoder; + GMutex * mutex; /* mutex that blocks everything below */ GCond * cond; /* cond used to signal when stuff below changes */ volatile int refcount; /* refcount (d'oh) */ @@ -48,6 +50,8 @@ struct _SwfdecGstVi...

...wfdec_codec_gst.c index 35f00e5..2873e84 100644 --- a/libswfdec/swfdec_codec_gst.c +++ b/libswfdec/swfdec_codec_gst.c @@ -593,7 +593,7 @@ swfdec_video_decoder_gst_new (SwfdecVideoCodec codec) g_assert (srccaps); sinkcaps = swfdec_video_decoder_get_sink_caps (codec); - player = g_slice_new (SwfdecGstVideo); + player = g_slice_new0 (SwfdecGstVideo); player->decoder.decode = swfdec_video_decoder_gst_decode; player->decoder.free = swfdec_video_decoder_gst_free;

...set_state (player->pipeline, GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE) { + SWFDEC_ERROR ("failed to change sate"); + swfdec_audio_decoder_gst_free (&player->decoder); + return NULL; + } + + return &player->decoder; +} + +/*** VIDEO ***/ + typedef struct _SwfdecGstVideo SwfdecGstVideo; struct _SwfdecGstVideo { SwfdecVideoDecoder decoder; @@ -88,7 +345,7 @@ swfdec_video_decoder_gst_free (SwfdecVid swfdec_gst_video_unref (player, NULL); } -SwfdecBuffer * +static SwfdecBuffer * swfdec_video_decoder_gst_decode (SwfdecVideoDecoder *dec, SwfdecBuffer *buffer,...

...t a/libswfdec/swfdec_codec_gst.c b/libswfdec/swfdec_codec_gst.c index a125598..08cf154 100644 --- a/libswfdec/swfdec_codec_gst.c +++ b/libswfdec/swfdec_codec_gst.c @@ -351,6 +351,7 @@ swfdec_video_decoder_gst_decode (SwfdecVideoDecoder *dec, SwfdecBuffer *buffer, SwfdecVideoImage *image) { SwfdecGstVideo *player = (SwfdecGstVideo *) dec; +#define ALIGN(x, n) (((x) + (n) - 1) & (~((n) - 1))) while (player->in != NULL && !player->error) { swfdec_cond_wait (player->cond, player->mutex); @@ -376,12 +377,12 @@ swfdec_video_decoder_gst_decode (SwfdecVideoDecoder *dec, Sw...

...t a/libswfdec/swfdec_codec_gst.c b/libswfdec/swfdec_codec_gst.c index 22c5638..2167050 100644 --- a/libswfdec/swfdec_codec_gst.c +++ b/libswfdec/swfdec_codec_gst.c @@ -492,7 +492,7 @@ swfdec_video_decoder_gst_decode (SwfdecVideoDecoder *dec, SwfdecBuffer *buffer, SwfdecVideoImage *image) { SwfdecGstVideo *player = (SwfdecGstVideo *) dec; -#define ALIGN(x, n) (((x) + (n) - 1) & (~((n) - 1))) +#define SWFDEC_ALIGN(x, n) (((x) + (n) - 1) & (~((n) - 1))) GstBuffer *buf; GstCaps *caps; GstStructure *structure; @@ -542,17 +542,18 @@ swfdec_video_decoder_gst_decode (SwfdecVideoDecoder *de...

...nk (GstElement *src, GstPad *pad, GstElement *sink) { + g_print ("link!\n"); if (!gst_element_link (src, sink)) { SWFDEC_ERROR ("no delayed link"); } } static gpointer -swfdec_codec_gst_h263_init (void) +swfdec_codec_gst_video_init (SwfdecVideoFormat type) { SwfdecGstVideo *player; GstElement *fakesrc, *fakesink, *decoder, *csp; @@ -155,7 +158,17 @@ swfdec_codec_gst_h263_init (void) g_assert (player->pipeline); player->mutex = g_mutex_new (); player->cond = g_cond_new (); - player->srccaps = gst_caps_from_string ("video/x-flash-video&quo...

...IDEO ***/ +#if 0 +#define swfdec_cond_wait(cond, mutex) G_STMT_START { \ + g_print ("waiting at %s\n", G_STRLOC); \ + g_cond_wait (cond, mutex); \ + g_print (" done at %s\n", G_STRLOC); \ +}G_STMT_END +#else +#define swfdec_cond_wait g_cond_wait +#endif + typedef struct _SwfdecGstVideo SwfdecGstVideo; struct _SwfdecGstVideo { SwfdecVideoDecoder decoder; commit e34ac83cf6b15eccaf945203f0f0628d04649870 Author: Benjamin Otte <otte at gnome.org> Date: Fri Oct 26 21:11:15 2007 +0200 use , as delimiter for SWFDEC_CODEC, not : diff --git a/libswfdec/swfdec_codec_audio....

...s_from_string ("video/x-raw-yuv, format=(fourcc)I420"); + default: + g_return_val_if_reached (NULL); } - g_assert_not_reached (); - return NULL; } SwfdecVideoDecoder * -swfdec_video_decoder_gst_new (SwfdecVideoCodec codec) +swfdec_video_decoder_gst_new (guint codec) { SwfdecGstVideo *player; GstCaps *srccaps, *sinkcaps; diff --git a/libswfdec/swfdec_codec_mad.c b/libswfdec/swfdec_codec_mad.c index a980488..ec15231 100644 --- a/libswfdec/swfdec_codec_mad.c +++ b/libswfdec/swfdec_codec_mad.c @@ -212,7 +212,7 @@ swfdec_audio_decoder_mad_pull (SwfdecAudioDecoder *dec) } Swf...