X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gst%2Fgstformat.h;h=111ca9b82751642aeb0aed0d7fe9add0ac32f0c0;hb=57c8e0146f0e203058c95721527cf50a1dd19f72;hp=1569923941cb1c9ae7d17d2ac1cb1e8e9b1bbefc;hpb=a967370df58163d7f5219a285a8331b3f79930a3;p=platform%2Fupstream%2Fgstreamer.git

diff --git a/gst/gstformat.h b/gst/gstformat.h
index 1569923..111ca9b 100644
--- a/gst/gstformat.h
+++ b/gst/gstformat.h
@@ -17,8 +17,8 @@
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
  */
 
 
@@ -27,65 +27,100 @@
 
 #include <glib.h>
 
-G_BEGIN_DECLS typedef enum
-{
-  GST_FORMAT_UNDEFINED = 0,	/* must be first in list */
-  GST_FORMAT_DEFAULT = 1,	/* samples for audio, frames/fields for video */
-  GST_FORMAT_BYTES = 2,
-  GST_FORMAT_TIME = 3,
-  GST_FORMAT_BUFFERS = 4,
-  GST_FORMAT_PERCENT = 5
+#include <gst/gstiterator.h>
+
+G_BEGIN_DECLS
+
+/**
+ * GstFormat:
+ * @GST_FORMAT_UNDEFINED: undefined format
+ * @GST_FORMAT_DEFAULT: the default format of the pad/element. This can be
+ *    samples for raw audio, frames/fields for raw video (some, but not all,
+ *    elements support this; use @GST_FORMAT_TIME if you don't have a good
+ *    reason to query for samples/frames)
+ * @GST_FORMAT_BYTES: bytes
+ * @GST_FORMAT_TIME: time in nanoseconds
+ * @GST_FORMAT_BUFFERS: buffers (few, if any, elements implement this as of
+ *     May 2009)
+ * @GST_FORMAT_PERCENT: percentage of stream (few, if any, elements implement
+ *     this as of May 2009)
+ *
+ * Standard predefined formats
+ */
+/* NOTE: don't forget to update the table in gstformat.c when changing
+ * this enum */
+typedef enum {
+  GST_FORMAT_UNDEFINED  =  0, /* must be first in list */
+  GST_FORMAT_DEFAULT    =  1,
+  GST_FORMAT_BYTES      =  2,
+  GST_FORMAT_TIME       =  3,
+  GST_FORMAT_BUFFERS    =  4,
+  GST_FORMAT_PERCENT    =  5
 } GstFormat;
 
 /* a percentage is always relative to 1000000 */
-#define	GST_FORMAT_PERCENT_MAX		G_GINT64_CONSTANT (1000000)
-#define	GST_FORMAT_PERCENT_SCALE	G_GINT64_CONSTANT (10000)
+/**
+ * GST_FORMAT_PERCENT_MAX:
+ *
+ * The PERCENT format is between 0 and this value
+ */
+#define GST_FORMAT_PERCENT_MAX          G_GINT64_CONSTANT (1000000)
+/**
+ * GST_FORMAT_PERCENT_SCALE:
+ *
+ * The value used to scale down the reported PERCENT format value to
+ * its real value.
+ */
+#define GST_FORMAT_PERCENT_SCALE        G_GINT64_CONSTANT (10000)
 
 typedef struct _GstFormatDefinition GstFormatDefinition;
 
+/**
+ * GstFormatDefinition:
+ * @value: The unique id of this format
+ * @nick: A short nick of the format
+ * @description: A longer description of the format
+ * @quark: A quark for the nick
+ *
+ * A format definition
+ */
 struct _GstFormatDefinition
 {
-  GstFormat value;
-  gchar *nick;
-  gchar *description;
+  GstFormat    value;
+  const gchar *nick;
+  const gchar *description;
+  GQuark       quark;
 };
 
-#ifdef G_HAVE_ISO_VARARGS
-#define GST_FORMATS_FUNCTION(type, functionname, ...)   \
-static const GstFormat*                              	\
-functionname (type object)                       	\
-{                                                    	\
-  static const GstFormat formats[] = {               	\
-    __VA_ARGS__,                                     	\
-    0                                                	\
-  };                                                 	\
-  return formats;                                    	\
-}
-#elif defined(G_HAVE_GNUC_VARARGS)
-#define GST_FORMATS_FUNCTION(type, functionname, a...)  \
-static const GstFormat*                              	\
-functionname (type object)                       	\
-{                                                    	\
-  static const GstFormat formats[] = {               	\
-    a,                                               	\
-    0                                                	\
-  };                                                 	\
-  return formats;                                    	\
-}
-#endif
-
-void _gst_format_initialize (void);
+GST_API
+const gchar*    gst_format_get_name             (GstFormat format);
+
+GST_API
+GQuark          gst_format_to_quark             (GstFormat format);
 
 /* register a new format */
-GstFormat gst_format_register (const gchar * nick, const gchar * description);
-GstFormat gst_format_get_by_nick (const gchar * nick);
+
+GST_API
+GstFormat       gst_format_register             (const gchar *nick,
+                                                 const gchar *description);
+
+GST_API
+GstFormat       gst_format_get_by_nick          (const gchar *nick);
 
 /* check if a format is in an array of formats */
-gboolean gst_formats_contains (const GstFormat * formats, GstFormat format);
+
+GST_API
+gboolean        gst_formats_contains            (const GstFormat *formats, GstFormat format);
 
 /* query for format details */
-G_CONST_RETURN GstFormatDefinition *gst_format_get_details (GstFormat format);
-G_CONST_RETURN GList *gst_format_get_definitions (void);
+
+GST_API
+const GstFormatDefinition*
+                gst_format_get_details          (GstFormat format);
+
+GST_API
+GstIterator*    gst_format_iterate_definitions  (void);
 
 G_END_DECLS
+
 #endif /* __GST_FORMAT_H__ */