mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 10:25:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

clean up code, fix typos in lst checkin

Browse source 
Original commit message from CVS:
clean up code, fix typos in lst checkin
This commit is contained in:
David Schleef 2003-08-13 06:43:01 +00:00
parent ba4eba53fe
commit 2e7e62bd9a
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gst-libs/gst/riff/riff.h
View file

@ -40,8 +40,7 @@ typedef enum {
GST_RIFF_STATE_MOVI = 4 GST_RIFF_STATE_MOVI = 4
} GstRiffParserState; } GstRiffParserState;
#define MAKE_FOUR_CC(a,b,c,d) ( ((guint32)a) | (((guint32)b)<< 8) | \ #define MAKE_FOUR_CC(a,b,c,d) GST_MAKE_FOURCC(a,b,c,d)
((guint32)c)<<16 | (((guint32)d)<<24) )
/* RIFF types */ /* RIFF types */
#define GST_RIFF_RIFF_WAVE MAKE_FOUR_CC('W','A','V','E') #define GST_RIFF_RIFF_WAVE MAKE_FOUR_CC('W','A','V','E')

13
gst-libs/gst/riff/riffparse.c
View file

@ -170,9 +170,9 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off)
} }
else { else {
GST_DEBUG ("gst_riff_parser: chunk id offset %08x is 0x%08x '%s' and is 0x%08x long", GST_DEBUG ("gst_riff_parser: chunk id offset %08x is 0x%08x '" GST_FOURCC_FORMAT "' and is 0x%08x long",
riff->nextlikely, GUINT32_FROM_LE (words[0]), riff->nextlikely, chunk->id, GST_FOURCC_ARGS(chunk->id),
gst_riff_id_to_fourcc(GUINT32_FROM_LE (words[0])), GUINT32_FROM_LE (words[1])); chunk->size);
riff->nextlikely += 8 + chunk->size; /* doesn't include hdr */ riff->nextlikely += 8 + chunk->size; /* doesn't include hdr */
/* if this buffer is incomplete */ /* if this buffer is incomplete */
@ -221,16 +221,15 @@ gst_riff_parser_resync (GstRiff *riff, gulong offset)
} }
GstRiffChunk *gst_riff_get_chunk(GstRiff *riff,gchar *fourcc) GstRiffChunk *gst_riff_parser_get_chunk(GstRiff *riff, guint32 fourcc)
{ {
GList *chunk; GList *chunk;
g_return_val_if_fail(riff != NULL, NULL); g_return_val_if_fail(riff != NULL, NULL);
g_return_val_if_fail(fourcc != NULL, NULL);
chunk = riff->chunks; chunk = riff->chunks;
while (chunk) { while (chunk) {
if (((GstRiffChunk *)(chunk->data))->id == gst_riff_fourcc_to_id(fourcc)) if (((GstRiffChunk *)(chunk->data))->id == fourcc)
return (GstRiffChunk *)(chunk->data); return (GstRiffChunk *)(chunk->data);
chunk = g_list_next(chunk); chunk = g_list_next(chunk);
} }
@ -238,7 +237,7 @@ GstRiffChunk *gst_riff_get_chunk(GstRiff *riff,gchar *fourcc)
return NULL; return NULL;
} }
guint32 gst_riff_get_nextlikely(GstRiff *riff) guint32 gst_riff_parser_get_nextlikely(GstRiff *riff)
{ {
g_return_val_if_fail(riff != NULL, 0); g_return_val_if_fail(riff != NULL, 0);