mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-07 03:02:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

EOS fixes.

Browse source 
Original commit message from CVS:
EOS fixes.
This commit is contained in:
Wim Taymans 2002-04-14 12:50:57 +00:00
parent 434bc836ce
commit 117ebc8e44
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
ext/vorbis/vorbisdec.c
View file

@ -164,14 +164,17 @@ gst_vorbisdec_pull (VorbisDec * vorbisdec, ogg_sync_state * oy)
case GST_EVENT_FLUSH: case GST_EVENT_FLUSH:
ogg_sync_reset (oy); ogg_sync_reset (oy);
case GST_EVENT_EOS: case GST_EVENT_EOS:
gst_pad_event_default (vorbisdec->sinkpad, GST_EVENT (buf));
buf = NULL;
goto end;
default: default:
gst_pad_event_default (vorbisdec->sinkpad, GST_EVENT (buf)); gst_pad_event_default (vorbisdec->sinkpad, GST_EVENT (buf));
break;
} }
buf = NULL; buf = NULL;
} }
} while (buf == NULL); } while (buf == NULL);
end:
GST_DEBUG (0, "vorbisdec: pull done"); GST_DEBUG (0, "vorbisdec: pull done");
return buf; return buf;
@ -215,6 +218,8 @@ gst_vorbisdec_loop (GstElement * element)
/* submit a 4k block to libvorbis' Ogg layer */ /* submit a 4k block to libvorbis' Ogg layer */
buf = gst_vorbisdec_pull (vorbisdec, &oy); buf = gst_vorbisdec_pull (vorbisdec, &oy);
if (!buf)
break;
bytes = GST_BUFFER_SIZE (buf); bytes = GST_BUFFER_SIZE (buf);
buffer = ogg_sync_buffer (&oy, bytes); buffer = ogg_sync_buffer (&oy, bytes);
@ -302,6 +307,8 @@ gst_vorbisdec_loop (GstElement * element)
gst_element_yield (GST_ELEMENT (vorbisdec)); gst_element_yield (GST_ELEMENT (vorbisdec));
buf = gst_vorbisdec_pull (vorbisdec, &oy); buf = gst_vorbisdec_pull (vorbisdec, &oy);
if (!buf)
goto end;
bytes = GST_BUFFER_SIZE (buf); bytes = GST_BUFFER_SIZE (buf);
buffer = ogg_sync_buffer (&oy, bytes); buffer = ogg_sync_buffer (&oy, bytes);
memcpy (buffer, GST_BUFFER_DATA (buf), bytes); memcpy (buffer, GST_BUFFER_DATA (buf), bytes);
@ -447,14 +454,21 @@ gst_vorbisdec_loop (GstElement * element)
gst_element_yield (GST_ELEMENT (vorbisdec)); gst_element_yield (GST_ELEMENT (vorbisdec));
buf = gst_vorbisdec_pull (vorbisdec, &oy); buf = gst_vorbisdec_pull (vorbisdec, &oy);
bytes = GST_BUFFER_SIZE (buf); if (buf) {
buffer = ogg_sync_buffer (&oy, bytes); bytes = GST_BUFFER_SIZE (buf);
memcpy (buffer, GST_BUFFER_DATA (buf), bytes); buffer = ogg_sync_buffer (&oy, bytes);
gst_buffer_unref (buf); memcpy (buffer, GST_BUFFER_DATA (buf), bytes);
gst_buffer_unref (buf);
ogg_sync_wrote (&oy, bytes); ogg_sync_wrote (&oy, bytes);
if (bytes == 0) { if (bytes == 0) {
eos = 1; gst_pad_push (vorbisdec->srcpad, GST_BUFFER (gst_event_new (GST_EVENT_EOS)));
gst_element_set_eos (GST_ELEMENT (vorbisdec));
eos = 1;
}
}
else {
eos = 1;
} }
} }
} }
@ -471,6 +485,7 @@ gst_vorbisdec_loop (GstElement * element)
vorbis_dsp_clear (&vd); vorbis_dsp_clear (&vd);
vorbis_info_clear (&vorbisdec->vi); /* must be called last */ vorbis_info_clear (&vorbisdec->vi); /* must be called last */
} }
end:
/* OK, clean up the framer */ /* OK, clean up the framer */
ogg_sync_clear (&oy); ogg_sync_clear (&oy);