mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 03:35:21 +00:00
Remove AppSrc/AppSink that are moving to -base. Partially fixes #564421
Original commit message from CVS: * configure.ac: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-bad-plugins-docs.sgml: * docs/plugins/gst-plugins-bad-plugins-sections.txt: * docs/plugins/inspect/plugin-app.xml: * examples/Makefile.am: * examples/app/.cvsignore: * examples/app/Makefile.am: * examples/app/appsink-src.c: * examples/app/appsrc-ra.c: * examples/app/appsrc-seekable.c: * examples/app/appsrc-stream.c: * examples/app/appsrc-stream2.c: * examples/app/appsrc_ex.c: * gst-libs/gst/Makefile.am: * gst-libs/gst/app/.cvsignore: * gst-libs/gst/app/Makefile.am: * gst-libs/gst/app/gstapp-marshal.list: * gst-libs/gst/app/gstappbuffer.c: * gst-libs/gst/app/gstappbuffer.h: * gst-libs/gst/app/gstappsink.c: * gst-libs/gst/app/gstappsink.h: * gst-libs/gst/app/gstappsrc.c: * gst-libs/gst/app/gstappsrc.h: * gst/app/Makefile.am: * gst/app/gstapp.c: Remove AppSrc/AppSink that are moving to -base. Partially fixes #564421
This commit is contained in:
Jan Schmidt
parent
3a2cdc25e1
commit
a2b410a595
9 changed files with 37 additions and 222 deletions
32
ChangeLog
32
ChangeLog
|
|
@ -1,3 +1,35 @@
|
|||
2009-01-05 Jan Schmidt <jan.schmidt@sun.com>
|
||||
|
||||
* configure.ac:
|
||||
* docs/plugins/Makefile.am:
|
||||
* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
|
||||
* docs/plugins/gst-plugins-bad-plugins-sections.txt:
|
||||
* docs/plugins/inspect/plugin-app.xml:
|
||||
* examples/Makefile.am:
|
||||
* examples/app/.cvsignore:
|
||||
* examples/app/Makefile.am:
|
||||
* examples/app/appsink-src.c:
|
||||
* examples/app/appsrc-ra.c:
|
||||
* examples/app/appsrc-seekable.c:
|
||||
* examples/app/appsrc-stream.c:
|
||||
* examples/app/appsrc-stream2.c:
|
||||
* examples/app/appsrc_ex.c:
|
||||
* gst-libs/gst/Makefile.am:
|
||||
* gst-libs/gst/app/.cvsignore:
|
||||
* gst-libs/gst/app/Makefile.am:
|
||||
* gst-libs/gst/app/gstapp-marshal.list:
|
||||
* gst-libs/gst/app/gstappbuffer.c:
|
||||
* gst-libs/gst/app/gstappbuffer.h:
|
||||
* gst-libs/gst/app/gstappsink.c:
|
||||
* gst-libs/gst/app/gstappsink.h:
|
||||
* gst-libs/gst/app/gstappsrc.c:
|
||||
* gst-libs/gst/app/gstappsrc.h:
|
||||
* gst/app/Makefile.am:
|
||||
* gst/app/gstapp.c:
|
||||
|
||||
Remove AppSrc/AppSink that are moving to -base. Partially fixes
|
||||
#564421
|
||||
|
||||
2009-01-05 Zaheer Abbas Merali <zaheerabbas at merali dot org>
|
||||
|
||||
* gst/mpegdemux/mpegtspacketizer.c:
|
||||
|
|
|
|||
|
|
@ -235,7 +235,6 @@ dnl these are all the gst plug-ins, compilable without additional libs
|
|||
AG_GST_CHECK_PLUGIN(aacparse)
|
||||
AG_GST_CHECK_PLUGIN(aiffparse)
|
||||
AG_GST_CHECK_PLUGIN(amrparse)
|
||||
AG_GST_CHECK_PLUGIN(app)
|
||||
AG_GST_CHECK_PLUGIN(audioresample)
|
||||
AG_GST_CHECK_PLUGIN(bayer)
|
||||
AG_GST_CHECK_PLUGIN(cdxaparse)
|
||||
|
|
@ -1389,7 +1388,6 @@ gst/Makefile
|
|||
gst/aacparse/Makefile
|
||||
gst/aiffparse/Makefile
|
||||
gst/amrparse/Makefile
|
||||
gst/app/Makefile
|
||||
gst/audioresample/Makefile
|
||||
gst/bayer/Makefile
|
||||
gst/cdxaparse/Makefile
|
||||
|
|
@ -1431,7 +1429,6 @@ gst/real/Makefile
|
|||
gst/y4m/Makefile
|
||||
gst-libs/Makefile
|
||||
gst-libs/gst/Makefile
|
||||
gst-libs/gst/app/Makefile
|
||||
gst-libs/gst/dshow/Makefile
|
||||
sys/Makefile
|
||||
sys/dshowdecwrapper/Makefile
|
||||
|
|
@ -1449,7 +1446,6 @@ sys/wininet/Makefile
|
|||
sys/winks/Makefile
|
||||
sys/winscreencap/Makefile
|
||||
examples/Makefile
|
||||
examples/app/Makefile
|
||||
examples/directfb/Makefile
|
||||
examples/scaletempo/Makefile
|
||||
examples/switch/Makefile
|
||||
|
|
|
|||
|
|
@ -113,8 +113,6 @@ EXTRA_HFILES = \
|
|||
$(top_srcdir)/ext/timidity/gstwildmidi.h \
|
||||
$(top_srcdir)/ext/twolame/gsttwolame.h \
|
||||
$(top_srcdir)/ext/x264/gstx264enc.h \
|
||||
$(top_srcdir)/gst-libs/gst/app/gstappsrc.h \
|
||||
$(top_srcdir)/gst-libs/gst/app/gstappsink.h \
|
||||
$(top_srcdir)/gst/aacparse/gstaacparse.h \
|
||||
$(top_srcdir)/gst/amrparse/gstamrparse.h \
|
||||
$(top_srcdir)/gst/audioresample/gstaudioresample.h \
|
||||
|
|
|
|||
|
|
@ -12,8 +12,6 @@
|
|||
|
||||
<chapter>
|
||||
<title>gst-plugins-bad Elements</title>
|
||||
<xi:include href="xml/element-appsrc.xml" />
|
||||
<xi:include href="xml/element-appsink.xml" />
|
||||
<xi:include href="xml/element-aacparse.xml" />
|
||||
<xi:include href="xml/element-amrparse.xml" />
|
||||
<xi:include href="xml/element-amrwbdec.xml" />
|
||||
|
|
@ -78,7 +76,6 @@
|
|||
<xi:include href="xml/plugin-legacyresample.xml" />
|
||||
<xi:include href="xml/plugin-alsaspdif.xml" />
|
||||
<xi:include href="xml/plugin-amrwb.xml" />
|
||||
<xi:include href="xml/plugin-app.xml" />
|
||||
<xi:include href="xml/plugin-bayer.xml" />
|
||||
<xi:include href="xml/plugin-bz2.xml" />
|
||||
<xi:include href="xml/plugin-cdaudio.xml" />
|
||||
|
|
|
|||
|
|
@ -1,53 +1,3 @@
|
|||
<SECTION>
|
||||
<FILE>element-appsrc</FILE>
|
||||
<TITLE>appsrc</TITLE>
|
||||
GstAppSrc
|
||||
GstAppStreamType
|
||||
gst_app_src_set_caps
|
||||
gst_app_src_get_caps
|
||||
gst_app_src_set_size
|
||||
gst_app_src_get_size
|
||||
gst_app_src_set_stream_type
|
||||
gst_app_src_get_stream_type
|
||||
gst_app_src_set_max_bytes
|
||||
gst_app_src_get_max_bytes
|
||||
gst_app_src_push_buffer
|
||||
gst_app_src_end_of_stream
|
||||
<SUBSECTION Standard>
|
||||
GstAppSrcClass
|
||||
GST_APP_SRC
|
||||
GST_IS_APP_SRC
|
||||
GST_TYPE_APP_SRC
|
||||
gst_app_src_get_type
|
||||
GST_APP_SRC_CLASS
|
||||
GST_IS_APP_SRC_CLASS
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>element-appsink</FILE>
|
||||
<TITLE>appsink</TITLE>
|
||||
GstAppSink
|
||||
gst_app_sink_set_caps
|
||||
gst_app_sink_get_caps
|
||||
gst_app_sink_is_eos
|
||||
gst_app_sink_set_emit_signals
|
||||
gst_app_sink_get_emit_signals
|
||||
gst_app_sink_set_max_buffers
|
||||
gst_app_sink_get_max_buffers
|
||||
gst_app_sink_set_drop
|
||||
gst_app_sink_get_drop
|
||||
gst_app_sink_pull_preroll
|
||||
gst_app_sink_pull_buffer
|
||||
<SUBSECTION Standard>
|
||||
GstAppSinkClass
|
||||
GST_APP_SINK
|
||||
GST_IS_APP_SINK
|
||||
GST_TYPE_APP_SINK
|
||||
gst_app_sink_get_type
|
||||
GST_APP_SINK_CLASS
|
||||
GST_IS_APP_SINK_CLASS
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>element-aacparse</FILE>
|
||||
<TITLE>aacparse</TITLE>
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@ else
|
|||
DIRECTFB_DIR=
|
||||
endif
|
||||
|
||||
SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) app switch
|
||||
DIST_SUBDIRS= directfb app switch scaletempo
|
||||
SUBDIRS= $(DIRECTFB_DIR) $(GTK_EXAMPLES) switch
|
||||
DIST_SUBDIRS= directfb switch scaletempo
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
SUBDIRS = app
|
||||
SUBDIRS =
|
||||
|
||||
noinst_HEADERS = gst-i18n-plugin.h gettext.h
|
||||
DIST_SUBDIRS = app dshow
|
||||
DIST_SUBDIRS = dshow
|
||||
|
|
|
|||
|
|
@ -124,8 +124,6 @@ enum
|
|||
#define DEFAULT_PROP_FORMAT GST_FORMAT_BYTES
|
||||
#define DEFAULT_PROP_BLOCK FALSE
|
||||
#define DEFAULT_PROP_IS_LIVE FALSE
|
||||
#define DEFAULT_PROP_MIN_LATENCY -1
|
||||
#define DEFAULT_PROP_MAX_LATENCY -1
|
||||
|
||||
enum
|
||||
{
|
||||
|
|
@ -137,8 +135,7 @@ enum
|
|||
PROP_FORMAT,
|
||||
PROP_BLOCK,
|
||||
PROP_IS_LIVE,
|
||||
PROP_MIN_LATENCY,
|
||||
PROP_MAX_LATENCY,
|
||||
|
||||
PROP_LAST
|
||||
};
|
||||
|
||||
|
|
@ -178,9 +175,6 @@ static void gst_app_src_set_property (GObject * object, guint prop_id,
|
|||
static void gst_app_src_get_property (GObject * object, guint prop_id,
|
||||
GValue * value, GParamSpec * pspec);
|
||||
|
||||
static void gst_app_src_set_latencies (GstAppSrc * appsrc,
|
||||
gboolean do_min, guint64 min, gboolean do_max, guint64 max);
|
||||
|
||||
static GstFlowReturn gst_app_src_create (GstBaseSrc * bsrc,
|
||||
guint64 offset, guint size, GstBuffer ** buf);
|
||||
static gboolean gst_app_src_start (GstBaseSrc * bsrc);
|
||||
|
|
@ -191,8 +185,6 @@ static gboolean gst_app_src_do_seek (GstBaseSrc * src, GstSegment * segment);
|
|||
static gboolean gst_app_src_is_seekable (GstBaseSrc * src);
|
||||
static gboolean gst_app_src_check_get_range (GstBaseSrc * src);
|
||||
static gboolean gst_app_src_do_get_size (GstBaseSrc * src, guint64 * size);
|
||||
static gboolean gst_app_src_query (GstBaseSrc * src, GstQuery * query);
|
||||
|
||||
static GstFlowReturn gst_app_src_push_buffer_action (GstAppSrc * appsrc,
|
||||
GstBuffer * buffer);
|
||||
|
||||
|
|
@ -314,28 +306,6 @@ gst_app_src_class_init (GstAppSrcClass * klass)
|
|||
g_param_spec_boolean ("is-live", "Is Live",
|
||||
"Whether to act as a live source",
|
||||
DEFAULT_PROP_IS_LIVE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||
/**
|
||||
* GstAppSrc::min-latency
|
||||
*
|
||||
* The minimum latency of the source. A value of -1 will use the default
|
||||
* latency calculations of #GstBaseSrc.
|
||||
*/
|
||||
g_object_class_install_property (gobject_class, PROP_MIN_LATENCY,
|
||||
g_param_spec_int64 ("min-latency", "Min Latency",
|
||||
"The minimum latency (-1 = default)",
|
||||
-1, G_MAXINT64, DEFAULT_PROP_MIN_LATENCY,
|
||||
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||
/**
|
||||
* GstAppSrc::max-latency
|
||||
*
|
||||
* The maximum latency of the source. A value of -1 means an unlimited amout
|
||||
* of latency.
|
||||
*/
|
||||
g_object_class_install_property (gobject_class, PROP_MAX_LATENCY,
|
||||
g_param_spec_int64 ("max-latency", "Max Latency",
|
||||
"The maximum latency (-1 = unlimited)",
|
||||
-1, G_MAXINT64, DEFAULT_PROP_MAX_LATENCY,
|
||||
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
|
||||
|
||||
/**
|
||||
* GstAppSrc::need-data:
|
||||
|
|
@ -425,8 +395,6 @@ gst_app_src_class_init (GstAppSrcClass * klass)
|
|||
basesrc_class->is_seekable = gst_app_src_is_seekable;
|
||||
basesrc_class->check_get_range = gst_app_src_check_get_range;
|
||||
basesrc_class->get_size = gst_app_src_do_get_size;
|
||||
basesrc_class->get_size = gst_app_src_do_get_size;
|
||||
basesrc_class->query = gst_app_src_query;
|
||||
|
||||
klass->push_buffer = gst_app_src_push_buffer_action;
|
||||
klass->end_of_stream = gst_app_src_end_of_stream;
|
||||
|
|
@ -444,8 +412,6 @@ gst_app_src_init (GstAppSrc * appsrc, GstAppSrcClass * klass)
|
|||
appsrc->max_bytes = DEFAULT_PROP_MAX_BYTES;
|
||||
appsrc->format = DEFAULT_PROP_FORMAT;
|
||||
appsrc->block = DEFAULT_PROP_BLOCK;
|
||||
appsrc->min_latency = DEFAULT_PROP_MIN_LATENCY;
|
||||
appsrc->max_latency = DEFAULT_PROP_MAX_LATENCY;
|
||||
|
||||
gst_base_src_set_live (GST_BASE_SRC (appsrc), DEFAULT_PROP_IS_LIVE);
|
||||
}
|
||||
|
|
@ -514,14 +480,6 @@ gst_app_src_set_property (GObject * object, guint prop_id,
|
|||
gst_base_src_set_live (GST_BASE_SRC (appsrc),
|
||||
g_value_get_boolean (value));
|
||||
break;
|
||||
case PROP_MIN_LATENCY:
|
||||
gst_app_src_set_latencies (appsrc, TRUE, g_value_get_int64 (value),
|
||||
FALSE, -1);
|
||||
break;
|
||||
case PROP_MAX_LATENCY:
|
||||
gst_app_src_set_latencies (appsrc, FALSE, -1, TRUE,
|
||||
g_value_get_int64 (value));
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
|
|
@ -564,22 +522,6 @@ gst_app_src_get_property (GObject * object, guint prop_id, GValue * value,
|
|||
case PROP_IS_LIVE:
|
||||
g_value_set_boolean (value, gst_base_src_is_live (GST_BASE_SRC (appsrc)));
|
||||
break;
|
||||
case PROP_MIN_LATENCY:
|
||||
{
|
||||
guint64 min;
|
||||
|
||||
gst_app_src_get_latency (appsrc, &min, NULL);
|
||||
g_value_set_int64 (value, min);
|
||||
break;
|
||||
}
|
||||
case PROP_MAX_LATENCY:
|
||||
{
|
||||
guint64 max;
|
||||
|
||||
gst_app_src_get_latency (appsrc, &max, NULL);
|
||||
g_value_set_int64 (value, max);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
break;
|
||||
|
|
@ -693,40 +635,6 @@ gst_app_src_do_get_size (GstBaseSrc * src, guint64 * size)
|
|||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gst_app_src_query (GstBaseSrc * src, GstQuery * query)
|
||||
{
|
||||
GstAppSrc *appsrc = GST_APP_SRC (src);
|
||||
gboolean res;
|
||||
|
||||
switch (GST_QUERY_TYPE (query)) {
|
||||
case GST_QUERY_LATENCY:
|
||||
{
|
||||
GstClockTime min, max;
|
||||
gboolean live;
|
||||
|
||||
/* Query the parent class for the defaults */
|
||||
res = gst_base_src_query_latency (src, &live, &min, &max);
|
||||
|
||||
/* overwrite with our values when we need to */
|
||||
g_mutex_lock (appsrc->mutex);
|
||||
if (appsrc->min_latency != -1)
|
||||
min = appsrc->min_latency;
|
||||
if (appsrc->max_latency != -1)
|
||||
max = appsrc->max_latency;
|
||||
g_mutex_unlock (appsrc->mutex);
|
||||
|
||||
gst_query_set_latency (query, live, min, max);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
res = GST_BASE_SRC_CLASS (parent_class)->query (src, query);
|
||||
break;
|
||||
}
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
/* will be called in push mode */
|
||||
static gboolean
|
||||
gst_app_src_do_seek (GstBaseSrc * src, GstSegment * segment)
|
||||
|
|
@ -1069,66 +977,6 @@ gst_app_src_get_max_bytes (GstAppSrc * appsrc)
|
|||
return result;
|
||||
}
|
||||
|
||||
static void
|
||||
gst_app_src_set_latencies (GstAppSrc * appsrc, gboolean do_min, guint64 min,
|
||||
gboolean do_max, guint64 max)
|
||||
{
|
||||
gboolean changed = FALSE;
|
||||
|
||||
g_mutex_lock (appsrc->mutex);
|
||||
if (do_min && appsrc->min_latency != min) {
|
||||
appsrc->min_latency = min;
|
||||
changed = TRUE;
|
||||
}
|
||||
if (do_max && appsrc->max_latency != max) {
|
||||
appsrc->max_latency = max;
|
||||
changed = TRUE;
|
||||
}
|
||||
g_mutex_unlock (appsrc->mutex);
|
||||
|
||||
if (changed) {
|
||||
GST_DEBUG_OBJECT (appsrc, "posting latency changed");
|
||||
gst_element_post_message (GST_ELEMENT_CAST (appsrc),
|
||||
gst_message_new_latency (GST_OBJECT_CAST (appsrc)));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_app_src_set_latency:
|
||||
* @appsrc: a #GstAppSrc
|
||||
* @min: the min latency
|
||||
* @max: the min latency
|
||||
*
|
||||
* Configure the @min and @max latency in @src. If @min is set to -1, the
|
||||
* default latency calculations for pseudo-live sources will be used.
|
||||
*/
|
||||
void
|
||||
gst_app_src_set_latency (GstAppSrc * appsrc, guint64 min, guint64 max)
|
||||
{
|
||||
gst_app_src_set_latencies (appsrc, TRUE, min, TRUE, max);
|
||||
}
|
||||
|
||||
/**
|
||||
* gst_app_src_get_latency:
|
||||
* @appsrc: a #GstAppSrc
|
||||
* @min: the min latency
|
||||
* @max: the min latency
|
||||
*
|
||||
* Retrieve the min and max latencies in @min and @max respectively.
|
||||
*/
|
||||
void
|
||||
gst_app_src_get_latency (GstAppSrc * appsrc, guint64 * min, guint64 * max)
|
||||
{
|
||||
g_return_if_fail (GST_IS_APP_SRC (appsrc));
|
||||
|
||||
g_mutex_lock (appsrc->mutex);
|
||||
if (min)
|
||||
*min = appsrc->min_latency;
|
||||
if (max)
|
||||
*max = appsrc->max_latency;
|
||||
g_mutex_unlock (appsrc->mutex);
|
||||
}
|
||||
|
||||
static GstFlowReturn
|
||||
gst_app_src_push_buffer_full (GstAppSrc * appsrc, GstBuffer * buffer,
|
||||
gboolean steal_ref)
|
||||
|
|
|
|||
|
|
@ -79,9 +79,6 @@ struct _GstAppSrc
|
|||
guint64 queued_bytes;
|
||||
guint64 offset;
|
||||
GstAppStreamType current_type;
|
||||
|
||||
guint64 min_latency;
|
||||
guint64 max_latency;
|
||||
};
|
||||
|
||||
struct _GstAppSrcClass
|
||||
|
|
@ -114,9 +111,6 @@ GstAppStreamType gst_app_src_get_stream_type (GstAppSrc *appsrc);
|
|||
void gst_app_src_set_max_bytes (GstAppSrc *appsrc, guint64 max);
|
||||
guint64 gst_app_src_get_max_bytes (GstAppSrc *appsrc);
|
||||
|
||||
void gst_app_src_set_latency (GstAppSrc *appsrc, guint64 min, guint64 max);
|
||||
void gst_app_src_get_latency (GstAppSrc *appsrc, guint64 *min, guint64 *max);
|
||||
|
||||
GstFlowReturn gst_app_src_push_buffer (GstAppSrc *appsrc, GstBuffer *buffer);
|
||||
GstFlowReturn gst_app_src_end_of_stream (GstAppSrc *appsrc);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue