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

docs/gst/gstreamer-sections.txt: remove double entries from the docs

Browse source 
Original commit message from CVS:

* docs/gst/gstreamer-sections.txt:
remove double entries from the docs
* gst/gst_private.h:
* gst/gstinfo.c: (_gst_debug_init):
remove the THREAD debug category
* gst/Makefile.am:
* gst/gstqueue.c:
* gst/gstqueue.h:
* docs/gst/gstreamer.types:
* plugins/elements/gstqueue.c: (gst_queue_get_type),
(gst_queue_init), (gst_queue_finalize), (gst_queue_change_state):
completely move queue and fix up debugging categories
This commit is contained in:
Thomas Vander Stichele 2005-11-30 09:59:04 +00:00
parent 35be51219a
commit 6802a8b4ba
9 changed files with 40 additions and 1269 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2005-11-30 Thomas Vander Stichele <thomas at apestaart dot org>
* docs/gst/gstreamer-sections.txt:
remove double entries from the docs
* gst/gst_private.h:
* gst/gstinfo.c: (_gst_debug_init):
remove the THREAD debug category
* gst/Makefile.am:
* gst/gstqueue.c:
* gst/gstqueue.h:
* docs/gst/gstreamer.types:
* plugins/elements/gstqueue.c: (gst_queue_get_type),
(gst_queue_init), (gst_queue_finalize), (gst_queue_change_state):
completely move queue and fix up debugging categories
2005-11-30 Thomas Vander Stichele <thomas at apestaart dot org>
* plugins/elements/gstidentity.c: (gst_identity_transform_ip):

39
docs/gst/gstreamer-sections.txt
View file

@ -1551,23 +1551,6 @@ gst_query_type_get_type
</SECTION>
<SECTION>
<FILE>gstqueue</FILE>
<TITLE>GstQueue</TITLE>
GstQueue
GstQueueSize
<SUBSECTION Standard>
GstQueueClass
GST_QUEUE
GST_IS_QUEUE
GST_QUEUE_CLASS
GST_IS_QUEUE_CLASS
GST_TYPE_QUEUE
<SUBSECTION Private>
gst_queue_get_type
</SECTION>
<SUBSECTION Standard>
<SECTION>
<FILE>gstregistry</FILE>
<TITLE>GstRegistry</TITLE>
@ -1585,15 +1568,10 @@ gst_registry_find_plugin
gst_registry_find_feature
gst_registry_lookup_feature
gst_registry_scan_path
gst_registry_get_feature_list
gst_registry_xml_read_cache
gst_registry_xml_write_cache
gst_registry_get_default
gst_registry_lookup
gst_registry_remove_feature
gst_registry_get_feature_list_by_plugin
gst_registry_lookup_feature
gst_registry_get_plugin_list
gst_registry_add_feature
<SUBSECTION Default Registry>
gst_default_registry_check_feature_version
@ -2272,3 +2250,20 @@ GST_IS_FILE_SINK_CLASS
<SUBSECTION Private>
gst_file_sink_get_type
</SECTION>
<SECTION>
<FILE>gstqueue</FILE>
<TITLE>GstQueue</TITLE>
GstQueue
GstQueueSize
<SUBSECTION Standard>
GstQueueClass
GST_QUEUE
GST_IS_QUEUE
GST_QUEUE_CLASS
GST_IS_QUEUE_CLASS
GST_TYPE_QUEUE
<SUBSECTION Private>
gst_queue_get_type
</SECTION>
<SUBSECTION Standard>

4
docs/gst/gstreamer.types
View file

@ -7,7 +7,6 @@
% - document properties and signals
#include <gst/gst.h>
#include <gst/gstqueue.h>
gst_bin_get_type
gst_bus_get_type
@ -28,7 +27,6 @@ gst_pad_get_type
gst_pad_template_get_type
gst_pipeline_get_type
gst_plugin_feature_get_type
gst_queue_get_type
gst_tag_setter_get_type
gst_task_get_type
gst_type_find_factory_get_type
@ -63,8 +61,10 @@ gst_net_time_provider_get_type
#include <plugins/elements/gstfakesink.h>
#include <plugins/elements/gstfilesrc.h>
#include <plugins/elements/gstfilesink.h>
#include <plugins/elements/gstqueue.h>
gst_fake_src_get_type
gst_fake_sink_get_type
gst_file_src_get_type
gst_file_sink_get_type
gst_queue_get_type

