projects / platform / upstream / gstreamer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Revert again, this time without post-commit reindent hooks to put back the indentatio...
[platform/upstream/gstreamer.git] / gst / gstscheduler.h
diff --git a/gst/gstscheduler.h b/gst/gstscheduler.h
index 8413767..9233c52 100644 (file)
--- a/gst/gstscheduler.h
+++ b/gst/gstscheduler.h
@@ -28,28 +28,21 @@
 #include <gst/gstelement.h>
 #include <gst/gstbin.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define GST_TYPE_SCHEDULER \
-  (gst_scheduler_get_type())
-#define GST_SCHEDULER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SCHEDULER,GstScheduler))
-#define GST_SCHEDULER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SCHEDULER,GstSchedulerClass))
-#define GST_IS_SCHEDULER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SCHEDULER))
-#define GST_IS_SCHEDULER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SCHEDULER))
+G_BEGIN_DECLS
+
+#define GST_TYPE_SCHEDULER             (gst_scheduler_get_type ())
+#define GST_SCHEDULER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SCHEDULER, GstScheduler))
+#define GST_IS_SCHEDULER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SCHEDULER))
+#define GST_SCHEDULER_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SCHEDULER,GstSchedulerClass))
+#define GST_IS_SCHEDULER_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SCHEDULER))
+#define GST_SCHEDULER_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_SCHEDULER, GstSchedulerClass))
 
 typedef enum {
   /* this scheduler works with a fixed clock */
   GST_SCHEDULER_FLAG_FIXED_CLOCK       = GST_OBJECT_FLAG_LAST,
 
   /* padding */
-  GST_SCHEDULER_FLAG_LAST              = GST_OBJECT_FLAG_LAST + 4,
+  GST_SCHEDULER_FLAG_LAST              = GST_OBJECT_FLAG_LAST + 4
 } GstSchedulerFlags;
 
 #define GST_SCHEDULER_PARENT(sched)            ((sched)->parent)
