mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-27 16:55:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

avi: small cleanups

Browse source
This commit is contained in:
Wim Taymans 2009-09-23 14:25:08 +02:00 committed by Wim Taymans
parent 217315c20b
commit 3f263edbbf
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
gst/avi/gstavidemux.c
View file

@ -455,6 +455,7 @@ gst_avi_demux_handle_src_query (GstPad * pad, GstQuery * query)
GST_DEBUG ("pos query for stream %d: frames %d, bytes %" G_GUINT64_FORMAT, GST_DEBUG ("pos query for stream %d: frames %d, bytes %" G_GUINT64_FORMAT,
stream->num, stream->current_entry, stream->current_total); stream->num, stream->current_entry, stream->current_total);
/* FIXME, this looks clumsy */
if (stream->strh->type == GST_RIFF_FCC_auds) { if (stream->strh->type == GST_RIFF_FCC_auds) {
if (stream->is_vbr) { if (stream->is_vbr) {
/* VBR */ /* VBR */
@ -4000,29 +4001,35 @@ static void
push_tag_lists (GstAviDemux * avi) push_tag_lists (GstAviDemux * avi)
{ {
guint i; guint i;
GstTagList *tags;
if (!avi->got_tags) if (!avi->got_tags)
return; return;
GST_DEBUG_OBJECT (avi, "Pushing pending tag lists"); GST_DEBUG_OBJECT (avi, "Pushing pending tag lists");
for (i = 0; i < avi->num_streams; i++) for (i = 0; i < avi->num_streams; i++) {
if (avi->stream[i].pad && avi->stream[i].taglist) { GstAviStream *stream = &avi->stream[i];
GST_DEBUG_OBJECT (avi->stream[i].pad, "Tags: %" GST_PTR_FORMAT, GstPad *pad = stream->pad;
avi->stream[i].taglist);
gst_element_found_tags_for_pad (GST_ELEMENT (avi), avi->stream[i].pad, tags = stream->taglist;
avi->stream[i].taglist);
avi->stream[i].taglist = NULL; if (pad && tags) {
GST_DEBUG_OBJECT (pad, "Tags: %" GST_PTR_FORMAT, tags);
gst_element_found_tags_for_pad (GST_ELEMENT_CAST (avi), pad, tags);
stream->taglist = NULL;
} }
}
if (avi->globaltags == NULL) if (!(tags = avi->globaltags))
avi->globaltags = gst_tag_list_new (); tags = gst_tag_list_new ();
gst_tag_list_add (avi->globaltags, GST_TAG_MERGE_REPLACE, gst_tag_list_add (tags, GST_TAG_MERGE_REPLACE,
GST_TAG_CONTAINER_FORMAT, "AVI", NULL); GST_TAG_CONTAINER_FORMAT, "AVI", NULL);
GST_DEBUG_OBJECT (avi, "Global tags: %" GST_PTR_FORMAT, avi->globaltags); GST_DEBUG_OBJECT (avi, "Global tags: %" GST_PTR_FORMAT, tags);
gst_element_found_tags (GST_ELEMENT (avi), avi->globaltags); gst_element_found_tags (GST_ELEMENT_CAST (avi), tags);
avi->globaltags = NULL; avi->globaltags = NULL;
avi->got_tags = FALSE; avi->got_tags = FALSE;
} }
@ -4035,16 +4042,16 @@ gst_avi_demux_loop (GstPad * pad)
switch (avi->state) { switch (avi->state) {
case GST_AVI_DEMUX_START: case GST_AVI_DEMUX_START:
if (G_UNLIKELY ((res = res = gst_avi_demux_stream_init_pull (avi);
gst_avi_demux_stream_init_pull (avi)) != GST_FLOW_OK)) { if (G_UNLIKELY (res != GST_FLOW_OK)) {
GST_WARNING ("stream_init flow: %s", gst_flow_get_name (res)); GST_WARNING ("stream_init flow: %s", gst_flow_get_name (res));
goto pause; goto pause;
} }
avi->state = GST_AVI_DEMUX_HEADER; avi->state = GST_AVI_DEMUX_HEADER;
/* fall-through */ /* fall-through */
case GST_AVI_DEMUX_HEADER: case GST_AVI_DEMUX_HEADER:
if (G_UNLIKELY ((res = res = gst_avi_demux_stream_header_pull (avi);
gst_avi_demux_stream_header_pull (avi)) != GST_FLOW_OK)) { if (G_UNLIKELY (res != GST_FLOW_OK)) {
GST_WARNING ("stream_header flow: %s", gst_flow_get_name (res)); GST_WARNING ("stream_header flow: %s", gst_flow_get_name (res));
goto pause; goto pause;
} }