search for: swfdecbufferqueue

...gion and its size and takes care of @@ -322,6 +324,13 @@ swfdec_buffer_queue_get_type (void) return type_swfdec_buffer_queue; } +/** + * swfdec_buffer_queue_new: + * + * Creates a new empty buffer queue. + * + * Returns: a new buffer queue. Use swfdec_buffer_queue_unref () to free it. + **/ SwfdecBufferQueue * swfdec_buffer_queue_new (void) { @@ -332,26 +341,65 @@ swfdec_buffer_queue_new (void) return buffer_queue; } -int +/** + * swfdec_buffer_queue_get_depth: + * @queue: a #SwfdecBufferQueue + * + * Returns the number of bytes currently in @queue. + * + * Returns: amount of bytes in @queue. +...

...Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec into as diff-tree 7f7d106034cd5fac344b12e3c93562a24ecd825f (from 579955e4dcc87dd9c91428ee1967e01bc9cfa69b) Author: Benjamin Otte <otte@gnome.org> Date: Wed Mar 28 22:38:10 2007 +0200 make SwfdecBuffer and SwfdecBufferQueue boxed types - add and document the types - change SwfdecBufferQueue to be refcounted (most changes here are s/_buffer_queue_free/_buffer_queue_unref/ - break API by removing swfdec_buffer_queue_unref diff --git a/configure.ac b/configure.ac index 5309072..30801ce 100644 ---...

...ubbuffer (SwfdecBuffer * buffer, unsigned int offset, unsigned int length) +swfdec_buffer_new_subbuffer (SwfdecBuffer * buffer, guint offset, guint length) { SwfdecBuffer *subbuffer; @@ -368,7 +368,7 @@ swfdec_buffer_queue_pull_buffer (SwfdecB } SwfdecBuffer * -swfdec_buffer_queue_pull (SwfdecBufferQueue * queue, unsigned int length) +swfdec_buffer_queue_pull (SwfdecBufferQueue * queue, guint length) { GList *g; SwfdecBuffer *newbuffer; @@ -398,7 +398,7 @@ swfdec_buffer_queue_pull (SwfdecBufferQu queue->buffers = g_list_remove (queue->buffers, buffer); newbuffer = buffer;...

...dec_buffer.c b/libswfdec/swfdec_buffer.c index babf3ac..86c00a6 100644 --- a/libswfdec/swfdec_buffer.c +++ b/libswfdec/swfdec_buffer.c @@ -353,6 +353,16 @@ swfdec_buffer_queue_push (SwfdecBufferQu queue->depth += buffer->length; } +/** + * swfdec_buffer_queue_pull_buffer: + * @queue: a #SwfdecBufferQueue + * + * Pulls the first buffer out of @queue and returns it. This function is + * equivalent to calling swfdec_buffer_queue_pull() with the size of the + * first buffer in it. + * + * Returns: The first buffer in @queue or %NULL if @queue is empty. + **/ SwfdecBuffer * swfdec_buffer_queue_pull_b...