2
gst/Makefile.am
View file

@ -89,7 +89,6 @@ libgstreamer_@GST_MAJORMINOR@_la_SOURCES = \
gstplugin.c \
gstpluginfeature.c \
gstquery.c \
gstqueue.c \
gstregistry.c \
gstregistryxml.c \
gstsegment.c \
@ -171,7 +170,6 @@ gst_headers = \
gstplugin.h \
gstpluginfeature.h \
gstquery.h \
gstqueue.h \
gstsegment.h \
gststructure.h \
gstsystemclock.h \

2
gst/gst_private.h
View file

@ -63,7 +63,6 @@ extern GstDebugCategory *GST_CAT_PIPELINE;
extern GstDebugCategory *GST_CAT_PLUGIN_LOADING;
extern GstDebugCategory *GST_CAT_PLUGIN_INFO;
extern GstDebugCategory *GST_CAT_PROPERTIES;
extern GstDebugCategory *GST_CAT_THREAD;
extern GstDebugCategory *GST_CAT_XML;
extern GstDebugCategory *GST_CAT_NEGOTIATION;
extern GstDebugCategory *GST_CAT_REFCOUNTING;
@ -95,7 +94,6 @@ extern GstDebugCategory *GST_CAT_REGISTRY;
#define GST_CAT_PLUGIN_LOADING NULL
#define GST_CAT_PLUGIN_INFO NULL
#define GST_CAT_PROPERTIES NULL
#define GST_CAT_THREAD NULL
#define GST_CAT_XML NULL
#define GST_CAT_NEGOTIATION NULL
#define GST_CAT_REFCOUNTING NULL

3
gst/gstinfo.c
View file

