[rygel-gst-0-10-media-engine] cleanup
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel-gst-0-10-media-engine] cleanup
- Date: Thu, 20 Dec 2012 12:14:09 +0000 (UTC)
commit 6d68ee772969cc6e3228dabfc64ce8dd501b2ee2
Author: Murray Cumming <murrayc murrayc com>
Date: Thu Dec 20 13:14:02 2012 +0100
cleanup
src/rygel-gst-data-source.c | 977 ++++++++++++------------------------------
src/rygel-gst-utils.c | 4 +-
src/rygel-l16-transcoder.c | 6 +-
src/rygel-mp2ts-transcoder.c | 4 +-
src/rygel-video-transcoder.c | 8 +-
5 files changed, 281 insertions(+), 718 deletions(-)
---
diff --git a/src/rygel-gst-data-source.c b/src/rygel-gst-data-source.c
index 9be8fbd..f8dcab1 100644
--- a/src/rygel-gst-data-source.c
+++ b/src/rygel-gst-data-source.c
@@ -46,37 +46,22 @@ static RygelDataSourceIface* rygel_gst_data_source_rygel_data_source_parent_ifac
GQuark rygel_gst_data_source_error_quark (void);
#define RYGEL_GST_DATA_SOURCE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), RYGEL_TYPE_GST_DATA_SOURCE, RygelGstDataSourcePrivate))
-enum {
- RYGEL_GST_DATA_SOURCE_DUMMY_PROPERTY
-};
-RygelGstDataSource* rygel_gst_data_source_new (const gchar* uri, GError** error);
-RygelGstDataSource* rygel_gst_data_source_construct (GType object_type, const gchar* uri, GError** error);
-GstElement* rygel_gst_utils_create_source_for_uri (const gchar* uri);
-RygelGstDataSource* rygel_gst_data_source_new_from_element (GstElement* element);
-RygelGstDataSource* rygel_gst_data_source_construct_from_element (GType object_type, GstElement* element);
+
static void rygel_gst_data_source_real_start (RygelDataSource* base, RygelHTTPSeek* offsets, GError** error);
static void rygel_gst_data_source_prepare_pipeline (RygelGstDataSource* self, const gchar* name, GstElement* src, GError** error);
static void rygel_gst_data_source_real_freeze (RygelDataSource* base);
-void rygel_gst_sink_freeze (RygelGstSink* self);
static void rygel_gst_data_source_real_thaw (RygelDataSource* base);
-void rygel_gst_sink_thaw (RygelGstSink* self);
static void rygel_gst_data_source_real_stop (RygelDataSource* base);
-static gboolean __lambda4_ (RygelGstDataSource* self);
-static gboolean ___lambda4__gsource_func (gpointer self);
-RygelGstSink* rygel_gst_sink_new (RygelDataSource* source, RygelHTTPSeek* offsets);
-RygelGstSink* rygel_gst_sink_construct (GType object_type, RygelDataSource* source, RygelHTTPSeek* offsets);
static void rygel_gst_data_source_src_pad_added (RygelGstDataSource* self, GstElement* src, GstPad* src_pad);
-static void _rygel_gst_data_source_src_pad_added_gst_element_pad_added (GstElement* _sender, GstPad* pad, gpointer self);
+static void on_pad_added (GstElement* _sender, GstPad* pad, gpointer self);
GQuark rygel_gst_error_quark (void);
static gboolean rygel_gst_data_source_bus_handler (RygelGstDataSource* self, GstBus* bus, GstMessage* message);
-static gboolean _rygel_gst_data_source_bus_handler_gst_bus_func (GstBus* bus, GstMessage* message, gpointer self);
+static gboolean on_bus_watch (GstBus* bus, GstMessage* message, gpointer self);
#define RYGEL_GST_SINK_NAME "http-gst-sink"
-GstElement* rygel_gst_utils_get_rtp_depayloader (GstCaps* caps);
+
static inline void _dynamic_set_streamable0 (GstElement* obj, gboolean value);
static inline void _dynamic_set_fragment_duration1 (GstElement* obj, gint value);
static gboolean rygel_gst_data_source_perform_seek (RygelGstDataSource* self);
-static gboolean ___lambda3_ (RygelGstDataSource* self);
-static gboolean ____lambda3__gsource_func (gpointer self);
static void rygel_gst_data_source_finalize (GObject* obj);
@@ -85,117 +70,67 @@ GQuark rygel_gst_data_source_error_quark (void) {
}
-RygelGstDataSource* rygel_gst_data_source_construct (GType object_type, const gchar* uri, GError** error) {
- RygelGstDataSource * self = NULL;
- const gchar* _tmp0_;
- GstElement* _tmp1_ = NULL;
- GstElement* _tmp2_;
- GError * _inner_error_ = NULL;
- g_return_val_if_fail (uri != NULL, NULL);
- self = (RygelGstDataSource*) g_object_new (object_type, NULL);
- _tmp0_ = uri;
- _tmp1_ = rygel_gst_utils_create_source_for_uri (_tmp0_);
- _gst_object_unref0 (self->src);
- self->src = _tmp1_;
- _tmp2_ = self->src;
- if (_tmp2_ == NULL) {
- const gchar* _tmp3_ = NULL;
- gchar* _tmp4_;
- gchar* msg;
- const gchar* _tmp5_;
- const gchar* _tmp6_;
- GError* _tmp7_;
- _tmp3_ = _ ("Could not create GstElement for URI %s");
- _tmp4_ = g_strdup (_tmp3_);
- msg = _tmp4_;
- _tmp5_ = msg;
- _tmp6_ = uri;
- _tmp7_ = g_error_new (RYGEL_GST_DATA_SOURCE_ERROR, RYGEL_GST_DATA_SOURCE_ERROR_NOT_COMPATIBLE, _tmp5_, _tmp6_);
- _inner_error_ = _tmp7_;
- g_propagate_error (error, _inner_error_);
- _g_free0 (msg);
- _g_object_unref0 (self);
+RygelGstDataSource*
+rygel_gst_data_source_construct (GType object_type, const gchar* uri, GError** error) {
+ RygelGstDataSource * self = RYGEL_GST_DATA_SOURCE (g_object_new (object_type, NULL));
+
+ self->src = rygel_gst_utils_create_source_for_uri (uri);
+ if (self->src == NULL) {
+ g_set_error (error,
+ RYGEL_GST_DATA_SOURCE_ERROR,
+ RYGEL_GST_DATA_SOURCE_ERROR_NOT_COMPATIBLE,
+ "Could not create GstElement for URI %s", uri);
return NULL;
}
+
return self;
}
-
-RygelGstDataSource* rygel_gst_data_source_new (const gchar* uri, GError** error) {
+RygelGstDataSource*
+rygel_gst_data_source_new (const gchar* uri, GError** error) {
return rygel_gst_data_source_construct (RYGEL_TYPE_GST_DATA_SOURCE, uri, error);
}
+RygelGstDataSource*
+rygel_gst_data_source_construct_from_element (GType object_type, GstElement* element) {
+ RygelGstDataSource * self = RYGEL_GST_DATA_SOURCE (g_object_new (object_type, NULL));
-static gpointer _gst_object_ref0 (gpointer self) {
- return self ? gst_object_ref (self) : NULL;
-}
-
-
-RygelGstDataSource* rygel_gst_data_source_construct_from_element (GType object_type, GstElement* element) {
- RygelGstDataSource * self = NULL;
- GstElement* _tmp0_;
- GstElement* _tmp1_;
- g_return_val_if_fail (element != NULL, NULL);
- self = (RygelGstDataSource*) g_object_new (object_type, NULL);
- _tmp0_ = element;
- _tmp1_ = _gst_object_ref0 (_tmp0_);
- _gst_object_unref0 (self->src);
- self->src = _tmp1_;
- return self;
+ self->src = element;
}
-
-RygelGstDataSource* rygel_gst_data_source_new_from_element (GstElement* element) {
+RygelGstDataSource*
+rygel_gst_data_source_new_from_element (GstElement* element) {
return rygel_gst_data_source_construct_from_element (RYGEL_TYPE_GST_DATA_SOURCE, element);
}
+static void
+rygel_gst_data_source_real_start (RygelDataSource* base, RygelHTTPSeek* offsets, GError** error) {
+ RygelGstDataSource * self = RYGEL_DATA_SOURCE (base);
+ GError * inner_error = NULL;
-static gpointer _g_object_ref0 (gpointer self) {
- return self ? g_object_ref (self) : NULL;
-}
-
-
-static void rygel_gst_data_source_real_start (RygelDataSource* base, RygelHTTPSeek* offsets, GError** error) {
- RygelGstDataSource * self;
- RygelHTTPSeek* _tmp0_;
- RygelHTTPSeek* _tmp1_;
- GstElement* _tmp2_;
- RygelHTTPSeek* _tmp3_;
- GError * _inner_error_ = NULL;
- self = (RygelGstDataSource*) base;
- _tmp0_ = offsets;
- _tmp1_ = _g_object_ref0 (_tmp0_);
- _g_object_unref0 (self->priv->seek);
- self->priv->seek = _tmp1_;
- _tmp2_ = self->src;
- rygel_gst_data_source_prepare_pipeline (self, "RygelGstDataSource", _tmp2_, &_inner_error_);
- if (_inner_error_ != NULL) {
- g_propagate_error (error, _inner_error_);
+ self->priv->seek = offsets;
+ rygel_gst_data_source_prepare_pipeline (self, "RygelGstDataSource", self->src, &inner_error);
+ if (inner_error) {
+ g_propagate_error (error, inner_error);
return;
}
- _tmp3_ = self->priv->seek;
- if (_tmp3_ != NULL) {
- GstPipeline* _tmp4_;
- _tmp4_ = self->priv->pipeline;
- gst_element_set_state ((GstElement*) _tmp4_, GST_STATE_PAUSED);
+
+ if (self->priv->seek) {
+ gst_element_set_state (self->priv->pipeline, GST_STATE_PAUSED);
} else {
- GstPipeline* _tmp5_;
- _tmp5_ = self->priv->pipeline;
- gst_element_set_state ((GstElement*) _tmp5_, GST_STATE_PLAYING);
+ gst_element_set_state (self->priv->pipeline, GST_STATE_PLAYING);
}
}
+static void
+rygel_gst_data_source_real_freeze (RygelDataSource* base) {
+ RygelGstDataSource * self = RYGEL_DATA_SOURCE (base);
-static void rygel_gst_data_source_real_freeze (RygelDataSource* base) {
- RygelGstDataSource * self;
- RygelGstSink* _tmp0_;
- self = (RygelGstDataSource*) base;
- _tmp0_ = self->priv->sink;
- rygel_gst_sink_freeze (_tmp0_);
+ rygel_gst_sink_freeze (self->priv->sink);
}
-
-static void rygel_gst_data_source_real_thaw (RygelDataSource* base) {
+static void
+rygel_gst_data_source_real_thaw (RygelDataSource* base) {
RygelGstDataSource * self;
RygelGstSink* _tmp0_;
self = (RygelGstDataSource*) base;
@@ -203,641 +138,276 @@ static void rygel_gst_data_source_real_thaw (RygelDataSource* base) {
rygel_gst_sink_thaw (_tmp0_);
}
+static gboolean
+on_idle_emit_done (gpointer user_data) {
+ RygelGstDataSource * self = RYGEL_DATA_SOURCE (user_data);
-static gboolean __lambda4_ (RygelGstDataSource* self) {
- gboolean result = FALSE;
- g_signal_emit_by_name ((RygelDataSource*) self, "done");
- result = FALSE;
- return result;
+ g_signal_emit_by_name (self, "done");
+ return FALSE;
}
+static void
+rygel_gst_data_source_real_stop (RygelDataSource* base) {
+ RygelGstDataSource * self = RYGEL_DATA_SOURCE (base);
-static gboolean ___lambda4__gsource_func (gpointer self) {
- gboolean result;
- result = __lambda4_ (self);
- return result;
-}
-
+ if (self->priv->sink) {
+ g_cancellable_cancel (self->priv->sink->cancellable);
+ }
-static void rygel_gst_data_source_real_stop (RygelDataSource* base) {
- RygelGstDataSource * self;
- RygelGstSink* _tmp0_;
- GCancellable* _tmp1_;
- GstPipeline* _tmp2_;
- guint _tmp3_;
- self = (RygelGstDataSource*) base;
- _tmp0_ = self->priv->sink;
- _tmp1_ = _tmp0_->cancellable;
- g_cancellable_cancel (_tmp1_);
- _tmp2_ = self->priv->pipeline;
- gst_element_set_state ((GstElement*) _tmp2_, GST_STATE_NULL);
- _tmp3_ = self->priv->bus_watch_id;
- g_source_remove (_tmp3_);
- g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda4__gsource_func, g_object_ref (self), g_object_unref);
-}
+ if (self->priv->pipeline) {
+ gst_element_set_state (self->priv->pipeline, GST_STATE_NULL);
+ }
+ g_source_remove (self->priv->bus_watch_id);
-static void _rygel_gst_data_source_src_pad_added_gst_element_pad_added (GstElement* _sender, GstPad* pad, gpointer self) {
- rygel_gst_data_source_src_pad_added (self, _sender, pad);
+ g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, on_idle_emit_done, g_object_ref (self), g_object_unref);
}
-static gboolean _rygel_gst_data_source_bus_handler_gst_bus_func (GstBus* bus, GstMessage* message, gpointer self) {
- gboolean result;
- result = rygel_gst_data_source_bus_handler (self, bus, message);
- return result;
-}
+static void
+on_pad_added (GstElement* src, GstPad* src_pad, gpointer user_data) {
+ RygelGstDataSource * self = RYGEL_DATA_SOURCE (user_data);
-
-static void rygel_gst_data_source_prepare_pipeline (RygelGstDataSource* self, const gchar* name, GstElement* src, GError** error) {
- RygelHTTPSeek* _tmp0_;
- RygelGstSink* _tmp1_;
- const gchar* _tmp2_;
- GstPipeline* _tmp3_;
- GstPipeline* _tmp4_;
- GstPipeline* _tmp7_;
- GstElement* _tmp8_;
- RygelGstSink* _tmp9_;
- GstElement* _tmp10_;
- guint16 _tmp11_;
- GstPipeline* _tmp27_;
- GstBus* _tmp28_ = NULL;
- GstBus* bus;
- GstBus* _tmp29_;
- guint _tmp30_ = 0U;
- GError * _inner_error_ = NULL;
g_return_if_fail (self != NULL);
- g_return_if_fail (name != NULL);
g_return_if_fail (src != NULL);
- _tmp0_ = self->priv->seek;
- _tmp1_ = rygel_gst_sink_new ((RygelDataSource*) self, _tmp0_);
- gst_object_ref_sink (_tmp1_);
- _gst_object_unref0 (self->priv->sink);
- self->priv->sink = _tmp1_;
- _tmp2_ = name;
- _tmp3_ = (GstPipeline*) gst_pipeline_new (_tmp2_);
- gst_object_ref_sink (_tmp3_);
- _gst_object_unref0 (self->priv->pipeline);
- self->priv->pipeline = _tmp3_;
- _tmp4_ = self->priv->pipeline;
- if (_tmp4_ == NULL) {
- const gchar* _tmp5_ = NULL;
- GError* _tmp6_;
- _tmp5_ = _ ("Failed to create pipeline");
- _tmp6_ = g_error_new_literal (RYGEL_DATA_SOURCE_ERROR, RYGEL_DATA_SOURCE_ERROR_GENERAL, _tmp5_);
- _inner_error_ = _tmp6_;
- g_propagate_error (error, _inner_error_);
- return;
- }
- _tmp7_ = self->priv->pipeline;
- _tmp8_ = src;
- _tmp9_ = self->priv->sink;
- gst_bin_add_many ((GstBin*) _tmp7_, _tmp8_, (GstElement*) _tmp9_, NULL);
- _tmp10_ = src;
- _tmp11_ = _tmp10_->numsrcpads;
- if (((gint) _tmp11_) == 0) {
- GstElement* _tmp12_;
- _tmp12_ = src;
- g_signal_connect_object (_tmp12_, "pad-added", (GCallback) _rygel_gst_data_source_src_pad_added_gst_element_pad_added, self, 0);
- } else {
- GstElement* _tmp13_;
- RygelGstSink* _tmp14_;
- gboolean _tmp15_ = FALSE;
- _tmp13_ = src;
- _tmp14_ = self->priv->sink;
- _tmp15_ = gst_element_link (_tmp13_, (GstElement*) _tmp14_);
- if (!_tmp15_) {
- const gchar* _tmp16_ = NULL;
- GstElement* _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
- gchar* _tmp20_;
- RygelGstSink* _tmp21_;
- gchar* _tmp22_;
- gchar* _tmp23_;
- gchar* _tmp24_;
- GError* _tmp25_;
- GError* _tmp26_;
- _tmp16_ = _ ("Failed to link %s to %s");
- _tmp17_ = src;
- _tmp18_ = gst_object_get_name ((GstObject*) _tmp17_);
- _tmp19_ = _tmp18_;
- _tmp20_ = _tmp19_;
- _tmp21_ = self->priv->sink;
- _tmp22_ = gst_object_get_name ((GstObject*) _tmp21_);
- _tmp23_ = _tmp22_;
- _tmp24_ = _tmp23_;
- _tmp25_ = g_error_new (RYGEL_GST_ERROR, RYGEL_GST_ERROR_LINK, _tmp16_, _tmp20_, _tmp24_);
- _tmp26_ = _tmp25_;
- _g_free0 (_tmp24_);
- _g_free0 (_tmp20_);
- _inner_error_ = _tmp26_;
- g_propagate_error (error, _inner_error_);
- return;
- }
- }
- _tmp27_ = self->priv->pipeline;
- _tmp28_ = gst_pipeline_get_bus (_tmp27_);
- bus = _tmp28_;
- _tmp29_ = bus;
- _tmp30_ = gst_bus_add_watch_full (_tmp29_, G_PRIORITY_DEFAULT, _rygel_gst_data_source_bus_handler_gst_bus_func, g_object_ref (self), g_object_unref);
- self->priv->bus_watch_id = _tmp30_;
- _gst_object_unref0 (bus);
-}
+ g_return_if_fail (src_pad != NULL);
+ self = RYGEL_DATA_SOURCE (user_data);
+ GstCaps* caps = gst_pad_get_caps_reffed (src_pad);
-static void rygel_gst_data_source_src_pad_added (RygelGstDataSource* self, GstElement* src, GstPad* src_pad) {
- GstPad* _tmp0_;
- GstCaps* _tmp1_ = NULL;
- GstCaps* caps;
- GstPipeline* _tmp2_;
- GstElement* _tmp3_ = NULL;
- GstElement* sink;
+ GstElement* sink = gst_bin_get_by_name (self->priv->pipeline, RYGEL_GST_SINK_NAME);
GstPad* sink_pad = NULL;
- GstCaps* _tmp4_;
- GstElement* _tmp5_ = NULL;
- GstElement* depay;
- GstElement* _tmp6_;
- GstPad* _tmp29_;
- GstPad* _tmp30_;
- GstPadLinkReturn _tmp31_ = 0;
- GstElement* _tmp41_;
- g_return_if_fail (self != NULL);
- g_return_if_fail (src != NULL);
- g_return_if_fail (src_pad != NULL);
- _tmp0_ = src_pad;
- _tmp1_ = gst_pad_get_caps_reffed (_tmp0_);
- caps = _tmp1_;
- _tmp2_ = self->priv->pipeline;
- _tmp3_ = gst_bin_get_by_name ((GstBin*) _tmp2_, RYGEL_GST_SINK_NAME);
- sink = _tmp3_;
- _tmp4_ = caps;
- _tmp5_ = rygel_gst_utils_get_rtp_depayloader (_tmp4_);
- depay = _tmp5_;
- _tmp6_ = depay;
- if (_tmp6_ != NULL) {
- GstPipeline* _tmp7_;
- GstElement* _tmp8_;
- GstElement* _tmp9_;
- GstElement* _tmp10_;
- gboolean _tmp11_ = FALSE;
- GstElement* _tmp21_;
- GstPad* _tmp22_;
- GstCaps* _tmp23_;
- GstPad* _tmp24_ = NULL;
- _tmp7_ = self->priv->pipeline;
- _tmp8_ = depay;
- gst_bin_add ((GstBin*) _tmp7_, _tmp8_);
- _tmp9_ = depay;
- _tmp10_ = sink;
- _tmp11_ = gst_element_link (_tmp9_, _tmp10_);
- if (!_tmp11_) {
- const gchar* _tmp12_ = NULL;
- GstElement* _tmp13_;
- gchar* _tmp14_;
- gchar* _tmp15_;
- gchar* _tmp16_;
- GstElement* _tmp17_;
- gchar* _tmp18_;
- gchar* _tmp19_;
- gchar* _tmp20_;
- _tmp12_ = _ ("Failed to link %s to %s");
- _tmp13_ = depay;
- _tmp14_ = gst_object_get_name ((GstObject*) _tmp13_);
- _tmp15_ = _tmp14_;
- _tmp16_ = _tmp15_;
- _tmp17_ = sink;
- _tmp18_ = gst_object_get_name ((GstObject*) _tmp17_);
- _tmp19_ = _tmp18_;
- _tmp20_ = _tmp19_;
- g_critical (_tmp12_, _tmp16_, _tmp20_);
- _g_free0 (_tmp20_);
- _g_free0 (_tmp16_);
- g_signal_emit_by_name ((RygelDataSource*) self, "done");
- _gst_object_unref0 (depay);
- _gst_object_unref0 (sink_pad);
- _gst_object_unref0 (sink);
- _gst_caps_unref0 (caps);
- return;
+
+ GstElement* depay = rygel_gst_utils_get_rtp_depayloader (caps);
+ if (depay) {
+ gst_bin_add (self->priv->pipeline, depay);
+
+ if (!gst_element_link (depay, sink)) {
+ gchar *depay_name = gst_object_get_name (GST_OBJECT (depay));
+ gchar *sink_name = gst_object_get_name (GST_OBJECT (sink));
+ g_critical (_("Failed to link %s to %s"),
+ depay_name,
+ sink_name);
+ g_free (depay_name);
+ g_free (sink_name);
+
+ g_signal_emit_by_name (self, "done");
+ gst_object_unref (depay);
+ gst_object_unref (sink_pad);
+ gst_object_unref (sink);
+ gst_caps_unref (caps);
+
+ return;
}
- _tmp21_ = depay;
- _tmp22_ = src_pad;
- _tmp23_ = caps;
- _tmp24_ = gst_element_get_compatible_pad (_tmp21_, _tmp22_, _tmp23_);
- _gst_object_unref0 (sink_pad);
- sink_pad = _tmp24_;
+
+ sink_pad = gst_element_get_compatible_pad (depay, src_pad, caps);
} else {
- GstElement* _tmp25_;
- GstPad* _tmp26_;
- GstCaps* _tmp27_;
- GstPad* _tmp28_ = NULL;
- _tmp25_ = sink;
- _tmp26_ = src_pad;
- _tmp27_ = caps;
- _tmp28_ = gst_element_get_compatible_pad (_tmp25_, _tmp26_, _tmp27_);
- _gst_object_unref0 (sink_pad);
- sink_pad = _tmp28_;
- }
- _tmp29_ = src_pad;
- _tmp30_ = sink_pad;
- _tmp31_ = gst_pad_link (_tmp29_, _tmp30_);
- if (_tmp31_ != GST_PAD_LINK_OK) {
- const gchar* _tmp32_ = NULL;
- GstPad* _tmp33_;
- gchar* _tmp34_;
- gchar* _tmp35_;
- gchar* _tmp36_;
- GstPad* _tmp37_;
- gchar* _tmp38_;
- gchar* _tmp39_;
- gchar* _tmp40_;
- _tmp32_ = _ ("Failed to link pad %s to %s");
- _tmp33_ = src_pad;
- _tmp34_ = gst_object_get_name ((GstObject*) _tmp33_);
- _tmp35_ = _tmp34_;
- _tmp36_ = _tmp35_;
- _tmp37_ = sink_pad;
- _tmp38_ = gst_object_get_name ((GstObject*) _tmp37_);
- _tmp39_ = _tmp38_;
- _tmp40_ = _tmp39_;
- g_critical (_tmp32_, _tmp36_, _tmp40_);
- _g_free0 (_tmp40_);
- _g_free0 (_tmp36_);
- g_signal_emit_by_name ((RygelDataSource*) self, "done");
- _gst_object_unref0 (depay);
- _gst_object_unref0 (sink_pad);
- _gst_object_unref0 (sink);
- _gst_caps_unref0 (caps);
- return;
+ sink_pad = gst_element_get_compatible_pad (sink, src_pad, caps);
}
- _tmp41_ = depay;
- if (_tmp41_ != NULL) {
- GstElement* _tmp42_;
- _tmp42_ = depay;
- gst_element_sync_state_with_parent (_tmp42_);
- }
- _gst_object_unref0 (depay);
- _gst_object_unref0 (sink_pad);
- _gst_object_unref0 (sink);
- _gst_caps_unref0 (caps);
-}
-static inline void _dynamic_set_streamable0 (GstElement* obj, gboolean value) {
- g_object_set (obj, "streamable", value, NULL);
-}
+ if (gst_pad_link (src_pad, sink_pad) != GST_PAD_LINK_OK) {
+ gchar *src_pad_name = gst_object_get_name (GST_OBJECT (src_pad));
+ gchar *sink_pad_name = gst_object_get_name (GST_OBJECT (sink_pad));
+ g_critical (_("Failed to link pad %s to %s"),
+ src_pad_name, sink_pad_name);
+ g_free (src_pad_name);
+ g_free (sink_pad_name);
+ g_signal_emit_by_name (self, "done");
+ gst_object_unref (depay);
+ gst_object_unref (sink_pad);
+ gst_object_unref (sink);
+ gst_caps_unref (caps);
-static inline void _dynamic_set_fragment_duration1 (GstElement* obj, gint value) {
- g_object_set (obj, "fragment-duration", value, NULL);
-}
-
-
-static gboolean ___lambda3_ (RygelGstDataSource* self) {
- gboolean result = FALSE;
- g_signal_emit_by_name ((RygelDataSource*) self, "done");
- result = FALSE;
- return result;
-}
+ return;
+ }
+ if (depay) {
+ gst_element_sync_state_with_parent (depay);
+ }
-static gboolean ____lambda3__gsource_func (gpointer self) {
- gboolean result;
- result = ___lambda3_ (self);
- return result;
+ gst_object_unref (depay);
+ gst_object_unref (sink_pad);
+ gst_object_unref (sink);
+ gst_caps_unref (caps);
}
+static gboolean
+on_bus_watch (GstBus* bus, GstMessage* message, gpointer user_data) {
+ RygelGstDataSource * self = RYGEL_DATA_SOURCE (user_data);
+ gboolean ret = TRUE;
-static gboolean rygel_gst_data_source_bus_handler (RygelGstDataSource* self, GstBus* bus, GstMessage* message) {
- gboolean result = FALSE;
- gboolean ret;
- GstMessage* _tmp0_;
- GstMessageType _tmp1_;
- gboolean _tmp53_;
- g_return_val_if_fail (self != NULL, FALSE);
- g_return_val_if_fail (bus != NULL, FALSE);
- g_return_val_if_fail (message != NULL, FALSE);
- ret = TRUE;
- _tmp0_ = message;
- _tmp1_ = _tmp0_->type;
- if (_tmp1_ == GST_MESSAGE_EOS) {
+ if (message->type == GST_MESSAGE_EOS) {
ret = FALSE;
- } else {
- GstMessage* _tmp2_;
- GstMessageType _tmp3_;
- _tmp2_ = message;
- _tmp3_ = _tmp2_->type;
- if (_tmp3_ == GST_MESSAGE_STATE_CHANGED) {
- GstMessage* _tmp4_;
- GstObject* _tmp5_;
- GstPipeline* _tmp6_;
- GstState old_state = 0;
- GstState new_state = 0;
- GstMessage* _tmp7_;
- GstState _tmp8_ = 0;
- GstState _tmp9_ = 0;
- gboolean _tmp10_ = FALSE;
- GstState _tmp11_;
- gboolean _tmp13_;
- RygelHTTPSeek* _tmp24_;
- _tmp4_ = message;
- _tmp5_ = _tmp4_->src;
- _tmp6_ = self->priv->pipeline;
- if (_tmp5_ != G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GST_TYPE_OBJECT, GstObject)) {
- result = TRUE;
- return result;
- }
- _tmp7_ = message;
- gst_message_parse_state_changed (_tmp7_, &_tmp8_, &_tmp9_, NULL);
- old_state = _tmp8_;
- new_state = _tmp9_;
- _tmp11_ = old_state;
- if (_tmp11_ == GST_STATE_NULL) {
- GstState _tmp12_;
- _tmp12_ = new_state;
- _tmp10_ = _tmp12_ == GST_STATE_READY;
- } else {
- _tmp10_ = FALSE;
- }
- _tmp13_ = _tmp10_;
- if (_tmp13_) {
- GstPipeline* _tmp14_;
- GstElement* _tmp15_ = NULL;
- GstElement* element;
- GstElement* _tmp16_;
- _tmp14_ = self->priv->pipeline;
- _tmp15_ = gst_bin_get_by_name ((GstBin*) _tmp14_, "muxer");
- element = _tmp15_;
- _tmp16_ = element;
- if (_tmp16_ != NULL) {
- GstElement* _tmp17_;
- GstElementFactory* _tmp18_ = NULL;
- const gchar* _tmp19_ = NULL;
- gchar* _tmp20_;
- gchar* name;
- const gchar* _tmp21_;
- _tmp17_ = element;
- _tmp18_ = gst_element_get_factory (_tmp17_);
- _tmp19_ = gst_plugin_feature_get_name ((GstPluginFeature*) _tmp18_);
- _tmp20_ = g_strdup (_tmp19_);
- name = _tmp20_;
- _tmp21_ = name;
- if (g_strcmp0 (_tmp21_, "mp4mux") == 0) {
- GstElement* _tmp22_;
- GstElement* _tmp23_;
- _tmp22_ = element;
- _dynamic_set_streamable0 (_tmp22_, TRUE);
- _tmp23_ = element;
- _dynamic_set_fragment_duration1 (_tmp23_, 1000);
- }
- _g_free0 (name);
- }
- _gst_object_unref0 (element);
- }
- _tmp24_ = self->priv->seek;
- if (_tmp24_ != NULL) {
- gboolean _tmp25_ = FALSE;
- GstState _tmp26_;
- gboolean _tmp28_;
- _tmp26_ = old_state;
- if (_tmp26_ == GST_STATE_READY) {
- GstState _tmp27_;
- _tmp27_ = new_state;
- _tmp25_ = _tmp27_ == GST_STATE_PAUSED;
- } else {
- _tmp25_ = FALSE;
- }
- _tmp28_ = _tmp25_;
- if (_tmp28_) {
- gboolean _tmp29_ = FALSE;
- _tmp29_ = rygel_gst_data_source_perform_seek (self);
- if (_tmp29_) {
- GstPipeline* _tmp30_;
- _tmp30_ = self->priv->pipeline;
- gst_element_set_state ((GstElement*) _tmp30_, GST_STATE_PLAYING);
+ } else if (message->type == GST_MESSAGE_STATE_CHANGED) {
+ if (message->src != self->priv->pipeline) {
+ return TRUE;
+ }
+
+ GstState old_state;
+ GstState new_state;
+ gst_message_parse_state_changed (message, &old_state, &new_state, NULL);
+
+ if (old_state == GST_STATE_NULL && new_state == GST_STATE_READY) {
+ GstElement* element = gst_bin_get_by_name (GST_BIN (self->priv->pipeline), "muxer");
+ if (element) {
+ GstElementFactory* factory = gst_element_get_factory (element);
+ if (factory) {
+ gchar* name = gst_plugin_feature_get_name (GST_PLUGIN_FEATURE (factory));
+
+ // Awesome gross hack, really.
+ if (g_strcmp0 (name, "mp4mux") == 0) {
+ g_object_set (element, "streamable", TRUE, NULL);
+ g_object_set (element, "fragment-duration", 1000, NULL);
}
+
+ g_free (name);
+ gst_object_unref (factory);
}
+
+ gst_object_unref (element);
}
- } else {
- GError* err = NULL;
- gchar* err_msg = NULL;
- GstMessage* _tmp31_;
- GstMessageType _tmp32_;
- _tmp31_ = message;
- _tmp32_ = _tmp31_->type;
- if (_tmp32_ == GST_MESSAGE_ERROR) {
- GstMessage* _tmp33_;
- GError* _tmp34_ = NULL;
- gchar* _tmp35_ = NULL;
- const gchar* _tmp36_ = NULL;
- GstPipeline* _tmp37_;
- gchar* _tmp38_;
- gchar* _tmp39_;
- gchar* _tmp40_;
- const gchar* _tmp41_;
- _tmp33_ = message;
- gst_message_parse_error (_tmp33_, &_tmp34_, &_tmp35_);
- _g_error_free0 (err);
- err = _tmp34_;
- _g_free0 (err_msg);
- err_msg = _tmp35_;
- _tmp36_ = _ ("Error from pipeline %s: %s");
- _tmp37_ = self->priv->pipeline;
- _tmp38_ = gst_object_get_name ((GstObject*) _tmp37_);
- _tmp39_ = _tmp38_;
- _tmp40_ = _tmp39_;
- _tmp41_ = err_msg;
- g_critical (_tmp36_, _tmp40_, _tmp41_);
- _g_free0 (_tmp40_);
- ret = FALSE;
- } else {
- GstMessage* _tmp42_;
- GstMessageType _tmp43_;
- _tmp42_ = message;
- _tmp43_ = _tmp42_->type;
- if (_tmp43_ == GST_MESSAGE_WARNING) {
- GstMessage* _tmp44_;
- GError* _tmp45_ = NULL;
- gchar* _tmp46_ = NULL;
- const gchar* _tmp47_ = NULL;
- GstPipeline* _tmp48_;
- gchar* _tmp49_;
- gchar* _tmp50_;
- gchar* _tmp51_;
- const gchar* _tmp52_;
- _tmp44_ = message;
- gst_message_parse_warning (_tmp44_, &_tmp45_, &_tmp46_);
- _g_error_free0 (err);
- err = _tmp45_;
- _g_free0 (err_msg);
- err_msg = _tmp46_;
- _tmp47_ = _ ("Warning from pipeline %s: %s");
- _tmp48_ = self->priv->pipeline;
- _tmp49_ = gst_object_get_name ((GstObject*) _tmp48_);
- _tmp50_ = _tmp49_;
- _tmp51_ = _tmp50_;
- _tmp52_ = err_msg;
- g_warning (_tmp47_, _tmp51_, _tmp52_);
- _g_free0 (_tmp51_);
+ }
+
+ if (self->priv->seek) {
+ if (old_state == GST_STATE_READY && new_state == GST_STATE_PAUSED) {
+ if (rygel_gst_data_source_perform_seek (self)) {
+ gst_element_set_state (GST_ELEMENT (self->priv->pipeline), GST_STATE_PLAYING);
}
}
- _g_free0 (err_msg);
- _g_error_free0 (err);
}
+
+ } else {
+
+ gchar* err_msg = NULL;
+ gst_message_parse_error (message, NULL, &err_msg);
+
+ gchar *pipeline_name = gst_object_get_name (GST_OBJECT (self->priv->pipeline));
+
+ if (message->type == GST_MESSAGE_ERROR) {
+ g_critical (_("Error from pipeline %s: %s"),
+ pipeline_name,
+ err_msg);
+
+ ret = FALSE;
+ } else if (message->type == GST_MESSAGE_WARNING) {
+ g_warning (_("Warning from pipeline %s: %s"),
+ pipeline_name,
+ err_msg);
+ }
+
+ g_free (pipeline_name);
+ g_free (err_msg);
}
- _tmp53_ = ret;
- if (!_tmp53_) {
- g_idle_add_full (G_PRIORITY_DEFAULT, ____lambda3__gsource_func, g_object_ref (self), g_object_unref);
+
+ if (!ret) {
+ g_idle_add_full (G_PRIORITY_DEFAULT, on_idle_emit_done, g_object_ref (self), g_object_unref);
}
- result = ret;
- return result;
+
+ return ret;
}
+static void
+rygel_gst_data_source_prepare_pipeline (RygelGstDataSource* self, const gchar* name, GstElement* src, GError** error) {
+ self->priv->sink = rygel_gst_sink_new (self, self->priv->seek);
+
+ self->priv->pipeline = GST_PIPLINE (gst_pipeline_new (name));
+ if(self->priv->pipeline == NULL) {
+ g_set_error (error,
+ RYGEL_DATA_SOURCE_ERROR,
+ RYGEL_DATA_SOURCE_ERROR_GENERAL,
+ _("Failed to create pipeline"));
+ }
-static gboolean rygel_gst_data_source_perform_seek (RygelGstDataSource* self) {
- gboolean result = FALSE;
- gboolean _tmp0_ = FALSE;
- RygelHTTPSeek* _tmp1_;
- gboolean _tmp8_;
- GstSeekType stop_type;
+ gst_bin_add_many (self->priv->pipeline, self->src, self->priv->sink, NULL);
+
+ if (src->numsrcpads == 0) {
+ // Seems source uses dynamic pads, so link when the pad is available
+
+ g_signal_connect_object (self->src, "pad-added", (GCallback) on_pad_added, self, 0);
+ } else {
+ // static pads? easy!
+ if (!gst_element_link (self->src, GST_ELEMENT (self->priv->sink))) {
+ gchar *src_name = gst_object_get_name (GST_OBJECT (self->src));
+ gchar *sink_name = gst_object_get_name (GST_OBJECT (self->priv->sink));
+ g_set_error (error,
+ RYGEL_GST_ERROR,
+ RYGEL_GST_ERROR_LINK,
+ "Failed to link %s to %s",
+ src_name,
+ sink_name);
+ g_free (src_name);
+ g_free (sink_name);
+
+ return;
+ }
+ }
+
+ // Bus handler
+ GstBus *bus = gst_pipeline_get_bus (self->priv->pipeline);
+ self->priv->bus_watch_id = gst_bus_add_watch_full (bus, G_PRIORITY_DEFAULT, on_bus_watch, g_object_ref (self), g_object_unref);
+ gst_object_unref (bus);
+}
+
+static gboolean
+rygel_gst_data_source_perform_seek (RygelGstDataSource* self) {
+ GstSeekType stop_type = GST_SEEK_TYPE_NONE;
GstFormat format = 0;
- GstSeekFlags flags;
+ GstSeekFlags flags = GST_SEEK_FLAG_FLUSH;
gint64 start = 0LL;
gint64 stop = 0LL;
- RygelHTTPSeek* _tmp9_;
- RygelHTTPSeekType _tmp10_;
- RygelHTTPSeekType _tmp11_;
- RygelHTTPSeek* _tmp26_;
- gint64 _tmp27_;
- gint64 _tmp28_;
- GstPipeline* _tmp29_;
- GstFormat _tmp30_;
- GstSeekFlags _tmp31_;
- gint64 _tmp32_;
- GstSeekType _tmp33_;
- gint64 _tmp34_;
- gboolean _tmp35_ = FALSE;
- g_return_val_if_fail (self != NULL, FALSE);
- _tmp1_ = self->priv->seek;
- if (_tmp1_ != NULL) {
- RygelHTTPSeek* _tmp2_;
- gint64 _tmp3_;
- gint64 _tmp4_;
- RygelHTTPSeek* _tmp5_;
- gint64 _tmp6_;
- gint64 _tmp7_;
- _tmp2_ = self->priv->seek;
- _tmp3_ = rygel_http_seek_get_length (_tmp2_);
- _tmp4_ = _tmp3_;
- _tmp5_ = self->priv->seek;
- _tmp6_ = rygel_http_seek_get_total_length (_tmp5_);
- _tmp7_ = _tmp6_;
- _tmp0_ = _tmp4_ >= _tmp7_;
- } else {
- _tmp0_ = FALSE;
- }
- _tmp8_ = _tmp0_;
- if (_tmp8_) {
- result = TRUE;
- return result;
+
+ if (self->priv->seek &&
+ rygel_http_seek_get_length (self->priv->seek) >= rygel_http_seek_get_total_length (self->priv->seek)) {
+ return TRUE;
}
- stop_type = GST_SEEK_TYPE_NONE;
- flags = GST_SEEK_FLAG_FLUSH;
- _tmp9_ = self->priv->seek;
- _tmp10_ = rygel_http_seek_get_seek_type (_tmp9_);
- _tmp11_ = _tmp10_;
- if (_tmp11_ == RYGEL_HTTP_SEEK_TYPE_TIME) {
- GstSeekFlags _tmp12_;
- RygelHTTPSeek* _tmp13_;
- gint64 _tmp14_;
- gint64 _tmp15_;
- RygelHTTPSeek* _tmp16_;
- gint64 _tmp17_;
- gint64 _tmp18_;
+
+ if (rygel_http_seek_get_seek_type (self->priv->seek) == RYGEL_HTTP_SEEK_TYPE_TIME) {
format = GST_FORMAT_TIME;
- _tmp12_ = flags;
- flags = _tmp12_ | GST_SEEK_FLAG_KEY_UNIT;
- _tmp13_ = self->priv->seek;
- _tmp14_ = rygel_http_seek_get_start (_tmp13_);
- _tmp15_ = _tmp14_;
- start = _tmp15_ * GST_USECOND;
- _tmp16_ = self->priv->seek;
- _tmp17_ = rygel_http_seek_get_stop (_tmp16_);
- _tmp18_ = _tmp17_;
- stop = _tmp18_ * GST_USECOND;
+ flags |= GST_SEEK_FLAG_KEY_UNIT;
+ start = rygel_http_seek_get_start (self->priv->seek) * GST_USECOND;
+ stop = rygel_http_seek_get_stop (self->priv->seek) * GST_USECOND;
} else {
- GstSeekFlags _tmp19_;
- RygelHTTPSeek* _tmp20_;
- gint64 _tmp21_;
- gint64 _tmp22_;
- RygelHTTPSeek* _tmp23_;
- gint64 _tmp24_;
- gint64 _tmp25_;
format = GST_FORMAT_BYTES;
- _tmp19_ = flags;
- flags = _tmp19_ | GST_SEEK_FLAG_ACCURATE;
- _tmp20_ = self->priv->seek;
- _tmp21_ = rygel_http_seek_get_start (_tmp20_);
- _tmp22_ = _tmp21_;
- start = _tmp22_;
- _tmp23_ = self->priv->seek;
- _tmp24_ = rygel_http_seek_get_stop (_tmp23_);
- _tmp25_ = _tmp24_;
- stop = _tmp25_;
+ flags |= GST_SEEK_FLAG_ACCURATE;
+ start = rygel_http_seek_get_start (self->priv->seek);
+ stop = rygel_http_seek_get_stop (self->priv->seek);
}
- _tmp26_ = self->priv->seek;
- _tmp27_ = rygel_http_seek_get_stop (_tmp26_);
- _tmp28_ = _tmp27_;
- if (_tmp28_ > ((gint64) 0)) {
+
+ if (rygel_http_seek_get_stop (self->priv->seek) > ((gint64) 0)) {
stop_type = GST_SEEK_TYPE_SET;
}
- _tmp29_ = self->priv->pipeline;
- _tmp30_ = format;
- _tmp31_ = flags;
- _tmp32_ = start;
- _tmp33_ = stop_type;
- _tmp34_ = stop;
- _tmp35_ = gst_element_seek ((GstElement*) _tmp29_, 1.0, _tmp30_, _tmp31_, GST_SEEK_TYPE_SET, _tmp32_, _tmp33_, _tmp34_ + 1);
- if (!_tmp35_) {
- const gchar* _tmp36_ = NULL;
- RygelHTTPSeek* _tmp37_;
- gint64 _tmp38_;
- gint64 _tmp39_;
- RygelHTTPSeek* _tmp40_;
- gint64 _tmp41_;
- gint64 _tmp42_;
- const gchar* _tmp43_ = NULL;
- GError* _tmp44_;
- GError* _tmp45_;
- _tmp36_ = _ ("Failed to seek to offsets %lld:%lld");
- _tmp37_ = self->priv->seek;
- _tmp38_ = rygel_http_seek_get_start (_tmp37_);
- _tmp39_ = _tmp38_;
- _tmp40_ = self->priv->seek;
- _tmp41_ = rygel_http_seek_get_stop (_tmp40_);
- _tmp42_ = _tmp41_;
- g_warning (_tmp36_, _tmp39_, _tmp42_);
- _tmp43_ = _ ("Failed to seek");
- _tmp44_ = g_error_new_literal (RYGEL_DATA_SOURCE_ERROR, RYGEL_DATA_SOURCE_ERROR_SEEK_FAILED, _tmp43_);
- _tmp45_ = _tmp44_;
- g_signal_emit_by_name ((RygelDataSource*) self, "error", _tmp45_);
- _g_error_free0 (_tmp45_);
- result = FALSE;
- return result;
+
+ if(gst_element_seek (GST_ELEMENT (self->priv->pipeline),
+ 1.0, format, flags, GST_SEEK_TYPE_SET,
+ start, stop_type, stop + 1)) {
+ GError *error;
+ g_warning(_("Failed to seek to offsets %lld:%lld"),
+ rygel_http_seek_get_start (self->priv->seek),
+ rygel_http_seek_get_stop (self->priv->seek));
+
+ error = g_error_new_literal (RYGEL_DATA_SOURCE_ERROR,
+ RYGEL_DATA_SOURCE_ERROR_SEEK_FAILED,
+ _("Failed to seek"));
+ g_signal_emit_by_name (self, "error", error);
+ g_error_free (error);
+
+ return FALSE;
}
- result = TRUE;
- return result;
-}
+ return TRUE;
+}
-static void rygel_gst_data_source_class_init (RygelGstDataSourceClass * klass) {
+static void
+rygel_gst_data_source_class_init (RygelGstDataSourceClass * klass) {
rygel_gst_data_source_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (RygelGstDataSourcePrivate));
G_OBJECT_CLASS (klass)->finalize = rygel_gst_data_source_finalize;
}
-
-static void rygel_gst_data_source_rygel_data_source_interface_init (RygelDataSourceIface * iface) {
+static void
+rygel_gst_data_source_rygel_data_source_interface_init (RygelDataSourceIface * iface) {
rygel_gst_data_source_rygel_data_source_parent_iface = g_type_interface_peek_parent (iface);
iface->start = (void (*)(RygelDataSource*, RygelHTTPSeek*, GError**)) rygel_gst_data_source_real_start;
iface->freeze = (void (*)(RygelDataSource*)) rygel_gst_data_source_real_freeze;
@@ -845,36 +415,29 @@ static void rygel_gst_data_source_rygel_data_source_interface_init (RygelDataSou
iface->stop = (void (*)(RygelDataSource*)) rygel_gst_data_source_real_stop;
}
-
-static void rygel_gst_data_source_init (RygelGstDataSource * self) {
+static void
+rygel_gst_data_source_init (RygelGstDataSource * self) {
self->priv = RYGEL_GST_DATA_SOURCE_GET_PRIVATE (self);
self->priv->seek = NULL;
}
-
-static void rygel_gst_data_source_finalize (GObject* obj) {
- RygelGstDataSource * self;
- RygelGstSink* _tmp0_;
- GstPipeline* _tmp3_;
- self = RYGEL_GST_DATA_SOURCE (obj);
- _tmp0_ = self->priv->sink;
- if (_tmp0_ != NULL) {
- RygelGstSink* _tmp1_;
- GCancellable* _tmp2_;
- _tmp1_ = self->priv->sink;
- _tmp2_ = _tmp1_->cancellable;
- g_cancellable_cancel (_tmp2_);
+static void
+rygel_gst_data_source_finalize (GObject* obj) {
+ RygelGstDataSource * self = RYGEL_DATA_SOURCE (obj);
+
+ if (self->priv->sink) {
+ g_cancellable_cancel (self->priv->sink->cancellable);
}
- _tmp3_ = self->priv->pipeline;
- if (_tmp3_ != NULL) {
- GstPipeline* _tmp4_;
- _tmp4_ = self->priv->pipeline;
- gst_element_set_state ((GstElement*) _tmp4_, GST_STATE_NULL);
+
+ if (self->priv->pipeline) {
+ gst_element_set_state (GST_ELEMENT ( self->priv->pipeline), GST_STATE_NULL);
}
- _gst_object_unref0 (self->src);
- _gst_object_unref0 (self->priv->pipeline);
- _g_object_unref0 (self->priv->seek);
- _gst_object_unref0 (self->priv->sink);
+
+ gst_object_unref (self->src);
+ gst_object_unref (self->priv->pipeline);
+ g_object_unref (self->priv->seek);
+ gst_object_unref (self->priv->sink);
+
G_OBJECT_CLASS (rygel_gst_data_source_parent_class)->finalize (obj);
}
diff --git a/src/rygel-gst-utils.c b/src/rygel-gst-utils.c
index 646e2ae..3965b9f 100644
--- a/src/rygel-gst-utils.c
+++ b/src/rygel-gst-utils.c
@@ -196,14 +196,14 @@ void rygel_gst_utils_dump_encoding_profile (GstEncodingProfile* profile, gint in
_g_free0 (_tmp18_);
}
_tmp23_ = profile;
- if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, GST_TYPE_ENCODING_CONTAINER_PROFILE)) {
+ if (GST_IS_ENCODING_CONTAINER_PROFILE (_tmp23_)) {
GstEncodingProfile* _tmp24_;
GstEncodingContainerProfile* _tmp25_;
GstEncodingContainerProfile* container;
GstEncodingContainerProfile* _tmp26_;
GList* _tmp27_ = NULL;
_tmp24_ = profile;
- _tmp25_ = _gst_encoding_profile_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, GST_TYPE_ENCODING_CONTAINER_PROFILE) ? ((GstEncodingContainerProfile*) _tmp24_) : NULL);
+ _tmp25_ = _gst_encoding_profile_ref0 (GST_IS_ENCODING_CONTAINER_PROFILE (_tmp24_) ? ((GstEncodingContainerProfile*) _tmp24_) : NULL);
container = _tmp25_;
_tmp26_ = container;
_tmp27_ = gst_encoding_container_profile_get_profiles (_tmp26_);
diff --git a/src/rygel-l16-transcoder.c b/src/rygel-l16-transcoder.c
index 3bd4c34..5f8a1e1 100644
--- a/src/rygel-l16-transcoder.c
+++ b/src/rygel-l16-transcoder.c
@@ -259,12 +259,12 @@ rygel_l16_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* i
self = (RygelL16Transcoder*) base;
g_return_val_if_fail (item != NULL, 0U);
_tmp1_ = item;
- if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, RYGEL_TYPE_AUDIO_ITEM)) {
+ if (!RYGEL_IS_AUDIO_ITEM (_tmp1_)) {
_tmp0_ = TRUE;
} else {
RygelMediaItem* _tmp2_;
_tmp2_ = item;
- _tmp0_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, RYGEL_TYPE_VIDEO_ITEM);
+ _tmp0_ = RYGEL_IS_VIDEO_ITEM (_tmp2_);
}
_tmp3_ = _tmp0_;
if (_tmp3_) {
@@ -274,7 +274,7 @@ rygel_l16_transcoder_real_get_distance (RygelTranscoder* base, RygelMediaItem* i
return result;
}
_tmp5_ = item;
- _tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, RYGEL_TYPE_AUDIO_ITEM) ? ((RygelAudioItem*) _tmp5_) : NULL);
+ _tmp6_ = _g_object_ref0 (RYGEL_IS_AUDIO_ITEM (_tmp5_) ? ((RygelAudioItem*) _tmp5_) : NULL);
audio_item = _tmp6_;
_tmp7_ = 0;
distance = _tmp7_;
diff --git a/src/rygel-mp2ts-transcoder.c b/src/rygel-mp2ts-transcoder.c
index 292a5cc..daf84d6 100644
--- a/src/rygel-mp2ts-transcoder.c
+++ b/src/rygel-mp2ts-transcoder.c
@@ -171,14 +171,14 @@ static guint rygel_mp2_ts_transcoder_real_get_distance (RygelTranscoder* base, R
self = (RygelMP2TSTranscoder*) base;
g_return_val_if_fail (item != NULL, 0U);
_tmp0_ = item;
- if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, RYGEL_TYPE_VIDEO_ITEM)) {
+ if (!RYGEL_IS_VIDEO_ITEM (_tmp0_)) {
guint _tmp1_;
_tmp1_ = G_MAXUINT;
result = _tmp1_;
return result;
}
_tmp2_ = item;
- _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, RYGEL_TYPE_VIDEO_ITEM) ? ((RygelVideoItem*) _tmp2_) : NULL);
+ _tmp3_ = _g_object_ref0 (RYGEL_IS_VIDEO_ITEM (_tmp2_) ? ((RygelVideoItem*) _tmp2_) : NULL);
video_item = _tmp3_;
_tmp4_ = item;
_tmp5_ = RYGEL_TRANSCODER_CLASS (rygel_mp2_ts_transcoder_parent_class)->get_distance ((RygelTranscoder*) G_TYPE_CHECK_INSTANCE_CAST (self, RYGEL_TYPE_VIDEO_TRANSCODER, RygelVideoTranscoder), _tmp4_);
diff --git a/src/rygel-video-transcoder.c b/src/rygel-video-transcoder.c
index 97d3c70..2e175a1 100644
--- a/src/rygel-video-transcoder.c
+++ b/src/rygel-video-transcoder.c
@@ -130,7 +130,7 @@ static GUPnPDIDLLiteResource* rygel_video_transcoder_real_add_resource (RygelTra
return result;
}
_tmp4_ = item;
- _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, RYGEL_TYPE_VIDEO_ITEM) ? ((RygelVideoItem*) _tmp4_) : NULL);
+ _tmp5_ = _g_object_ref0 (RYGEL_IS_VIDEO_ITEM (_tmp4_) ? ((RygelVideoItem*) _tmp4_) : NULL);
video_item = _tmp5_;
_tmp6_ = video_item;
_tmp7_ = rygel_visual_item_get_width ((RygelVisualItem*) _tmp6_);
@@ -164,14 +164,14 @@ static guint rygel_video_transcoder_real_get_distance (RygelTranscoder* base, Ry
self = (RygelVideoTranscoder*) base;
g_return_val_if_fail (item != NULL, 0U);
_tmp0_ = item;
- if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, RYGEL_TYPE_VIDEO_ITEM)) {
+ if (!RYGEL_IS_VIDEO_ITEM (_tmp0_)) {
guint _tmp1_;
_tmp1_ = G_MAXUINT;
result = _tmp1_;
return result;
}
_tmp2_ = item;
- _tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, RYGEL_TYPE_VIDEO_ITEM) ? ((RygelVideoItem*) _tmp2_) : NULL);
+ _tmp3_ = _g_object_ref0 (RYGEL_IS_VIDEO_ITEM (_tmp2_) ? ((RygelVideoItem*) _tmp2_) : NULL);
video_item = _tmp3_;
_tmp4_ = 0;
distance = _tmp4_;
@@ -218,7 +218,7 @@ static GstEncodingProfile* rygel_video_transcoder_real_get_encoding_profile (Ryg
GstEncodingProfile* _tmp6_;
self = (RygelVideoTranscoder*) base;
_tmp0_ = RYGEL_GST_TRANSCODER_CLASS (rygel_video_transcoder_parent_class)->get_encoding_profile ((RygelGstTranscoder*) G_TYPE_CHECK_INSTANCE_CAST (self, RYGEL_TYPE_AUDIO_TRANSCODER, RygelAudioTranscoder));
- enc_container_profile = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, GST_TYPE_ENCODING_CONTAINER_PROFILE) ? ((GstEncodingContainerProfile*) _tmp0_) : NULL;
+ enc_container_profile = GST_IS_ENCODING_CONTAINER_PROFILE (_tmp0_) ? ((GstEncodingContainerProfile*) _tmp0_) : NULL;
_tmp1_ = self->priv->video_codec_format;
_tmp2_ = rygel_gst_transcoder_get_preset ((RygelGstTranscoder*) self);
_tmp3_ = _tmp2_;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
