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

qtdemux: Make QtDemuxStream refcounted structure

Browse source 
This a prework for porting GPtrArray.
Refcounting will help the use of g_ptr_array_new_with_free_func()
with QtDemuxStream structure

https://bugzilla.gnome.org/show_bug.cgi?id=797239
This commit is contained in:
Seungha Yang 2018-10-07 16:50:45 +09:00 committed by Edward Hervey
parent 72123e3da3
commit 1600323119
1 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/isomp4/qtdemux.c
View file

@ -446,6 +446,8 @@ struct _QtDemuxStream
guint32 protection_scheme_version; guint32 protection_scheme_version;
gpointer protection_scheme_info; /* specific to the protection scheme */ gpointer protection_scheme_info; /* specific to the protection scheme */
GQueue protection_scheme_event_queue; GQueue protection_scheme_event_queue;
gint ref_count; /* atomic */
}; };
/* Contains properties and cryptographic info for a set of samples from a /* Contains properties and cryptographic info for a set of samples from a
@ -576,7 +578,7 @@ static GstCaps *qtdemux_generic_caps (GstQTDemux * qtdemux,
static gboolean qtdemux_parse_samples (GstQTDemux * qtdemux, static gboolean qtdemux_parse_samples (GstQTDemux * qtdemux,
QtDemuxStream * stream, guint32 n); QtDemuxStream * stream, guint32 n);
static GstFlowReturn qtdemux_expose_streams (GstQTDemux * qtdemux); static GstFlowReturn qtdemux_expose_streams (GstQTDemux * qtdemux);
static void gst_qtdemux_stream_free (QtDemuxStream * stream); static void gst_qtdemux_stream_unref (QtDemuxStream * stream);
static void gst_qtdemux_stream_clear (QtDemuxStream * stream); static void gst_qtdemux_stream_clear (QtDemuxStream * stream);
static void gst_qtdemux_remove_stream (GstQTDemux * qtdemux, static void gst_qtdemux_remove_stream (GstQTDemux * qtdemux,
QtDemuxStream * stream); QtDemuxStream * stream);
@ -1988,6 +1990,7 @@ _create_stream (GstQTDemux * demux, guint32 track_id)
stream->stream_tags = gst_tag_list_new_empty (); stream->stream_tags = gst_tag_list_new_empty ();
gst_tag_list_set_scope (stream->stream_tags, GST_TAG_SCOPE_STREAM); gst_tag_list_set_scope (stream->stream_tags, GST_TAG_SCOPE_STREAM);
g_queue_init (&stream->protection_scheme_event_queue); g_queue_init (&stream->protection_scheme_event_queue);
stream->ref_count = 1;
return stream; return stream;
} }
@ -2153,9 +2156,9 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
if (hard) { if (hard) {
qtdemux->segment_seqnum = GST_SEQNUM_INVALID; qtdemux->segment_seqnum = GST_SEQNUM_INVALID;
g_list_free_full (qtdemux->active_streams, g_list_free_full (qtdemux->active_streams,
(GDestroyNotify) gst_qtdemux_stream_free); (GDestroyNotify) gst_qtdemux_stream_unref);
g_list_free_full (qtdemux->old_streams, g_list_free_full (qtdemux->old_streams,
(GDestroyNotify) gst_qtdemux_stream_free); (GDestroyNotify) gst_qtdemux_stream_unref);
qtdemux->active_streams = NULL; qtdemux->active_streams = NULL;
qtdemux->old_streams = NULL; qtdemux->old_streams = NULL;
qtdemux->n_streams = 0; qtdemux->n_streams = 0;
@ -2625,10 +2628,10 @@ gst_qtdemux_stream_reset (QtDemuxStream * stream)
stream->stsd_entries_length = 0; stream->stsd_entries_length = 0;
} }
static void static void
gst_qtdemux_stream_free (QtDemuxStream * stream) gst_qtdemux_stream_unref (QtDemuxStream * stream)
{ {
if (g_atomic_int_dec_and_test (&stream->ref_count)) {
gst_qtdemux_stream_reset (stream); gst_qtdemux_stream_reset (stream);
gst_tag_list_unref (stream->stream_tags); gst_tag_list_unref (stream->stream_tags);
if (stream->pad) { if (stream->pad) {
@ -2639,12 +2642,13 @@ gst_qtdemux_stream_free (QtDemuxStream * stream)
g_free (stream->stream_id); g_free (stream->stream_id);
g_free (stream); g_free (stream);
} }
}
static void static void
gst_qtdemux_remove_stream (GstQTDemux * qtdemux, QtDemuxStream * stream) gst_qtdemux_remove_stream (GstQTDemux * qtdemux, QtDemuxStream * stream)
{ {
qtdemux->active_streams = g_list_remove (qtdemux->active_streams, stream); qtdemux->active_streams = g_list_remove (qtdemux->active_streams, stream);
gst_qtdemux_stream_free (stream); gst_qtdemux_stream_unref (stream);
qtdemux->n_streams--; qtdemux->n_streams--;
} }
@ -10247,7 +10251,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
"found, assuming preview image or something; skipping track", "found, assuming preview image or something; skipping track",
stream->duration, stream->timescale, qtdemux->duration, stream->duration, stream->timescale, qtdemux->duration,
qtdemux->timescale); qtdemux->timescale);
gst_qtdemux_stream_free (stream); gst_qtdemux_stream_unref (stream);
return TRUE; return TRUE;
} }
} }
@ -10344,7 +10348,7 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
if (stsd_len < 24) { if (stsd_len < 24) {
/* .. but skip stream with empty stsd produced by some Vivotek cameras */ /* .. but skip stream with empty stsd produced by some Vivotek cameras */
if (stream->subtype == FOURCC_vivo) { if (stream->subtype == FOURCC_vivo) {
gst_qtdemux_stream_free (stream); gst_qtdemux_stream_unref (stream);
return TRUE; return TRUE;
} else { } else {
goto corrupt_file; goto corrupt_file;
@ -12235,13 +12239,13 @@ corrupt_file:
GST_ELEMENT_ERROR (qtdemux, STREAM, DEMUX, GST_ELEMENT_ERROR (qtdemux, STREAM, DEMUX,
(_("This file is corrupt and cannot be played.")), (NULL)); (_("This file is corrupt and cannot be played.")), (NULL));
if (stream) if (stream)
gst_qtdemux_stream_free (stream); gst_qtdemux_stream_unref (stream);
return FALSE; return FALSE;
} }
error_encrypted: error_encrypted:
{ {
GST_ELEMENT_ERROR (qtdemux, STREAM, DECRYPT, (NULL), (NULL)); GST_ELEMENT_ERROR (qtdemux, STREAM, DECRYPT, (NULL), (NULL));
gst_qtdemux_stream_free (stream); gst_qtdemux_stream_unref (stream);
return FALSE; return FALSE;
} }
samples_failed: samples_failed:
@ -12250,7 +12254,7 @@ segments_failed:
/* we posted an error already */ /* we posted an error already */
/* free stbl sub-atoms */ /* free stbl sub-atoms */
gst_qtdemux_stbl_free (stream); gst_qtdemux_stbl_free (stream);
gst_qtdemux_stream_free (stream); gst_qtdemux_stream_unref (stream);
return FALSE; return FALSE;
} }
existing_stream: existing_stream:
@ -12263,7 +12267,7 @@ unknown_stream:
{ {
GST_INFO_OBJECT (qtdemux, "unknown subtype %" GST_FOURCC_FORMAT, GST_INFO_OBJECT (qtdemux, "unknown subtype %" GST_FOURCC_FORMAT,
GST_FOURCC_ARGS (stream->subtype)); GST_FOURCC_ARGS (stream->subtype));
gst_qtdemux_stream_free (stream); gst_qtdemux_stream_unref (stream);
return TRUE; return TRUE;
} }
} }
@ -12524,7 +12528,7 @@ qtdemux_update_streams (GstQTDemux * qtdemux)
return FALSE; return FALSE;
qtdemux->old_streams = g_list_remove (qtdemux->old_streams, oldstream); qtdemux->old_streams = g_list_remove (qtdemux->old_streams, oldstream);
gst_qtdemux_stream_free (oldstream); gst_qtdemux_stream_unref (oldstream);
} else { } else {
GstTagList *list; GstTagList *list;
@ -12559,7 +12563,7 @@ qtdemux_expose_streams (GstQTDemux * qtdemux)
} }
g_list_free_full (qtdemux->old_streams, g_list_free_full (qtdemux->old_streams,
(GDestroyNotify) gst_qtdemux_stream_free); (GDestroyNotify) gst_qtdemux_stream_unref);
qtdemux->old_streams = NULL; qtdemux->old_streams = NULL;
return GST_FLOW_OK; return GST_FLOW_OK;
@ -12602,7 +12606,7 @@ qtdemux_expose_streams (GstQTDemux * qtdemux)
} }
qtdemux->old_streams = g_list_remove (qtdemux->old_streams, stream); qtdemux->old_streams = g_list_remove (qtdemux->old_streams, stream);
gst_qtdemux_stream_free (stream); gst_qtdemux_stream_unref (stream);
} }
/* check if we should post a redirect in case there is a single trak /* check if we should post a redirect in case there is a single trak