mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

asfdemux: fixes for streaming mode

Browse source 
* Improve newsegment handling, e.g. upstream might live in TIME.
* Only send newsegment if we have needed info.
* Avoid reading past end of data section.
This commit is contained in:
Mark Nauwelaerts 2009-05-02 16:08:03 +02:00
parent 2bd14c7153
commit b6d4fb9e4f
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
gst/asfdemux/gstasfdemux.c
View file

@ -303,18 +303,23 @@ gst_asf_demux_sink_event (GstPad * pad, GstEvent * event)
gst_event_parse_new_segment (event, NULL, NULL, &newsegment_format, gst_event_parse_new_segment (event, NULL, NULL, &newsegment_format,
&newsegment_start, NULL, NULL); &newsegment_start, NULL, NULL);
if (newsegment_format != GST_FORMAT_BYTES) { if (newsegment_format == GST_FORMAT_BYTES) {
GST_WARNING_OBJECT (demux, "newsegment format not BYTES, ignoring"); if (demux->packet_size && newsegment_start > demux->data_offset)
demux->packet = (newsegment_start - demux->data_offset) /
demux->packet_size;
else
demux->packet = 0;
} else if (newsegment_format == GST_FORMAT_TIME) {
/* do not know packet position, not really a problem */
demux->packet = -1;
} else {
GST_WARNING_OBJECT (demux, "unsupported newsegment format , ignoring");
gst_event_unref (event); gst_event_unref (event);
break; break;
} }
/* in either case, clear some state and generate newsegment later on */
GST_OBJECT_LOCK (demux); GST_OBJECT_LOCK (demux);
if (demux->packet_size && newsegment_start > demux->data_offset)
demux->packet = (newsegment_start - demux->data_offset) /
demux->packet_size;
else
demux->packet = 0;
demux->first_ts = GST_CLOCK_TIME_NONE; demux->first_ts = GST_CLOCK_TIME_NONE;
demux->need_newsegment = TRUE; demux->need_newsegment = TRUE;
gst_asf_demux_reset_stream_state_after_discont (demux); gst_asf_demux_reset_stream_state_after_discont (demux);
@ -1188,6 +1193,11 @@ gst_asf_demux_push_complete_payloads (GstASFDemux * demux, gboolean force)
/* do we need to send a newsegment event */ /* do we need to send a newsegment event */
if (demux->need_newsegment) { if (demux->need_newsegment) {
/* wait until we had a chance to "lock on" some payload's timestamp */
if (!GST_CLOCK_TIME_IS_VALID (demux->first_ts))
return GST_FLOW_OK;
if (demux->segment.stop == GST_CLOCK_TIME_NONE && if (demux->segment.stop == GST_CLOCK_TIME_NONE &&
demux->segment.duration > 0) { demux->segment.duration > 0) {
demux->segment.stop = demux->segment.duration; demux->segment.stop = demux->segment.duration;
@ -1421,6 +1431,11 @@ gst_asf_demux_chain (GstPad * pad, GstBuffer * buf)
while (gst_adapter_available (demux->adapter) >= data_size) { while (gst_adapter_available (demux->adapter) >= data_size) {
GstBuffer *buf; GstBuffer *buf;
/* do not overshoot data section when streaming */
if (demux->num_packets != 0 && demux->packet >= 0
&& demux->packet >= demux->num_packets)
goto eos;
buf = gst_adapter_take_buffer (demux->adapter, data_size); buf = gst_adapter_take_buffer (demux->adapter, data_size);
/* FIXME: maybe we should just skip broken packets and error out only /* FIXME: maybe we should just skip broken packets and error out only
@ -1433,7 +1448,8 @@ gst_asf_demux_chain (GstPad * pad, GstBuffer * buf)
ret = gst_asf_demux_push_complete_payloads (demux, FALSE); ret = gst_asf_demux_push_complete_payloads (demux, FALSE);
++demux->packet; if (demux->packet >= 0)
++demux->packet;
} }
break; break;
} }
@ -1441,10 +1457,18 @@ gst_asf_demux_chain (GstPad * pad, GstBuffer * buf)
g_assert_not_reached (); g_assert_not_reached ();
} }
done:
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
GST_DEBUG_OBJECT (demux, "flow: %s", gst_flow_get_name (ret)); GST_DEBUG_OBJECT (demux, "flow: %s", gst_flow_get_name (ret));
return ret; return ret;
eos:
{
GST_DEBUG_OBJECT (demux, "Handled last packet, setting EOS");
ret = GST_FLOW_UNEXPECTED;
goto done;
}
} }
static inline gboolean static inline gboolean

2
gst/asfdemux/gstasfdemux.h
View file

@ -134,7 +134,7 @@ struct _GstASFDemux {
guint64 data_offset; /* byte offset where packets start */ guint64 data_offset; /* byte offset where packets start */
guint64 data_size; /* total size of packet data in bytes, or 0 */ guint64 data_size; /* total size of packet data in bytes, or 0 */
guint64 num_packets; /* total number of data packets, or 0 */ guint64 num_packets; /* total number of data packets, or 0 */
guint64 packet; /* current packet */ gint64 packet; /* current packet */
/* bitrates are unused at the moment */ /* bitrates are unused at the moment */
guint32 bitrate[GST_ASF_DEMUX_NUM_STREAM_IDS]; guint32 bitrate[GST_ASF_DEMUX_NUM_STREAM_IDS];