@@ -61,7 +54,7 @@ typedef enum {
   GST_SCHEDULER_STATE_NONE,
   GST_SCHEDULER_STATE_RUNNING,
   GST_SCHEDULER_STATE_STOPPED,
-  GST_SCHEDULER_STATE_ERROR,
+  GST_SCHEDULER_STATE_ERROR
 } GstSchedulerState;
 
 struct _GstScheduler {
@@ -78,6 +71,8 @@ struct _GstScheduler {
   GList                        *clock_receivers;
 
   GList                        *schedulers;
+
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstSchedulerClass {
@@ -85,53 +80,55 @@ struct _GstSchedulerClass {
 
   /* virtual methods */
   void                         (*setup)                (GstScheduler *sched);
-  gboolean             (*get_prefered_stack)   (GstScheduler *sched, gpointer *stack, gulong *size);
   void                         (*reset)                (GstScheduler *sched);
   void                         (*add_element)          (GstScheduler *sched, GstElement *element);
   void                         (*remove_element)       (GstScheduler *sched, GstElement *element);
   void                         (*add_scheduler)        (GstScheduler *sched, GstScheduler *sched2);
   void                         (*remove_scheduler)     (GstScheduler *sched, GstScheduler *sched2);
   GstElementStateReturn (*state_transition)    (GstScheduler *sched, GstElement *element, gint transition);
+  void                 (*scheduling_change)    (GstScheduler *sched, GstElement *element);
   void                         (*lock_element)         (GstScheduler *sched, GstElement *element);
   void                         (*unlock_element)       (GstScheduler *sched, GstElement *element);
-  void                         (*yield)                (GstScheduler *sched, GstElement *element);
+  gboolean             (*yield)                (GstScheduler *sched, GstElement *element);
   gboolean             (*interrupt)            (GstScheduler *sched, GstElement *element);
   void                         (*error)                (GstScheduler *sched, GstElement *element);
-  void                         (*pad_connect)          (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
-  void                         (*pad_disconnect)       (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
+  void                         (*pad_link)             (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
+  void                         (*pad_unlink)           (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
   void                         (*pad_select)           (GstScheduler *sched, GList *padlist);
   GstClockReturn       (*clock_wait)           (GstScheduler *sched, GstElement *element,
-                                                GstClock *clock, GstClockTime time, GstClockTimeDiff *jitter);
+                                                GstClockID id, GstClockTimeDiff *jitter);
   GstSchedulerState    (*iterate)              (GstScheduler *sched);
   /* for debugging */
   void                         (*show)                 (GstScheduler *sched);
 
-  /* signals go here */
+  /* signals */
+  void                  (*object_sync)          (GstScheduler *sched, GstClock *clock, GstObject *object,
+                                                GstClockID id);
+
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType                  gst_scheduler_get_type          (void);
 
-#define                gst_scheduler_destroy(sched)    gst_object_destroy(GST_OBJECT(sched))
-
 
 void                   gst_scheduler_setup             (GstScheduler *sched);
-gboolean               gst_scheduler_get_prefered_stack(GstScheduler *sched, gpointer *stack, gulong *size);
 void                   gst_scheduler_reset             (GstScheduler *sched);
 void                   gst_scheduler_add_element       (GstScheduler *sched, GstElement *element);
 void                   gst_scheduler_remove_element    (GstScheduler *sched, GstElement *element);
 void                   gst_scheduler_add_scheduler     (GstScheduler *sched, GstScheduler *sched2);
 void                   gst_scheduler_remove_scheduler  (GstScheduler *sched, GstScheduler *sched2);
 GstElementStateReturn  gst_scheduler_state_transition  (GstScheduler *sched, GstElement *element, gint transition);
+void                   gst_scheduler_scheduling_change (GstScheduler *sched, GstElement *element);
 void                   gst_scheduler_lock_element      (GstScheduler *sched, GstElement *element);
 void                   gst_scheduler_unlock_element    (GstScheduler *sched, GstElement *element);
-void                   gst_scheduler_yield             (GstScheduler *sched, GstElement *element);
+gboolean               gst_scheduler_yield             (GstScheduler *sched, GstElement *element);
 gboolean               gst_scheduler_interrupt         (GstScheduler *sched, GstElement *element);
 void                   gst_scheduler_error             (GstScheduler *sched, GstElement *element);
-void                   gst_scheduler_pad_connect       (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
-void                   gst_scheduler_pad_disconnect    (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
+void                   gst_scheduler_pad_link          (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
+void                   gst_scheduler_pad_unlink        (GstScheduler *sched, GstPad *srcpad, GstPad *sinkpad);
 GstPad*                 gst_scheduler_pad_select       (GstScheduler *sched, GList *padlist);
 GstClockReturn         gst_scheduler_clock_wait        (GstScheduler *sched, GstElement *element,
-                                                        GstClock *clock, GstClockTime time, GstClockTimeDiff *jitter);
+                                                        GstClockID id, GstClockTimeDiff *jitter);
 gboolean               gst_scheduler_iterate           (GstScheduler *sched);
 
 void                   gst_scheduler_use_clock         (GstScheduler *sched, GstClock *clock);
@@ -145,16 +142,15 @@ void                      gst_scheduler_show              (GstScheduler *sched);
  * creating schedulers
  *
  */
-#define GST_TYPE_SCHEDULER_FACTORY \
-  (gst_scheduler_factory_get_type ())
-#define GST_SCHEDULER_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SCHEDULER_FACTORY, GstSchedulerFactory))
-#define GST_SCHEDULER_FACTORY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SCHEDULER_FACTORY, GstSchedulerFactoryClass))
-#define GST_IS_SCHEDULER_FACTORY(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SCHEDULER_FACTORY))
-#define GST_IS_SCHEDULER_FACTORY_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SCHEDULER_FACTORY))
+#define GST_TYPE_SCHEDULER_FACTORY             (gst_scheduler_factory_get_type ())
+#define GST_SCHEDULER_FACTORY(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SCHEDULER_FACTORY, GstSchedulerFactory))
+#define GST_IS_SCHEDULER_FACTORY(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SCHEDULER_FACTORY))
+#define GST_SCHEDULER_FACTORY_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_SCHEDULER_FACTORY, GstSchedulerFactoryClass))
+#define GST_IS_SCHEDULER_FACTORY_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SCHEDULER_FACTORY))
+#define GST_SCHEDULER_FACTORY_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_SCHEDULER_FACTORY, GstSchedulerFactoryClass))
+
+/* change this to change the default scheduler */
+#define GST_SCHEDULER_DEFAULT_NAME     "opt"
 
 typedef struct _GstSchedulerFactory GstSchedulerFactory;
 typedef struct _GstSchedulerFactoryClass GstSchedulerFactoryClass;
@@ -164,10 +160,14 @@ struct _GstSchedulerFactory {
 
   gchar *longdesc;              /* long description of the scheduler (well, don't overdo it..) */
   GType type;                  /* unique GType of the scheduler */
+
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 struct _GstSchedulerFactoryClass {
   GstPluginFeatureClass parent;
+
+  gpointer _gst_reserved[GST_PADDING];
 };
 
 GType                  gst_scheduler_factory_get_type          (void);
@@ -181,11 +181,9 @@ GstScheduler*              gst_scheduler_factory_create            (GstSchedulerFactory *factory, GstE
 GstScheduler*          gst_scheduler_factory_make              (const gchar *name, GstElement *parent);
 
 void                   gst_scheduler_factory_set_default_name  (const gchar* name);
-const gchar*           gst_scheduler_factory_get_default_name  (void);
+G_CONST_RETURN gchar*  gst_scheduler_factory_get_default_name  (void);
 
 
-#ifdef __cplusplus   
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
 #endif /* __GST_SCHEDULER_H__ */
Domain: Multimedia / Media Common;