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

qtdemux: update for GstIndex removal

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-12-30 17:23:43 +00:00
parent 2884785d54
commit aeb69c188b
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/isomp4/qtdemux.c
View file

@ -396,8 +396,10 @@ static guint32
gst_qtdemux_find_index_for_given_media_offset_linear (GstQTDemux * qtdemux, gst_qtdemux_find_index_for_given_media_offset_linear (GstQTDemux * qtdemux,
QtDemuxStream * str, gint64 media_offset); QtDemuxStream * str, gint64 media_offset);
#if 0
static void gst_qtdemux_set_index (GstElement * element, GstIndex * index); static void gst_qtdemux_set_index (GstElement * element, GstIndex * index);
static GstIndex *gst_qtdemux_get_index (GstElement * element); static GstIndex *gst_qtdemux_get_index (GstElement * element);
#endif
static GstStateChangeReturn gst_qtdemux_change_state (GstElement * element, static GstStateChangeReturn gst_qtdemux_change_state (GstElement * element,
GstStateChange transition); GstStateChange transition);
static gboolean qtdemux_sink_activate (GstPad * sinkpad, GstObject * parent); static gboolean qtdemux_sink_activate (GstPad * sinkpad, GstObject * parent);
@ -445,8 +447,10 @@ gst_qtdemux_class_init (GstQTDemuxClass * klass)
gobject_class->dispose = gst_qtdemux_dispose; gobject_class->dispose = gst_qtdemux_dispose;
gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_qtdemux_change_state); gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_qtdemux_change_state);
#if 0
gstelement_class->set_index = GST_DEBUG_FUNCPTR (gst_qtdemux_set_index); gstelement_class->set_index = GST_DEBUG_FUNCPTR (gst_qtdemux_set_index);
gstelement_class->get_index = GST_DEBUG_FUNCPTR (gst_qtdemux_get_index); gstelement_class->get_index = GST_DEBUG_FUNCPTR (gst_qtdemux_get_index);
#endif
gst_tag_register_musicbrainz_tags (); gst_tag_register_musicbrainz_tags ();
@ -1723,6 +1727,7 @@ drop:
return res; return res;
} }
#if 0
static void static void
gst_qtdemux_set_index (GstElement * element, GstIndex * index) gst_qtdemux_set_index (GstElement * element, GstIndex * index)
{ {
@ -1759,6 +1764,7 @@ gst_qtdemux_get_index (GstElement * element)
return result; return result;
} }
#endif
static void static void
gst_qtdemux_stbl_free (QtDemuxStream * stream) gst_qtdemux_stbl_free (QtDemuxStream * stream)
@ -1838,9 +1844,11 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
if (qtdemux->tag_list) if (qtdemux->tag_list)
gst_tag_list_free (qtdemux->tag_list); gst_tag_list_free (qtdemux->tag_list);
qtdemux->tag_list = NULL; qtdemux->tag_list = NULL;
#if 0
if (qtdemux->element_index) if (qtdemux->element_index)
gst_object_unref (qtdemux->element_index); gst_object_unref (qtdemux->element_index);
qtdemux->element_index = NULL; qtdemux->element_index = NULL;
#endif
gst_adapter_clear (qtdemux->adapter); gst_adapter_clear (qtdemux->adapter);
for (n = 0; n < qtdemux->n_streams; n++) { for (n = 0; n < qtdemux->n_streams; n++) {
gst_qtdemux_stream_free (qtdemux, qtdemux->streams[n]); gst_qtdemux_stream_free (qtdemux, qtdemux->streams[n]);
@ -3634,7 +3642,7 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
if (G_UNLIKELY (stream->padding)) { if (G_UNLIKELY (stream->padding)) {
gst_buffer_resize (buf, stream->padding, -1); gst_buffer_resize (buf, stream->padding, -1);
} }
#if 0
if (G_UNLIKELY (qtdemux->element_index)) { if (G_UNLIKELY (qtdemux->element_index)) {
GstClockTime stream_time; GstClockTime stream_time;
@ -3652,6 +3660,7 @@ gst_qtdemux_decorate_and_push_buffer (GstQTDemux * qtdemux,
GST_FORMAT_BYTES, byte_position, NULL); GST_FORMAT_BYTES, byte_position, NULL);
} }
} }
#endif
if (stream->need_clip) if (stream->need_clip)
buf = gst_qtdemux_clip_buffer (qtdemux, stream, buf); buf = gst_qtdemux_clip_buffer (qtdemux, stream, buf);

2
gst/isomp4/qtdemux.h
View file

@ -102,9 +102,11 @@ struct _GstQTDemux {
GstSegment segment; GstSegment segment;
GstEvent *pending_newsegment; GstEvent *pending_newsegment;
#if 0
/* gst index support */ /* gst index support */
GstIndex *element_index; GstIndex *element_index;
gint index_id; gint index_id;
#endif
gint64 requested_seek_time; gint64 requested_seek_time;
guint64 seek_offset; guint64 seek_offset;