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

gst/flv/: Put the GstSegment directly into the instance struct instead of allocating and free'ing it again.

Browse source 
Original commit message from CVS:
* gst/flv/gstflvdemux.c: (gst_flv_demux_cleanup),
(gst_flv_demux_loop), (gst_flv_demux_handle_seek_push),
(gst_flv_demux_handle_seek_pull), (gst_flv_demux_sink_event),
(gst_flv_demux_dispose), (gst_flv_demux_init):
* gst/flv/gstflvdemux.h:
* gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio),
(gst_flv_parse_tag_video), (gst_flv_parse_tag_timestamp):
Put the GstSegment directly into the instance struct instead of
allocating and free'ing it again.
Push tags already if only one pad was added, no need to wait for
the second one.
When generating our index set has_video and has_audio if we find
video or audio in case the FLV header has incorrect data.
This commit is contained in:
Sebastian Dröge 2008-10-28 18:41:19 +00:00
parent 8416cc94b5
commit a85344333b
4 changed files with 91 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ChangeLog
View file

@ -1,3 +1,21 @@
2008-10-28 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/flv/gstflvdemux.c: (gst_flv_demux_cleanup),
(gst_flv_demux_loop), (gst_flv_demux_handle_seek_push),
(gst_flv_demux_handle_seek_pull), (gst_flv_demux_sink_event),
(gst_flv_demux_dispose), (gst_flv_demux_init):
* gst/flv/gstflvdemux.h:
* gst/flv/gstflvparse.c: (gst_flv_parse_tag_audio),
(gst_flv_parse_tag_video), (gst_flv_parse_tag_timestamp):
Put the GstSegment directly into the instance struct instead of
allocating and free'ing it again.
Push tags already if only one pad was added, no need to wait for
the second one.
When generating our index set has_video and has_audio if we find
video or audio in case the FLV header has incorrect data.
2008-10-28 Sebastian Dröge <sebastian.droege@collabora.co.uk> 2008-10-28 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* gst/speexresample/gstspeexresample.c: * gst/speexresample/gstspeexresample.c:

115
gst/flv/gstflvdemux.c
View file

