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

ext/: GstObjects must be unref'ed with gst_object_unref() instead of g_object_unref(), otherwise things break for GLi...

Browse source 
Original commit message from CVS:
* ext/ivorbis/vorbisfile.c: (gst_ivorbisfile_loop):
* ext/libmms/gstmms.c: (gst_mms_src_query), (gst_mms_create):
* ext/musepack/gstmusepackdec.c: (gst_musepackdec_src_query),
(gst_musepackdec_loop):
* ext/swfdec/gstswfdec.c: (gst_swfdec_video_link),
(gst_swfdec_src_query):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_src_query):
GstObjects must be unref'ed with gst_object_unref() instead of
g_object_unref(), otherwise things break for GLib-2.6 users.
This commit is contained in:
Tim-Philipp Müller 2005-12-12 10:40:42 +00:00
parent dfa22f08c6
commit 6435014c26
6 changed files with 31 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2005-12-12 Tim-Philipp Müller <tim at centricular dot net>
* ext/ivorbis/vorbisfile.c: (gst_ivorbisfile_loop):
* ext/libmms/gstmms.c: (gst_mms_src_query), (gst_mms_create):
* ext/musepack/gstmusepackdec.c: (gst_musepackdec_src_query),
(gst_musepackdec_loop):
* ext/swfdec/gstswfdec.c: (gst_swfdec_video_link),
(gst_swfdec_src_query):
* ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_src_query):
GstObjects must be unref'ed with gst_object_unref() instead of
g_object_unref(), otherwise things break for GLib-2.6 users.
2005-12-12 David Schleef <ds@schleef.org> 2005-12-12 David Schleef <ds@schleef.org>
* ext/swfdec/gstswfdec.c: (gst_swfdecbuffer_get_type), * ext/swfdec/gstswfdec.c: (gst_swfdecbuffer_get_type),

14
ext/ivorbis/vorbisfile.c
View file

@ -653,7 +653,7 @@ gst_ivorbisfile_loop (GstPad * pad)
gint link; gint link;
if (ivorbisfile->eos) { if (ivorbisfile->eos) {
g_object_unref (ivorbisfile); gst_object_unref (ivorbisfile);
return; return;
} }
@ -664,7 +664,7 @@ gst_ivorbisfile_loop (GstPad * pad)
if (ivorbisfile->adapter) { if (ivorbisfile->adapter) {
if (gst_adapter_available (ivorbisfile->adapter) < 40960) { if (gst_adapter_available (ivorbisfile->adapter) < 40960) {
g_object_unref (ivorbisfile); gst_object_unref (ivorbisfile);
return; return;
} }
} }
@ -681,7 +681,7 @@ gst_ivorbisfile_loop (GstPad * pad)
if ((err = ov_open_callbacks (ivorbisfile, &ivorbisfile->vf, NULL, 0, if ((err = ov_open_callbacks (ivorbisfile, &ivorbisfile->vf, NULL, 0,
ivorbisfile_ov_callbacks)) < 0) { ivorbisfile_ov_callbacks)) < 0) {
GST_ELEMENT_ERROR (ivorbisfile, STREAM, DECODE, (NULL), (NULL)); GST_ELEMENT_ERROR (ivorbisfile, STREAM, DECODE, (NULL), (NULL));
g_object_unref (ivorbisfile); gst_object_unref (ivorbisfile);
return; return;
} }
@ -744,7 +744,7 @@ gst_ivorbisfile_loop (GstPad * pad)
if (!gst_ivorbisfile_new_link (ivorbisfile, ivorbisfile->vf.current_link)) { if (!gst_ivorbisfile_new_link (ivorbisfile, ivorbisfile->vf.current_link)) {
GST_ELEMENT_ERROR (ivorbisfile, CORE, NEGOTIATION, (NULL), (NULL)); GST_ELEMENT_ERROR (ivorbisfile, CORE, NEGOTIATION, (NULL), (NULL));
} }
g_object_unref (ivorbisfile); gst_object_unref (ivorbisfile);
return; return;
} }
@ -765,12 +765,12 @@ gst_ivorbisfile_loop (GstPad * pad)
ivorbisfile->restart = TRUE; ivorbisfile->restart = TRUE;
gst_pad_push_event (ivorbisfile->srcpad, gst_event_new_eos ()); gst_pad_push_event (ivorbisfile->srcpad, gst_event_new_eos ());
} }
g_object_unref (ivorbisfile); gst_object_unref (ivorbisfile);
return; return;
} else if (ret < 0) { } else if (ret < 0) {
g_warning ("ivorbisfile: decoding error"); g_warning ("ivorbisfile: decoding error");
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
g_object_unref (ivorbisfile); gst_object_unref (ivorbisfile);
return; return;
} else { } else {
if (ivorbisfile->need_discont) { if (ivorbisfile->need_discont) {
@ -791,7 +791,7 @@ gst_ivorbisfile_loop (GstPad * pad)
if (NULL == GST_PAD_CAPS (ivorbisfile->srcpad)) { if (NULL == GST_PAD_CAPS (ivorbisfile->srcpad)) {
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
g_object_unref (ivorbisfile); gst_object_unref (ivorbisfile);
return; return;
} }

4
ext/libmms/gstmms.c
View file

@ -215,7 +215,7 @@ gst_mms_src_query (GstPad * pad, GstQuery * query)
break; break;
} }
g_object_unref (mmssrc); gst_object_unref (mmssrc);
return res; return res;
} }
@ -279,7 +279,7 @@ gst_mms_create (GstPushSrc * psrc, GstBuffer ** buf)
if (!gst_pad_send_event (peer, gst_event_new_eos ())) { if (!gst_pad_send_event (peer, gst_event_new_eos ())) {
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
} }
g_object_unref (peer); gst_object_unref (peer);
goto done; goto done;
} }