...ubbuffer (SwfdecBuffer * buffer, unsigned int offset, unsigned int length) +swfdec_buffer_new_subbuffer (SwfdecBuffer * buffer, guint offset, guint length) { SwfdecBuffer *subbuffer; @@ -368,7 +368,7 @@ swfdec_buffer_queue_pull_buffer (SwfdecB } SwfdecBuffer * -swfdec_buffer_queue_pull (SwfdecBufferQueue * queue, unsigned int length) +swfdec_buffer_queue_pull (SwfdecBufferQueue * queue, guint length) { GList *g; SwfdecBuffer *newbuffer; @@ -398,7 +398,7 @@ swfdec_buffer_queue_pull (SwfdecBufferQu queue->buffers = g_list_remove (queue->buffers, buffer); newbuffer = buffer;...

...edef struct _SwfdecLoader SwfdecLoader; typedef struct _SwfdecLoaderClass SwfdecLoaderClass; @@ -46,6 +53,7 @@ struct _SwfdecLoader char * error; /* if there's an error (from parsing the loader) */ gpointer target; /* SwfdecLoaderTarget that gets notified about loading progress */ SwfdecBufferQueue * queue; /* SwfdecBufferQueue managing the input buffers */ + SwfdecLoaderDataType data_type; /* type this stream is in (identified by swfdec) */ }; struct _SwfdecLoaderClass @@ -68,6 +76,11 @@ void swfdec_loader_eof (SwfdecLoader * void swfdec_loader_error (SwfdecLoader * loader,...

...kB. diff --git a/libswfdec/swfdec_decoder.c b/libswfdec/swfdec_decoder.c index 590c09a..6a98981 100644 --- a/libswfdec/swfdec_decoder.c +++ b/libswfdec/swfdec_decoder.c @@ -42,19 +42,17 @@ swfdec_decoder_init (SwfdecDecoder *decoder) } SwfdecDecoder * -swfdec_decoder_new (SwfdecPlayer *player, SwfdecBufferQueue *queue) +swfdec_decoder_new (SwfdecPlayer *player, const SwfdecBuffer *buffer) { guchar *data; - SwfdecBuffer *buffer; SwfdecDecoder *retval; g_return_val_if_fail (SWFDEC_IS_PLAYER (player), NULL); - g_return_val_if_fail (queue != NULL, NULL); + g_return_val_if_fail (buffer != NULL...

...char * error; /* if there's an error (from parsing the loader) */ + char * error; /* error message if in error state or NULL */ gpointer target; /* SwfdecLoaderTarget that gets notified about loading progress */ gpointer player; /* SwfdecPlayer belonging to target or %NULL */ SwfdecBufferQueue * queue; /* SwfdecBufferQueue managing the input buffers */ @@ -81,6 +82,8 @@ GType swfdec_loader_get_type (void); SwfdecLoader * swfdec_loader_new_from_file (const char * filename); +void swfdec_loader_open (SwfdecLoader * loader, + guint status); void swfdec_loader_push (S...

...: Benjamin Otte <otte@gnome.org> Date: Thu Mar 22 17:40:12 2007 +0100 OOps, update the header, too diff --git a/libswfdec/swfdec_buffer.h b/libswfdec/swfdec_buffer.h index f303295..81f6f66 100644 --- a/libswfdec/swfdec_buffer.h +++ b/libswfdec/swfdec_buffer.h @@ -50,7 +50,7 @@ struct _SwfdecBufferQueue SwfdecBuffer *swfdec_buffer_new (void); SwfdecBuffer *swfdec_buffer_new_and_alloc (unsigned int size); SwfdecBuffer *swfdec_buffer_new_and_alloc0 (unsigned int size); -SwfdecBuffer *swfdec_buffer_new_with_data (void *data, int size); +SwfdecBuffer *swfdec_buffer_new_for_data (unsigned char *data...

...quot; + +/*** SWFDEC_STREAM_TARGET ***/ + +static SwfdecPlayer * +swfdec_load_sound_stream_target_get_player (SwfdecStreamTarget *target) +{ + return SWFDEC_PLAYER (SWFDEC_LOAD_SOUND (target)->target->context); +} + +static gboolean +swfdec_load_sound_mp3_parse_id3v2 (SwfdecLoadSound *sound, SwfdecBufferQueue *queue) +{ + SwfdecBuffer *buffer; + SwfdecBits bits; + guint size; + gboolean footer; + + buffer = swfdec_buffer_queue_peek (queue, 10); + if (buffer == NULL) + return FALSE; + swfdec_bits_init (&bits, buffer); + if (swfdec_bits_get_u8 (&bits) != ''I'' || +...

.../* 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 done */ + SwfdecBuffer * in; /* next input buffer or NULL */ + SwfdecBufferQueue * out; /* all the stored output buffers */ + GstCaps * srccaps; /* caps to set on buffers */ + gboolean eof; /* we've pushed EOF */ + gboolean done; /* TRUE after decoding stopped (error or EOF) */ +}; + +static void +swfdec_gst_audio_unref (gpointer data, GObject *unused) +{ + S...

...didn't produce any output (fixes #12793) diff --git a/libswfdec/swfdec_sound.c b/libswfdec/swfdec_sound.c index 7ee1660..e4e9086 100644 --- a/libswfdec/swfdec_sound.c +++ b/libswfdec/swfdec_sound.c @@ -171,6 +171,7 @@ swfdec_sound_get_decoded (SwfdecSound *sound, SwfdecAudioFormat *format) SwfdecBufferQueue *queue; guint sample_bytes; guint n_samples; + guint depth; g_return_val_if_fail (SWFDEC_IS_SOUND (sound), NULL); g_return_val_if_fail (format != NULL, NULL); @@ -199,7 +200,12 @@ swfdec_sound_get_decoded (SwfdecSound *sound, SwfdecAudioFormat *format) swfdec_buffer_queue_push (...

...a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 6fc137d..ccb76d4 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -96,9 +96,7 @@ SWFDEC_PLAYER_GET_CLASS <FILE>SwfdecBuffer</FILE> <TITLE>SwfdecBuffer</TITLE> SwfdecBuffer -SWFDEC_TYPE_BUFFER SwfdecBufferQueue -SWFDEC_TYPE_BUFFER_QUEUE swfdec_buffer_new swfdec_buffer_new_and_alloc swfdec_buffer_new_and_alloc0 diff --git a/libswfdec/swfdec_buffer.c b/libswfdec/swfdec_buffer.c index c41a830..b79cae6 100644 --- a/libswfdec/swfdec_buffer.c +++ b/libswfdec/swfdec_buffer.c @@ -59,12 +59,6 @@ * swfdec_buff...

...ct 11 11:37:58 2007 +0200 add new symbols diff --git a/doc/swfdec-sections.txt b/doc/swfdec-sections.txt index 2bf4585..e269718 100644 --- a/doc/swfdec-sections.txt +++ b/doc/swfdec-sections.txt @@ -127,6 +127,7 @@ swfdec_system_get_type <TITLE>SwfdecBuffer</TITLE> SwfdecBuffer SwfdecBufferQueue +SwfdecBufferFreeFunc swfdec_buffer_new swfdec_buffer_new_and_alloc swfdec_buffer_new_and_alloc0 @@ -368,6 +369,7 @@ swfdec_as_array_insert_with_flags swfdec_as_array_push swfdec_as_array_push_with_flags swfdec_as_array_get_length +swfdec_as_array_set_length swfdec_as_array_get_value swfdec...

...d; /* cond used to signal when stuff below changes */ - volatile int refcount; /* refcount (d'oh) */ + g_return_val_if_fail (GST_IS_BUFFER (buffer), NULL); - GstElement * pipeline; /* pipeline that is playing or NULL when done */ - SwfdecBuffer * in; /* next input buffer or NULL */ - SwfdecBufferQueue * out; /* all the stored output buffers */ - GstCaps * srccaps; /* caps to set on buffers */ - gboolean eof; /* we've pushed EOF */ - gboolean done; /* TRUE after decoding stopped (error or EOF) */ -}; + ret = swfdec_buffer_new (); + ret->data = GST_BUFFER_DATA (buffer); + r...

...*/ gboolean eof; /* if we're in EOF already */ - gboolean error; /* if there's an error (from parsing the loader) */ + char * error; /* if there's an error (from parsing the loader) */ gpointer target; /* SwfdecLoaderTarget that gets notified about loading progress */ SwfdecBufferQueue * queue; /* SwfdecBufferQueue managing the input buffers */ }; @@ -55,9 +55,6 @@ struct _SwfdecLoaderClass /* FIXME: better error reporting? */ SwfdecLoader * (* load) (SwfdecLoader * loader, const char * url); - /* FIXME: make this a GError? */ - void (* error) (Swfde...

...(G_TYPE_CHECK_CLASS_CAST ((klass), SWFDEC_TYPE_IMAGE_DECODER, SwfdecImageDecoderClass)) +#define SWFDEC_IMAGE_DECODER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SWFDEC_TYPE_IMAGE_DECODER, SwfdecImageDecoderClass)) + +struct _SwfdecImageDecoder +{ + SwfdecDecoder decoder; + + SwfdecBufferQueue * queue; /* keeps the data while decoding */ + SwfdecImage * image; /* the image we display */ +}; + +struct _SwfdecImageDecoderClass { + SwfdecDecoderClass decoder_class; +}; + +GType swfdec_image_decoder_get_type (void); + + +G_END_DECLS + +#endif diff --git a/libswfdec/swfdec_loader.c b/l...

...ine SWFDEC_XML_SOCKET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SWFDEC_TYPE_XML_SOCKET, SwfdecXmlSocketClass)) + +struct _SwfdecXmlSocket { + SwfdecAsObject object; + + SwfdecSocket * socket; /* the socket in use */ + gboolean open; /* the socket has been opened already */ + SwfdecBufferQueue * queue; /* everything that belongs to the same string */ + SwfdecAsObject * target; /* target object we call out to */ +}; + +struct _SwfdecXmlSocketClass { + SwfdecAsObjectClass object_class; +}; + +GType swfdec_xml_socket_get_type (void); + + +G_END_DECLS +#endif commit 1f66627e35c49d677b03...

...se (file, &bits, error)) { swfdec_buffer_unref (buffer); g_object_unref (file); @@ -212,7 +216,53 @@ swfedit_file_new (const char *filename, static SwfdecBuffer * swfedit_file_write (SwfeditFile *file) { - return NULL; + guint i; + SwfeditToken *token = SWFEDIT_TOKEN (file); + SwfdecBufferQueue *queue; + SwfdecBuffer *buffer; + SwfdecOut *out; + + queue = swfdec_buffer_queue_new (); + /* write second part of header */ + out = swfdec_out_open (); + swfedit_tag_write_token (token, out, 1); + swfedit_tag_write_token (token, out, 2); + swfedit_tag_write_token (token, out, 3); + swfde...

...ight directory s/swfdec_gtk_player_[gs]et_audio/&_enabled/ set the source to NULL when removing it Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec print better error message when required cairo isn't available make SwfdecBuffer and SwfdecBufferQueue boxed types s/unsigned int/guint/ to ease Python bindings Change the semantics of swfdec_loader_new_from_file Add a loader that loads other stuff than files (in particular http) Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec update docs...