@ -210,7 +210,6 @@ GstDebugCategory *GST_CAT_PIPELINE = NULL;
GstDebugCategory *GST_CAT_PLUGIN_LOADING = NULL;
GstDebugCategory *GST_CAT_PLUGIN_INFO = NULL;
GstDebugCategory *GST_CAT_PROPERTIES = NULL;
GstDebugCategory *GST_CAT_THREAD = NULL;
GstDebugCategory *GST_CAT_TYPES = NULL;
GstDebugCategory *GST_CAT_XML = NULL;
GstDebugCategory *GST_CAT_NEGOTIATION = NULL;
@ -322,8 +321,6 @@ _gst_debug_init (void)
GST_DEBUG_BOLD | GST_DEBUG_FG_CYAN, NULL);
GST_CAT_PROPERTIES = _gst_debug_category_new ("GST_PROPERTIES",
GST_DEBUG_BOLD | GST_DEBUG_FG_WHITE | GST_DEBUG_BG_BLUE, NULL);
GST_CAT_THREAD = _gst_debug_category_new ("GST_THREAD",
GST_DEBUG_BOLD | GST_DEBUG_FG_RED, NULL);
GST_CAT_TYPES = _gst_debug_category_new ("GST_TYPES",
GST_DEBUG_BOLD | GST_DEBUG_FG_WHITE | GST_DEBUG_BG_RED, NULL);
GST_CAT_XML = _gst_debug_category_new ("GST_XML",

1115
gst/gstqueue.c
View file

File diff suppressed because it is too large Load diff

117
gst/gstqueue.h
View file

@ -1,117 +0,0 @@
/* GStreamer
* Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
* 2000 Wim Taymans <wtay@chello.be>
*
* gstqueue.h:
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* 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.
*/
#ifndef __GST_QUEUE_H__
#define __GST_QUEUE_H__
#include <gst/gstelement.h>
G_BEGIN_DECLS
#define GST_TYPE_QUEUE \
(gst_queue_get_type())
#define GST_QUEUE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_QUEUE,GstQueue))
#define GST_QUEUE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_QUEUE,GstQueueClass))
#define GST_IS_QUEUE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_QUEUE))
#define GST_IS_QUEUE_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_QUEUE))
enum {
GST_QUEUE_NO_LEAK = 0,
GST_QUEUE_LEAK_UPSTREAM = 1,
GST_QUEUE_LEAK_DOWNSTREAM = 2
};
typedef struct _GstQueue GstQueue;
typedef struct _GstQueueSize GstQueueSize;
typedef struct _GstQueueClass GstQueueClass;
/**
* GstQueueSize:
* @buffers: number of buffers
* @bytes: number of bytes
* @time: amount of time
*
* Structure describing the size of a queue.
*/
struct _GstQueueSize {
guint buffers;
guint bytes;
guint64 time;
};
/**
* GstQueue:
*
* Opaque #GstQueue structure.
*/
struct _GstQueue {
GstElement element;
/*< private >*/
GstPad *sinkpad;
GstPad *srcpad;
/* flowreturn when srcpad is paused */
GstFlowReturn srcresult;
/* the queue of data we're keeping our grubby hands on */
GQueue *queue;
GstQueueSize
cur_level, /* currently in the queue */
max_size, /* max. amount of data allowed in the queue */
min_threshold; /* min. amount of data required to wake reader */
/* whether we leak data, and at which end */
gint leaky;
GMutex *qlock; /* lock for queue (vs object lock) */
GCond *item_add; /* signals buffers now available for reading */
GCond *item_del; /* signals space now available for writing */
gpointer _gst_reserved[GST_PADDING];
};
struct _GstQueueClass {
GstElementClass parent_class;
/* signals - 'running' is called from both sides
* which might make it sort of non-useful... */
void (*underrun) (GstQueue *queue);
void (*running) (GstQueue *queue);
void (*overrun) (GstQueue *queue);
gpointer _gst_reserved[GST_PADDING];
};
GType gst_queue_get_type (void);
G_END_DECLS
#endif /* __GST_QUEUE_H__ */

12
plugins/elements/gstqueue.c
View file

@ -54,8 +54,9 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY);
GST_DEBUG_CATEGORY_STATIC (queue_debug);
#define GST_CAT_DEFAULT (queue_debug)
GST_DEBUG_CATEGORY_STATIC (queue_dataflow);
#define GST_CAT_DEFAULT (queue_dataflow)
#define STATUS(queue, msg) \
GST_CAT_LOG_OBJECT (queue_dataflow, queue, \
@ -205,6 +206,7 @@ gst_queue_get_type (void)
queue_type = g_type_register_static (GST_TYPE_ELEMENT,
"GstQueue", &queue_info, 0);
GST_DEBUG_CATEGORY_INIT (queue_debug, "queue", 0, "queue element");
GST_DEBUG_CATEGORY_INIT (queue_dataflow, "queue_dataflow", 0,
"dataflow inside the queue element");
}
@ -377,7 +379,7 @@ gst_queue_init (GstQueue * queue)
queue->item_del = g_cond_new ();
queue->queue = g_queue_new ();
GST_CAT_DEBUG_OBJECT (GST_CAT_THREAD, queue,
GST_DEBUG_OBJECT (queue,
"initialized queue's not_empty & not_full conditions");
}
@ -395,9 +397,9 @@ gst_queue_finalize (GObject * object)
gst_mini_object_unref (data);
}
g_queue_free (queue->queue);
GST_CAT_DEBUG_OBJECT (GST_CAT_THREAD, queue, "free mutex");
GST_DEBUG_OBJECT (queue, "free mutex");
g_mutex_free (queue->qlock);
GST_CAT_DEBUG_OBJECT (GST_CAT_THREAD, queue, "done free mutex");
GST_DEBUG_OBJECT (queue, "done free mutex");
g_cond_free (queue->item_add);
g_cond_free (queue->item_del);
@ -996,8 +998,6 @@ gst_queue_change_state (GstElement * element, GstStateChange transition)
queue = GST_QUEUE (element);
GST_CAT_LOG_OBJECT (GST_CAT_STATES, element, "starting state change");
switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
break;