5
ext/musepack/gstmusepackdec.c
View file

@ -351,7 +351,7 @@ gst_musepackdec_src_query (GstPad * pad, GstQuery * query)
} }
done: done:
g_object_unref (musepackdec); gst_object_unref (musepackdec);
return res; return res;
} }
@ -557,6 +557,9 @@ gst_musepackdec_loop (GstPad * sinkpad)
GST_FORMAT_DEFAULT, musepackdec->pos, &fmt, &value); GST_FORMAT_DEFAULT, musepackdec->pos, &fmt, &value);
GST_BUFFER_TIMESTAMP (out) = value; GST_BUFFER_TIMESTAMP (out) = value;
GST_DEBUG ("Pushing buffer, timestamp %" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (out)));
musepackdec->pos += GST_BUFFER_SIZE (out) / musepackdec->bps; musepackdec->pos += GST_BUFFER_SIZE (out) / musepackdec->bps;
gst_buffer_set_caps (out, GST_PAD_CAPS (musepackdec->srcpad)); gst_buffer_set_caps (out, GST_PAD_CAPS (musepackdec->srcpad));
gst_pad_push (musepackdec->srcpad, out); gst_pad_push (musepackdec->srcpad, out);

4
ext/swfdec/gstswfdec.c
View file

@ -287,7 +287,7 @@ gst_swfdec_video_link (GstPad * pad, GstCaps * caps)
res = TRUE; res = TRUE;
} }
g_object_unref (swfdec); gst_object_unref (swfdec);
return res; return res;
} }
@ -669,7 +669,7 @@ gst_swfdec_src_query (GstPad * pad, GstQuery * query)
break; break;
} }
g_object_unref (swfdec); gst_object_unref (swfdec);
return res; return res;
} }

8
ext/wavpack/gstwavpackparse.c
View file

@ -159,7 +159,7 @@ gst_wavpack_parse_src_query (GstPad * pad, GstQuery * query)
if (format == GST_FORMAT_TIME) { if (format == GST_FORMAT_TIME) {
value = wavpackparse->timestamp; value = wavpackparse->timestamp;
gst_query_set_duration (query, format, value); gst_query_set_duration (query, format, value);
g_object_unref (wavpackparse); gst_object_unref (wavpackparse);
ret = TRUE; ret = TRUE;
break; break;
} }
@ -171,20 +171,20 @@ gst_wavpack_parse_src_query (GstPad * pad, GstQuery * query)
if (wavpackparse->total_samples == 0) { if (wavpackparse->total_samples == 0) {
value = 0; value = 0;
gst_query_set_duration (query, format, value); gst_query_set_duration (query, format, value);
g_object_unref (wavpackparse); gst_object_unref (wavpackparse);
ret = FALSE; ret = FALSE;
break; break;
} }
value = ((gdouble) wavpackparse->total_samples / value = ((gdouble) wavpackparse->total_samples /
(gdouble) wavpackparse->samplerate) * GST_SECOND; (gdouble) wavpackparse->samplerate) * GST_SECOND;
gst_query_set_duration (query, format, value); gst_query_set_duration (query, format, value);
g_object_unref (wavpackparse); gst_object_unref (wavpackparse);
ret = TRUE; ret = TRUE;
break; break;
} }
break; break;
default: default:
g_object_unref (wavpackparse); gst_object_unref (wavpackparse);
ret = gst_pad_query_default (pad, query); ret = gst_pad_query_default (pad, query);
break; break;
} }