search for: swfdecbuffer

...: 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...

...essed); } else { g_assert (bits->idx == 0); compressed = bits->end - bits->ptr; diff --git a/libswfdec/swfdec_bits.h b/libswfdec/swfdec_bits.h index 4f7b20a..9e14628 100644 --- a/libswfdec/swfdec_bits.h +++ b/libswfdec/swfdec_bits.h @@ -32,26 +32,26 @@ struct _SwfdecBits { SwfdecBuffer * buffer; /* buffer data is taken from or NULL */ const unsigned char * ptr; /* current location to read from */ - unsigned int idx; /* bits already read from ptr */ + guint idx; /* bits already read from ptr */ const unsigned char * end; /* pointer after last byte */ }; void swf...

...rg> Date: Sun Apr 8 10:52:06 2007 +0200 document swfdec_buffer_queue_pull_buffer diff --git a/libswfdec/swfdec_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....

...Fri Apr 20 18:46:02 2007 +0200 document the rest of the functions and make some of them return guint diff --git a/libswfdec/swfdec_buffer.c b/libswfdec/swfdec_buffer.c index c2b9d85..c41a830 100644 --- a/libswfdec/swfdec_buffer.c +++ b/libswfdec/swfdec_buffer.c @@ -46,6 +46,8 @@ /** * SwfdecBuffer: + * @data: the data. read-only + * @length: number of bytes in @data. read-only * * To allow for easy sharing of memory regions, #SwfdecBuffer was created. * Every buffer refers to a memory region and its size and takes care of @@ -322,6 +324,13 @@ swfdec_buffer_queue_get_type (void) re...

...21:31:14 2007 +0200 Merge branch 'master' of ssh://company@git.freedesktop.org/git/swfdec into as Conflicts: libswfdec/swfdec_script.h diff --cc libswfdec/swfdec_script.h index 8a3741e,b58252b..673332a @@@ -47,12 -48,11 +47,12 @@@ /* FIXME: May want to typedef to SwfdecBuffer directly */ struct _SwfdecScript { /* must be first arg */ - JSFunction * fun; /* function script belongs to or NULL */ + gpointer fun; /* function script belongs to or NULL */ SwfdecBuffer * buffer; /* buffer holding the script */ - unsigned int refcount; /* reference c...

...:03 2007 +0200 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 530907...

...c_audio_decoder_free (SwfdecAudioDecoder * decoder); -SwfdecAudioFormat swfdec_audio_decoder_get_format (SwfdecAudioDecoder * decoder); +SwfdecAudioFormat swfdec_audio_decoder_get_format (SwfdecAudioDecoder * decoder); void swfdec_audio_decoder_push (SwfdecAudioDecoder * decoder, SwfdecBuffer * buffer); SwfdecBuffer * swfdec_audio_decoder_pull (SwfdecAudioDecoder * decoder); commit 2fad068e134ad983a46a46725dc2a449b178d6ce Author: Benjamin Otte <otte at gnome.org> Date: Mon Oct 15 21:11:46 2007 +0200 fix to work with new audio stuff diff --git a/test/swfdec-extract.c b/t...

...EO_FORMAT_SCREEN = 3, - SWFDEC_VIDEO_FORMAT_VP6 = 4, - SWFDEC_VIDEO_FORMAT_VP6_ALPHA = 5, - SWFDEC_VIDEO_FORMAT_SCREEN2 = 6 -} SwfdecVideoFormat; - struct _SwfdecAudioCodec { gpointer (* init) (SwfdecAudioFormat type, gboolean width, @@ -56,29 +46,13 @@ struct _SwfdecAudioCodec { SwfdecBuffer * (* finish) (gpointer codec_data); }; -struct _SwfdecVideoCodec { - gpointer (* init) (SwfdecVideoFormat type); - gboolean (* get_size) (gpointer codec_data, - guint * width, - guint * height); - SwfdecBuffer * (* decode) (gpointer codec_data, - SwfdecBuffer * buff...

...SwfdecAudioDecoder decoder; + + 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 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 +swf...

...ormat) (gpointer codec_data); + gpointer (* init) (SwfdecAudioFormat type, + gboolean width, + SwfdecAudioOut format); + SwfdecAudioOut (* get_format) (gpointer codec_data); /* FIXME: add SwfdecRect *invalid for invalidated region - might make sense for screen? */ - SwfdecBuffer * (* decode) (gpointer codec_data, - SwfdecBuffer * buffer); - SwfdecBuffer * (* finish) (gpointer codec_data); + SwfdecBuffer * (* decode) (gpointer codec_data, + SwfdecBuffer * buffer); + SwfdecBuffer * (* finish) (gpointer codec_data); }; struct _SwfdecVideoCodec { - gpointe...

...ype swfedit_list_get_type (void); SwfeditList * swfedit_list_new (const SwfeditTagDefinition * def); -SwfeditList * swfedit_list_new_read (SwfdecBits * bits, +SwfeditList * swfedit_list_new_read (SwfeditToken * parent, + SwfdecBits * bits, const SwfeditTagDefinition * def); SwfdecBuffer * swfedit_list_write (SwfeditList * list); diff --git a/test/swfedit_tag.c b/test/swfedit_tag.c index c8cf442..75137a5 100644 --- a/test/swfedit_tag.c +++ b/test/swfedit_tag.c @@ -30,12 +30,13 @@ #include <libswfdec/swfdec_tag.h> #include "swfedit_tag.h" #include "swfdec_o...

...RUE; + case SWFDEC_AS_TYPE_INT: default: g_assert_not_reached (); return FALSE; diff --git a/libswfdec/swfdec_audio_flv.c b/libswfdec/swfdec_audio_flv.c index d611066..59de5c5 100644 --- a/libswfdec/swfdec_audio_flv.c +++ b/libswfdec/swfdec_audio_flv.c @@ -49,7 +49,7 @@ static SwfdecBuffer * swfdec_audio_flv_decode_one (SwfdecAudioFlv *flv) { SwfdecBuffer *buffer; - SwfdecAudioCodec format; + guint 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_...

...t;swfdec_debug.h" #include "swfdec_decoder.h" -#include "swfdec_flv_decoder.h" +#include "swfdec_image.h" +#include "swfdec_image_decoder.h" #include "swfdec_swf_decoder.h" @@ -64,6 +65,8 @@ swfdec_decoder_new (SwfdecPlayer *player, const SwfdecBuffer *buffer) data[2] == 'V') { retval = g_object_new (SWFDEC_TYPE_FLV_DECODER, NULL); #endif + } else if (swfdec_image_detect (data) != SWFDEC_IMAGE_TYPE_UNKNOWN) { + retval = g_object_new (SWFDEC_TYPE_IMAGE_DECODER, NULL); } else { retval = NULL; } commit 66e3500394...

...- * any of the errors that are valid from g_mapped_file_new(). + * Creates a buffer containing the contents of the given file. If loading the + * file fails, %NULL is returned and @error is set. The error can be + * any of the errors that are valid for g_file_get_contents(). * * Returns: a new #SwfdecBuffer or %NULL on failure **/ @@ -250,22 +250,25 @@ SwfdecBuffer * swfdec_buffer_new_from_file (const char *filename, GError **error) { GMappedFile *file; - SwfdecBuffer *buffer; + char *data; + gsize length; g_return_val_if_fail (filename != NULL, NULL); - file = g_mapped_file_new (fil...

...36,7 @@ enum { typedef struct _SwfdecFlvVideoTag SwfdecFlvVideoTag; typedef struct _SwfdecFlvAudioTag SwfdecFlvAudioTag; +typedef struct _SwfdecFlvDataTag SwfdecFlvDataTag; struct _SwfdecFlvVideoTag { guint 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 @@ swfd...

...ee (file->filename); + + G_OBJECT_CLASS (swfedit_file_parent_class)->dispose (object); +} + +static void * +zalloc (void *opaque, unsigned int items, unsigned int size) +{ + return g_malloc (items * size); +} + +static void +zfree (void *opaque, void *addr) +{ + g_free (addr); +} + +static SwfdecBuffer * +swfenc_file_inflate (SwfdecBits *bits, guint size) +{ + SwfdecBuffer *decoded, *encoded; + z_stream z; + int ret; + + encoded = swfdec_bits_get_buffer (bits, -1); + if (encoded == NULL) + return NULL; + decoded = swfdec_buffer_new_and_alloc (size); + z.zalloc = zalloc; + z.zfree = zfr...

...ne swfdec_cond_wait g_cond_wait -#endif +/*** BUFFER ***/ -/*** AUDIO ***/ +static void +swfdec_gst_buffer_free (unsigned char *data, gpointer priv) +{ + gst_buffer_unref (priv); +} -typedef struct _SwfdecGstAudio SwfdecGstAudio; -struct _SwfdecGstAudio { - SwfdecAudioDecoder decoder; +static SwfdecBuffer * +swfdec_buffer_new_from_gst (GstBuffer *buffer) +{ + SwfdecBuffer *ret; - GMutex * mutex; /* mutex that blocks everything below */ - GCond * cond; /* cond used to signal when stuff below changes */ - volatile int refcount; /* refcount (d'oh) */ + g_return_val_if_fail (GST_IS_BUF...

...bswfdec/swfdec_audio_stream.c index b1dd5e1..58e2175 100644 --- a/libswfdec/swfdec_audio_stream.c +++ b/libswfdec/swfdec_audio_stream.c @@ -38,7 +38,7 @@ swfdec_audio_stream_dispose (GObject *ob SwfdecAudioStream *stream = SWFDEC_AUDIO_STREAM (object); if (stream->decoder != NULL) { - SwfdecBuffer *buffer = swfdec_sound_finish_decoder (stream->sound, stream->decoder); + SwfdecBuffer *buffer = swfdec_audio_codec_finish (stream->codec, stream->decoder); stream->decoder = NULL; if (buffer) swfdec_buffer_unref (buffer); @@ -68,7 +68,7 @@ swfdec_audio_stream_dec...

...ound->n_samples, - (double) sound->n_samples / swfdec_audio_format_get_rate (sound->format)); - } -} - -static void -dump_sprite (SwfdecSwfDecoder *dec, SwfdecSprite *s) -{ - if (!verbose) { - g_print (" %u frames\n", s->n_frames); - } else { - guint i, j, tag; - SwfdecBuffer *buffer; - SwfdecSound *sound = NULL; - - for (i = 0; i < s->n_frames; i++) { - SwfdecSpriteFrame *frame = &s->frames[i]; - if (frame->sound_head != sound && - frame->sound_block != NULL) { - sound = frame->sound_head; - for (j = i; j < s->n_fra...

...loader_set_target (load_object->loader, + SWFDEC_LOADER_TARGET (load_object)); + swfdec_loader_set_data_type (load_object->loader, SWFDEC_LOADER_DATA_TEXT); +} + static gboolean swfdec_load_object_load (SwfdecLoadObject *load_object, const char *url, SwfdecLoaderRequest request, SwfdecBuffer *data) { + SwfdecPlayer *player; + SwfdecSecurity *sec; SwfdecAsValue val; g_return_val_if_fail (SWFDEC_IS_LOAD_OBJECT (load_object), FALSE); g_return_val_if_fail (url != NULL, FALSE); + player = SWFDEC_PLAYER (SWFDEC_AS_OBJECT (load_object)->context); swfdec_load_object_rese...