search for: swfdecflvdecoder

...t timestamp; /* milliseconds */ @@ -52,6 +53,11 @@ struct _SwfdecFlvAudioTag { SwfdecBuffer * buffer; /* buffer for this data */ }; +struct _SwfdecFlvDataTag { + guint timestamp; /* milliseconds */ + SwfdecBuffer * buffer; /* buffer containing raw AMF data */ +}; + G_DEFINE_TYPE (SwfdecFlvDecoder, swfdec_flv_decoder, SWFDEC_TYPE_DECODER) static void @@ -76,6 +82,15 @@ swfdec_flv_decoder_dispose (GObject *obj g_array_free (flv->video, TRUE); flv->video = NULL; } + if (flv->data) { + for (i = 0; i < flv->data->len; i++) { + SwfdecFlvDataTag *tag = &a...

...ec/swfdec_flv_decoder.c b/libswfdec/swfdec_flv_decoder.c index da311d4..530915d 100644 --- a/libswfdec/swfdec_flv_decoder.c +++ b/libswfdec/swfdec_flv_decoder.c @@ -424,6 +424,29 @@ swfdec_flv_decoder_get_video (SwfdecFlvD return tag->buffer; } +gboolean +swfdec_flv_decoder_get_video_info (SwfdecFlvDecoder *flv, + guint *first_timestamp, guint *last_timestamp) +{ + g_return_val_if_fail (SWFDEC_IS_FLV_DECODER (flv), FALSE); + + if (flv->video == NULL) + return FALSE; + + if (flv->video->len == 0) { + if (first_timestamp) + *first_timestamp = 0; + if (last_timestamp) +...

...nt format; SwfdecAudioFormat in; guint now, soon; diff --git a/libswfdec/swfdec_audio_flv.h b/libswfdec/swfdec_audio_flv.h index e67294d..52ac2a5 100644 --- a/libswfdec/swfdec_audio_flv.h +++ b/libswfdec/swfdec_audio_flv.h @@ -40,7 +40,7 @@ struct _SwfdecAudioFlv SwfdecAudio audio; SwfdecFlvDecoder * flvdecoder; /* decoder we play back */ - SwfdecAudioCodec format; /* codec format of audio */ + guint format; /* codec format of audio */ gboolean width; /* width of audio */ SwfdecAudioFormat in; /* input format of data */ SwfdecAudioDecoder * decoder; /* decoder used for playb...

...v_decoder.c index 465852d..8caf2b6 100644 --- a/libswfdec/swfdec_flv_decoder.c +++ b/libswfdec/swfdec_flv_decoder.c @@ -433,6 +433,16 @@ swfdec_flv_decoder_parse (SwfdecDecoder *dec, SwfdecBuffer *buffer) return status; } +static SwfdecStatus +swfdec_flv_decoder_eof (SwfdecDecoder *dec) +{ + SwfdecFlvDecoder *flv = SWFDEC_FLV_DECODER (dec); + + flv->state = SWFDEC_STATE_EOF; + + return 0; +} + static void swfdec_flv_decoder_class_init (SwfdecFlvDecoderClass *class) { @@ -442,6 +452,7 @@ swfdec_flv_decoder_class_init (SwfdecFlvDecoderClass *class) object_class->dispose = swfdec_flv_decoder...

...YPE_FLV_DECODER, NULL); +#endif } else { retval = NULL; } diff --git a/libswfdec/swfdec_flv_decoder.c b/libswfdec/swfdec_flv_decoder.c index 4ba427e..81e7e36 100644 --- a/libswfdec/swfdec_flv_decoder.c +++ b/libswfdec/swfdec_flv_decoder.c @@ -594,27 +594,6 @@ swfdec_flv_decoder_get_data (SwfdecFlvDecoder *flv, guint timestamp, guint *real return tag->buffer; } -/*** HACK ***/ - -/* This is a hack to allow native FLV playback IN SwfdecPlayer */ - -#include "swfdec_loadertarget.h" -#include "swfdec_net_stream.h" -#include "swfdec_sprite.h" -#include "swfdec...

...flv->data = NULL; } - + swfdec_buffer_queue_unref (flv->queue); + flv->queue = NULL; G_OBJECT_CLASS (swfdec_flv_decoder_parent_class)->dispose (object); } @@ -96,14 +97,12 @@ swfdec_flv_decoder_dispose (GObject *object) static SwfdecStatus swfdec_flv_decoder_parse_header (SwfdecFlvDecoder *flv) { - SwfdecDecoder *dec = SWFDEC_DECODER (flv); SwfdecBuffer *buffer; SwfdecBits bits; guint version, header_length; gboolean has_audio, has_video; - /* NB: we're still reading from the original queue, since deflating is not initialized yet */ - buffer = swfdec_buffer_que...

...will always be 0 in both audio and video streams diff --git a/libswfdec/swfdec_flv_decoder.c b/libswfdec/swfdec_flv_decoder.c index 31834a2..831641f 100644 --- a/libswfdec/swfdec_flv_decoder.c +++ b/libswfdec/swfdec_flv_decoder.c @@ -392,22 +392,33 @@ SwfdecBuffer * swfdec_flv_decoder_get_video (SwfdecFlvDecoder *flv, guint timestamp, gboolean keyframe, SwfdecVideoFormat *format, guint *real_timestamp, guint *next_timestamp) { - guint id; + guint id, offset; SwfdecFlvVideoTag *tag; g_return_val_if_fail (SWFDEC_IS_FLV_DECODER (flv), NULL); g_return_val_if_fail (flv->video != NULL, NULL...

...surface = swfdec_video_decoder_decode (decoder, tag->buffer); + surface = swfdec_video_decoder_decode (decoder, t->buffer); if (surface == NULL) return SWFDEC_STATUS_OK; dec->width = cairo_image_surface_get_width (surface); @@ -640,7 +640,8 @@ swfdec_flv_decoder_eof (SwfdecFlvDecoder SwfdecMovie * swfdec_flv_decoder_add_movie (SwfdecFlvDecoder *flv, SwfdecMovie *parent) { - g_assert_not_reached (); + //g_assert_not_reached (); + return NULL; #if 0 SwfdecContent *content = swfdec_content_new (0); SwfdecMovie *movie; diff --git a/libswfdec/swfdec_internal.h b/libswfd...

...net_stream.h +++ b/libswfdec/swfdec_net_stream.h @@ -44,7 +44,6 @@ struct _SwfdecNetStream { SwfdecAsObject object; - SwfdecPlayer * player; /* the player we play in */ SwfdecNetConnection * conn; /* connection used for opening streams */ SwfdecLoader * loader; /* input stream */ SwfdecFlvDecoder * flvdecoder; /* flv decoder */ @@ -76,8 +75,7 @@ struct _SwfdecNetStreamClass GType swfdec_net_stream_get_type (void); -SwfdecNetStream * swfdec_net_stream_new (SwfdecPlayer * player, - SwfdecNetConnection * conn); +SwfdecNetStream * swfdec_net_stream_new (SwfdecNetConnection * co...

...player, GParamSpec *pspec, SwfdecVideoMovie *movie) { @@ -623,6 +624,7 @@ notify_initialized (SwfdecPlayer *player swfdec_movie_queue_update (SWFDEC_MOVIE (movie), SWFDEC_MOVIE_INVALID_MATRIX); swfdec_movie_invalidate (SWFDEC_MOVIE (movie)); } +#endif gboolean swfdec_flv_decoder_is_eof (SwfdecFlvDecoder *flv) @@ -643,6 +645,8 @@ swfdec_flv_decoder_eof (SwfdecFlvDecoder SwfdecMovie * swfdec_flv_decoder_add_movie (SwfdecFlvDecoder *flv, SwfdecMovie *parent) { + g_assert_not_reached (); +#if 0 SwfdecContent *content = swfdec_content_new (0); SwfdecMovie *movie; SwfdecVideo *video; @@ -67...

...unref (buffer); buffer = g_queue_peek_head (flv->playback_queue); } diff --git a/libswfdec/swfdec_audio_flv.h b/libswfdec/swfdec_audio_flv.h index 5a41edc..8e4c5a5 100644 --- a/libswfdec/swfdec_audio_flv.h +++ b/libswfdec/swfdec_audio_flv.h @@ -41,15 +41,13 @@ struct _SwfdecAudioFlv SwfdecFlvDecoder * flvdecoder; /* decoder we play back */ SwfdecAudioFormat format; /* codec format of audio */ - const SwfdecAudioCodec *codec; /* codec in use */ gboolean width; /* width of audio */ SwfdecAudioOut in; /* input format of data */ - SwfdecAudioOut out; /* output format of codec...

...@ -43,7 +44,8 @@ struct _SwfdecNetStream SwfdecScriptable scriptable; SwfdecPlayer * player; /* the player we play in */ - SwfdecLoader * loader; /* input connection */ + SwfdecConnection * conn; /* connection used for opening streams */ + SwfdecLoader * loader; /* input stream */ SwfdecFlvDecoder * flvdecoder; /* flv decoder */ gboolean playing; /* TRUE if this stream is playing */ gboolean error; /* in error */ @@ -69,8 +71,11 @@ struct _SwfdecNetStreamClass GType swfdec_net_stream_get_type (void); -SwfdecNetStream * swfdec_net_stream_new (SwfdecPlayer * player); +SwfdecN...

...n automated tests with the provided SWF files in the directory. See the README files in those directories commit 3e15e397838e87952d4a896fd0eb69ed3fb78f98 Author: Benjamin Otte <otte at gnome.org> Date: Thu Nov 15 21:16:32 2007 +0100 remove hack for getting decoder size Note: SwfdecFlvDecoder should not be a SwfdecDecoder diff --git a/libswfdec/swfdec_flv_decoder.c b/libswfdec/swfdec_flv_decoder.c index 8caf2b6..52f14e2 100644 --- a/libswfdec/swfdec_flv_decoder.c +++ b/libswfdec/swfdec_flv_decoder.c @@ -232,7 +232,6 @@ swfdec_flv_decoder_find_data (SwfdecFlvDecoder *flv, guint timestam...

....h> #include <libswfdec/swfdec_video_movie.h> G_BEGIN_DECLS @@ -46,6 +47,7 @@ struct _SwfdecNetStream SwfdecNetConnection * conn; /* connection used for opening streams */ SwfdecLoader * loader; /* input stream */ + SwfdecSandbox * sandbox; /* sandbox to emit events in */ SwfdecFlvDecoder * flvdecoder; /* flv decoder */ gboolean playing; /* TRUE if this stream is playing */ gboolean buffering; /* TRUE if we're waiting for more input data */ @@ -78,6 +80,7 @@ GType swfdec_net_stream_get_type (void); SwfdecNetStream * swfdec_net_stream_new (SwfdecNetConnection * conn);...