@ -99,6 +99,8 @@ gst_flv_demux_cleanup (GstFLVDemux * demux)
demux->push_tags = FALSE; demux->push_tags = FALSE;
demux->got_par = FALSE; demux->got_par = FALSE;
gst_segment_init (&demux->segment, GST_FORMAT_TIME);
demux->w = demux->h = 0; demux->w = demux->h = 0;
demux->par_x = demux->par_y = 1; demux->par_x = demux->par_y = 1;
demux->video_offset = 0; demux->video_offset = 0;
@ -485,7 +487,7 @@ gst_flv_demux_loop (GstPad * pad)
demux = GST_FLV_DEMUX (gst_pad_get_parent (pad)); demux = GST_FLV_DEMUX (gst_pad_get_parent (pad));
if (demux->segment->rate >= 0) { if (demux->segment.rate >= 0) {
/* pull in data */ /* pull in data */
switch (demux->state) { switch (demux->state) {
case FLV_STATE_TAG_TYPE: case FLV_STATE_TAG_TYPE:
@ -506,9 +508,9 @@ gst_flv_demux_loop (GstPad * pad)
goto pause; goto pause;
/* check EOS condition */ /* check EOS condition */
if ((demux->segment->flags & GST_SEEK_FLAG_SEGMENT) && if ((demux->segment.flags & GST_SEEK_FLAG_SEGMENT) &&
(demux->segment->stop != -1) && (demux->segment.stop != -1) &&
(demux->segment->last_stop >= demux->segment->stop)) { (demux->segment.last_stop >= demux->segment.stop)) {
ret = GST_FLOW_UNEXPECTED; ret = GST_FLOW_UNEXPECTED;
goto pause; goto pause;
} }
@ -536,7 +538,7 @@ gst_flv_demux_loop (GstPad * pad)
goto pause; goto pause;
/* check EOS condition */ /* check EOS condition */
if (demux->segment->last_stop <= demux->segment->start) { if (demux->segment.last_stop <= demux->segment.start) {
ret = GST_FLOW_UNEXPECTED; ret = GST_FLOW_UNEXPECTED;
goto pause; goto pause;
} }
@ -557,15 +559,15 @@ pause:
if (ret == GST_FLOW_UNEXPECTED) { if (ret == GST_FLOW_UNEXPECTED) {
/* perform EOS logic */ /* perform EOS logic */
gst_element_no_more_pads (GST_ELEMENT_CAST (demux)); gst_element_no_more_pads (GST_ELEMENT_CAST (demux));
if (demux->segment->flags & GST_SEEK_FLAG_SEGMENT) { if (demux->segment.flags & GST_SEEK_FLAG_SEGMENT) {
gint64 stop; gint64 stop;
/* for segment playback we need to post when (in stream time) /* for segment playback we need to post when (in stream time)
* we stopped, this is either stop (when set) or the duration. */ * we stopped, this is either stop (when set) or the duration. */
if ((stop = demux->segment->stop) == -1) if ((stop = demux->segment.stop) == -1)
stop = demux->segment->duration; stop = demux->segment.duration;
if (demux->segment->rate >= 0) { if (demux->segment.rate >= 0) {
GST_LOG_OBJECT (demux, "Sending segment done, at end of segment"); GST_LOG_OBJECT (demux, "Sending segment done, at end of segment");
gst_element_post_message (GST_ELEMENT_CAST (demux), gst_element_post_message (GST_ELEMENT_CAST (demux),
gst_message_new_segment_done (GST_OBJECT_CAST (demux), gst_message_new_segment_done (GST_OBJECT_CAST (demux),
@ -575,7 +577,7 @@ pause:
"segment"); "segment");
gst_element_post_message (GST_ELEMENT_CAST (demux), gst_element_post_message (GST_ELEMENT_CAST (demux),
gst_message_new_segment_done (GST_OBJECT_CAST (demux), gst_message_new_segment_done (GST_OBJECT_CAST (demux),
GST_FORMAT_TIME, demux->segment->start)); GST_FORMAT_TIME, demux->segment.start));
} }
} else { } else {
/* normal playback, send EOS to all linked pads */ /* normal playback, send EOS to all linked pads */
@ -661,10 +663,10 @@ gst_flv_demux_handle_seek_push (GstFLVDemux * demux, GstEvent * event)
keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT); keyframe = !!(flags & GST_SEEK_FLAG_KEY_UNIT);
/* Work on a copy until we are sure the seek succeeded. */ /* Work on a copy until we are sure the seek succeeded. */
memcpy (&seeksegment, demux->segment, sizeof (GstSegment)); memcpy (&seeksegment, &demux->segment, sizeof (GstSegment));
GST_DEBUG_OBJECT (demux, "segment before configure %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (demux, "segment before configure %" GST_SEGMENT_FORMAT,
demux->segment); &demux->segment);
/* Apply the seek to our segment */ /* Apply the seek to our segment */
gst_segment_set_seek (&seeksegment, rate, format, flags, gst_segment_set_seek (&seeksegment, rate, format, flags,
@ -673,7 +675,7 @@ gst_flv_demux_handle_seek_push (GstFLVDemux * demux, GstEvent * event)
GST_DEBUG_OBJECT (demux, "segment configured %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (demux, "segment configured %" GST_SEGMENT_FORMAT,
&seeksegment); &seeksegment);
if (flush || seeksegment.last_stop != demux->segment->last_stop) { if (flush || seeksegment.last_stop != demux->segment.last_stop) {
/* Do the actual seeking */ /* Do the actual seeking */
guint64 offset = gst_flv_demux_find_offset (demux, &seeksegment); guint64 offset = gst_flv_demux_find_offset (demux, &seeksegment);
@ -692,18 +694,16 @@ gst_flv_demux_handle_seek_push (GstFLVDemux * demux, GstEvent * event)
if (ret) { if (ret) {
/* Ok seek succeeded, take the newly configured segment */ /* Ok seek succeeded, take the newly configured segment */
memcpy (demux->segment, &seeksegment, sizeof (GstSegment)); memcpy (&demux->segment, &seeksegment, sizeof (GstSegment));
/* Tell all the stream a new segment is needed */ /* Tell all the stream a new segment is needed */
{ demux->audio_need_segment = TRUE;
demux->audio_need_segment = TRUE; demux->video_need_segment = TRUE;
demux->video_need_segment = TRUE; /* Clean any potential newsegment event kept for the streams. The first
/* Clean any potential newsegment event kept for the streams. The first * stream needing a new segment will create a new one. */
* stream needing a new segment will create a new one. */ if (G_UNLIKELY (demux->new_seg_event)) {
if (G_UNLIKELY (demux->new_seg_event)) { gst_event_unref (demux->new_seg_event);
gst_event_unref (demux->new_seg_event); demux->new_seg_event = NULL;
demux->new_seg_event = NULL;
}
} }
gst_event_unref (event); gst_event_unref (event);
} else { } else {
@ -761,10 +761,10 @@ gst_flv_demux_handle_seek_pull (GstFLVDemux * demux, GstEvent * event)
} }
/* Work on a copy until we are sure the seek succeeded. */ /* Work on a copy until we are sure the seek succeeded. */
memcpy (&seeksegment, demux->segment, sizeof (GstSegment)); memcpy (&seeksegment, &demux->segment, sizeof (GstSegment));
GST_DEBUG_OBJECT (demux, "segment before configure %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (demux, "segment before configure %" GST_SEGMENT_FORMAT,
demux->segment); &demux->segment);
/* Apply the seek to our segment */ /* Apply the seek to our segment */
gst_segment_set_seek (&seeksegment, rate, format, flags, gst_segment_set_seek (&seeksegment, rate, format, flags,
@ -773,7 +773,7 @@ gst_flv_demux_handle_seek_pull (GstFLVDemux * demux, GstEvent * event)
GST_DEBUG_OBJECT (demux, "segment configured %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (demux, "segment configured %" GST_SEGMENT_FORMAT,
&seeksegment); &seeksegment);
if (flush || seeksegment.last_stop != demux->segment->last_stop) { if (flush || seeksegment.last_stop != demux->segment.last_stop) {
/* Do the actual seeking */ /* Do the actual seeking */
demux->offset = gst_flv_demux_find_offset (demux, &seeksegment); demux->offset = gst_flv_demux_find_offset (demux, &seeksegment);
@ -788,59 +788,56 @@ gst_flv_demux_handle_seek_pull (GstFLVDemux * demux, GstEvent * event)
ret = TRUE; ret = TRUE;
} }
if (G_UNLIKELY (demux->close_seg_event)) {
gst_event_unref (demux->close_seg_event);
demux->close_seg_event = NULL;
}
if (flush) { if (flush) {
/* Stop flushing, the sinks are at time 0 now */ /* Stop flushing, the sinks are at time 0 now */
gst_flv_demux_push_src_event (demux, gst_event_new_flush_stop ()); gst_flv_demux_push_src_event (demux, gst_event_new_flush_stop ());
} else { } else {
GST_DEBUG_OBJECT (demux, "closing running segment %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (demux, "closing running segment %" GST_SEGMENT_FORMAT,
demux->segment); &demux->segment);
if (G_UNLIKELY (demux->close_seg_event)) {
gst_event_unref (demux->close_seg_event);
demux->close_seg_event = NULL;
}
/* Close the current segment for a linear playback */ /* Close the current segment for a linear playback */
if (demux->segment->rate >= 0) { if (demux->segment.rate >= 0) {
/* for forward playback, we played from start to last_stop */ /* for forward playback, we played from start to last_stop */
demux->close_seg_event = gst_event_new_new_segment (TRUE, demux->close_seg_event = gst_event_new_new_segment (TRUE,
demux->segment->rate, demux->segment->format, demux->segment.rate, demux->segment.format,
demux->segment->start, demux->segment->last_stop, demux->segment.start, demux->segment.last_stop, demux->segment.time);
demux->segment->time);
} else { } else {
gint64 stop; gint64 stop;
if ((stop = demux->segment->stop) == -1) if ((stop = demux->segment.stop) == -1)
stop = demux->segment->duration; stop = demux->segment.duration;
/* for reverse playback, we played from stop to last_stop. */ /* for reverse playback, we played from stop to last_stop. */
demux->close_seg_event = gst_event_new_new_segment (TRUE, demux->close_seg_event = gst_event_new_new_segment (TRUE,
demux->segment->rate, demux->segment->format, demux->segment.rate, demux->segment.format,
demux->segment->last_stop, stop, demux->segment->last_stop); demux->segment.last_stop, stop, demux->segment.last_stop);
} }
} }
if (ret) { if (ret) {
/* Ok seek succeeded, take the newly configured segment */ /* Ok seek succeeded, take the newly configured segment */
memcpy (demux->segment, &seeksegment, sizeof (GstSegment)); memcpy (&demux->segment, &seeksegment, sizeof (GstSegment));
/* Notify about the start of a new segment */ /* Notify about the start of a new segment */
if (demux->segment->flags & GST_SEEK_FLAG_SEGMENT) { if (demux->segment.flags & GST_SEEK_FLAG_SEGMENT) {
gst_element_post_message (GST_ELEMENT (demux), gst_element_post_message (GST_ELEMENT (demux),
gst_message_new_segment_start (GST_OBJECT (demux), gst_message_new_segment_start (GST_OBJECT (demux),
demux->segment->format, demux->segment->last_stop)); demux->segment.format, demux->segment.last_stop));
} }
/* Tell all the stream a new segment is needed */ /* Tell all the stream a new segment is needed */
{ demux->audio_need_segment = TRUE;
demux->audio_need_segment = TRUE; demux->video_need_segment = TRUE;
demux->video_need_segment = TRUE; /* Clean any potential newsegment event kept for the streams. The first
/* Clean any potential newsegment event kept for the streams. The first * stream needing a new segment will create a new one. */
* stream needing a new segment will create a new one. */ if (G_UNLIKELY (demux->new_seg_event)) {
if (G_UNLIKELY (demux->new_seg_event)) { gst_event_unref (demux->new_seg_event);
gst_event_unref (demux->new_seg_event); demux->new_seg_event = NULL;
demux->new_seg_event = NULL;
}
} }
} }
@ -954,11 +951,11 @@ gst_flv_demux_sink_event (GstPad * pad, GstEvent * event)
if (format == GST_FORMAT_TIME) { if (format == GST_FORMAT_TIME) {
/* time segment, this is perfect, copy over the values. */ /* time segment, this is perfect, copy over the values. */
gst_segment_set_newsegment (demux->segment, update, rate, format, start, gst_segment_set_newsegment (&demux->segment, update, rate, format,
stop, time); start, stop, time);
GST_DEBUG_OBJECT (demux, "NEWSEGMENT: %" GST_SEGMENT_FORMAT, GST_DEBUG_OBJECT (demux, "NEWSEGMENT: %" GST_SEGMENT_FORMAT,
demux->segment); &demux->segment);
/* and forward */ /* and forward */
ret = gst_flv_demux_push_src_event (demux, event); ret = gst_flv_demux_push_src_event (demux, event);
@ -1154,11 +1151,6 @@ gst_flv_demux_dispose (GObject * object)
demux->adapter = NULL; demux->adapter = NULL;
} }
if (demux->segment) {
gst_segment_free (demux->segment);
demux->segment = NULL;
}
if (demux->taglist) { if (demux->taglist) {
gst_tag_list_free (demux->taglist); gst_tag_list_free (demux->taglist);
demux->taglist = NULL; demux->taglist = NULL;
@ -1263,9 +1255,8 @@ gst_flv_demux_init (GstFLVDemux * demux, GstFLVDemuxClass * g_class)
gst_element_add_pad (GST_ELEMENT (demux), demux->sinkpad); gst_element_add_pad (GST_ELEMENT (demux), demux->sinkpad);
demux->adapter = gst_adapter_new (); demux->adapter = gst_adapter_new ();
demux->segment = gst_segment_new ();
demux->taglist = gst_tag_list_new (); demux->taglist = gst_tag_list_new ();
gst_segment_init (demux->segment, GST_FORMAT_TIME); gst_segment_init (&demux->segment, GST_FORMAT_TIME);
demux->own_index = FALSE; demux->own_index = FALSE;

2
gst/flv/gstflvdemux.h
View file

@ -66,7 +66,7 @@ struct _GstFLVDemux
GstAdapter *adapter; GstAdapter *adapter;
GstSegment *segment; GstSegment segment;
GstEvent *close_seg_event; GstEvent *close_seg_event;
GstEvent *new_seg_event; GstEvent *new_seg_event;

33
gst/flv/gstflvparse.c
View file

@ -607,7 +607,7 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, GstBuffer * buffer)
} }
/* Push taglist if present */ /* Push taglist if present */
if ((demux->has_audio && !demux->audio_pad) || if ((demux->has_audio && !demux->audio_pad) &&
(demux->has_video && !demux->video_pad)) { (demux->has_video && !demux->video_pad)) {
GST_DEBUG_OBJECT (demux, "we are still waiting for a stream to come up " GST_DEBUG_OBJECT (demux, "we are still waiting for a stream to come up "
"before we can push tags"); "before we can push tags");
@ -686,7 +686,7 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, GstBuffer * buffer)
demux->audio_need_discont = FALSE; demux->audio_need_discont = FALSE;
} }
gst_segment_set_last_stop (demux->segment, GST_FORMAT_TIME, gst_segment_set_last_stop (&demux->segment, GST_FORMAT_TIME,
GST_BUFFER_TIMESTAMP (outbuf)); GST_BUFFER_TIMESTAMP (outbuf));
/* Do we need a newsegment event ? */ /* Do we need a newsegment event ? */
@ -698,12 +698,12 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, GstBuffer * buffer)
if (!demux->new_seg_event) { if (!demux->new_seg_event) {
GST_DEBUG_OBJECT (demux, "pushing newsegment from %" GST_DEBUG_OBJECT (demux, "pushing newsegment from %"
GST_TIME_FORMAT " to %" GST_TIME_FORMAT, GST_TIME_FORMAT " to %" GST_TIME_FORMAT,
GST_TIME_ARGS (demux->segment->last_stop), GST_TIME_ARGS (demux->segment.last_stop),
GST_TIME_ARGS (demux->segment->stop)); GST_TIME_ARGS (demux->segment.stop));
demux->new_seg_event = demux->new_seg_event =
gst_event_new_new_segment (FALSE, demux->segment->rate, gst_event_new_new_segment (FALSE, demux->segment.rate,
demux->segment->format, demux->segment->last_stop, demux->segment.format, demux->segment.last_stop,
demux->segment->stop, demux->segment->last_stop); demux->segment.stop, demux->segment.last_stop);
} else { } else {
GST_DEBUG_OBJECT (demux, "pushing pre-generated newsegment event"); GST_DEBUG_OBJECT (demux, "pushing pre-generated newsegment event");
} }
@ -922,7 +922,7 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, GstBuffer * buffer)
} }
/* Push taglist if present */ /* Push taglist if present */
if ((demux->has_audio && !demux->audio_pad) || if ((demux->has_audio && !demux->audio_pad) &&
(demux->has_video && !demux->video_pad)) { (demux->has_video && !demux->video_pad)) {
GST_DEBUG_OBJECT (demux, "we are still waiting for a stream to come up " GST_DEBUG_OBJECT (demux, "we are still waiting for a stream to come up "
"before we can push tags"); "before we can push tags");
@ -1012,7 +1012,7 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, GstBuffer * buffer)
demux->video_need_discont = FALSE; demux->video_need_discont = FALSE;
} }
gst_segment_set_last_stop (demux->segment, GST_FORMAT_TIME, gst_segment_set_last_stop (&demux->segment, GST_FORMAT_TIME,
GST_BUFFER_TIMESTAMP (outbuf)); GST_BUFFER_TIMESTAMP (outbuf));
/* Do we need a newsegment event ? */ /* Do we need a newsegment event ? */
@ -1024,12 +1024,12 @@ gst_flv_parse_tag_video (GstFLVDemux * demux, GstBuffer * buffer)
if (!demux->new_seg_event) { if (!demux->new_seg_event) {
GST_DEBUG_OBJECT (demux, "pushing newsegment from %" GST_DEBUG_OBJECT (demux, "pushing newsegment from %"
GST_TIME_FORMAT " to %" GST_TIME_FORMAT, GST_TIME_FORMAT " to %" GST_TIME_FORMAT,
GST_TIME_ARGS (demux->segment->last_stop), GST_TIME_ARGS (demux->segment.last_stop),
GST_TIME_ARGS (demux->segment->stop)); GST_TIME_ARGS (demux->segment.stop));
demux->new_seg_event = demux->new_seg_event =
gst_event_new_new_segment (FALSE, demux->segment->rate, gst_event_new_new_segment (FALSE, demux->segment.rate,
demux->segment->format, demux->segment->last_stop, demux->segment.format, demux->segment.last_stop,
demux->segment->stop, demux->segment->last_stop); demux->segment.stop, demux->segment.last_stop);
} else { } else {
GST_DEBUG_OBJECT (demux, "pushing pre-generated newsegment event"); GST_DEBUG_OBJECT (demux, "pushing pre-generated newsegment event");
} }
@ -1085,6 +1085,11 @@ gst_flv_parse_tag_timestamp (GstFLVDemux * demux, GstBuffer * buffer,
return GST_CLOCK_TIME_NONE; return GST_CLOCK_TIME_NONE;
} }
if (type == 9)
demux->has_video = TRUE;
else if (type == 8)
demux->has_audio = TRUE;
tag_data_size = GST_READ_UINT24_BE (data + 1); tag_data_size = GST_READ_UINT24_BE (data + 1);
if (GST_BUFFER_SIZE (buffer) >= tag_data_size + 11 + 4) { if (GST_BUFFER_SIZE (buffer) >= tag_data_size + 11 + 4) {