Menu
▾
▴
[gst-cvs] ds gst-plugins: gst-plugins/ gst-plugins/gst/audioscale/ gst-plugins/gst/debug/
|
From: David S. <ds...@pd...> - 2004-03-31 22:36:50
|
CVS Root: /home/cvs/gstreamer
Module: gst-plugins
Changes by: ds
Date: Wed Mar 31 2004 14:36:48 PST
Log message:
* gst/audioscale/gstaudioscale.c: (gst_audioscale_expand_value),
(gst_audioscale_getcaps): Fix getcaps to expand and union lists.
(bug #138225)
* gst/debug/Makefile.am:
* gst/debug/breakmydata.c: (gst_break_my_data_plugin_init):
* gst/debug/gstdebug.c: (plugin_init): Merge elements into one
plugin.
* gst/debug/negotiation.c: (gst_gst_negotiation_get_type),
(gst_negotiation_base_init), (gst_negotiation_class_init),
(gst_negotiation_init), (gst_negotiation_getcaps),
(gst_negotiation_pad_link), (gst_negotiation_chain),
(gst_negotiation_set_property), (gst_negotiation_get_property),
(gst_negotiation_plugin_init): New element to talk about random
negotiation things happening in a pipeline.
Modified files:
. : ChangeLog
gst/audioscale : gstaudioscale.c
gst/debug : Makefile.am breakmydata.c
Added files:
gst/debug : gstdebug.c negotiation.c
Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.490&r2=1.491
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/audioscale/gstaudioscale.c.diff?r1=1.30&r2=1.31
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/debug/Makefile.am.diff?r1=1.5&r2=1.6
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/debug/breakmydata.c.diff?r1=1.1&r2=1.2
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/debug/gstdebug.c?rev=1.1&content-type=text/vnd.viewcvs-markup
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/debug/negotiation.c?rev=1.1&content-type=text/vnd.viewcvs-markup
====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /home/cvs/gstreamer/gst-plugins/ChangeLog,v
retrieving revision 1.490
retrieving revision 1.491
diff -u -d -r1.490 -r1.491
--- a/ChangeLog 31 Mar 2004 17:11:13 -0000 1.490
+++ b/ChangeLog 31 Mar 2004 22:36:36 -0000 1.491
@@ -1,3 +1,20 @@
+2004-03-31 David Schleef <ds...@sc...>
+
+ * gst/audioscale/gstaudioscale.c: (gst_audioscale_expand_value),
+ (gst_audioscale_getcaps): Fix getcaps to expand and union lists.
+ (bug #138225)
+ * gst/debug/Makefile.am:
+ * gst/debug/breakmydata.c: (gst_break_my_data_plugin_init):
+ * gst/debug/gstdebug.c: (plugin_init): Merge elements into one
+ plugin.
+ * gst/debug/negotiation.c: (gst_gst_negotiation_get_type),
+ (gst_negotiation_base_init), (gst_negotiation_class_init),
+ (gst_negotiation_init), (gst_negotiation_getcaps),
+ (gst_negotiation_pad_link), (gst_negotiation_chain),
+ (gst_negotiation_set_property), (gst_negotiation_get_property),
+ (gst_negotiation_plugin_init): New element to talk about random
+ negotiation things happening in a pipeline.
2004-03-31 Thomas Vander Stichele <thomas at apestaart dot org>
* gst/adder/gstadder.c: (gst_adder_get_type), (gst_adder_loop):
Index: gstaudioscale.c
RCS file: /home/cvs/gstreamer/gst-plugins/gst/audioscale/gstaudioscale.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- a/gstaudioscale.c 15 Mar 2004 19:32:01 -0000 1.30
+++ b/gstaudioscale.c 31 Mar 2004 22:36:36 -0000 1.31
@@ -162,6 +162,80 @@
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
}
+static void
+gst_audioscale_expand_value (GValue * dest, const GValue * src)
+{
+ int rate_min, rate_max;
+ if (G_VALUE_TYPE (src) == G_TYPE_INT ||
+ G_VALUE_TYPE (src) == GST_TYPE_INT_RANGE) {
+ if (G_VALUE_TYPE (src) == G_TYPE_INT) {
+ rate_min = g_value_get_int (src);
+ rate_max = rate_min;
+ } else {
+ rate_min = gst_value_get_int_range_min (src);
+ rate_max = gst_value_get_int_range_max (src);
+ }
+ rate_min /= 2;
+ if (rate_min < 1)
+ rate_min = 1;
+ if (rate_max < G_MAXINT / 2) {
+ rate_max *= 2;
+ rate_max = G_MAXINT;
+ g_value_init (dest, GST_TYPE_INT_RANGE);
+ gst_value_set_int_range (dest, rate_min, rate_max);
+ return;
+ }
+ if (G_VALUE_TYPE (src) == GST_TYPE_LIST) {
+ int i;
+ g_value_init (dest, GST_TYPE_LIST);
+ for (i = 0; i < gst_value_list_get_size (src); i++) {
+ const GValue *s = gst_value_list_get_value (src, i);
+ GValue d = { 0 };
+ int j;
+ gst_audioscale_expand_value (&d, s);
+ for (j = 0; j < gst_value_list_get_size (dest); j++) {
+ const GValue *s2 = gst_value_list_get_value (dest, j);
+ GValue d2 = { 0 };
+ gst_value_union (&d2, &d, s2);
+ if (G_VALUE_TYPE (&d2) == GST_TYPE_INT_RANGE) {
+ g_value_unset ((GValue *) s2);
+ gst_value_init_and_copy ((GValue *) s2, &d2);
+ break;
+ }
+ g_value_unset (&d2);
+ }
+ if (j == gst_value_list_get_size (dest)) {
+ gst_value_list_append_value (dest, &d);
+ g_value_unset (&d);
+ if (gst_value_list_get_size (dest) == 1) {
+ const GValue *s = gst_value_list_get_value (dest, 0);
+ gst_value_init_and_copy (&d, s);
+ g_value_unset (dest);
+ gst_value_init_and_copy (dest, &d);
+ GST_ERROR ("unexpected value type");
+}
static GstCaps *
gst_audioscale_getcaps (GstPad * pad)
{
@@ -179,33 +253,19 @@
/* we do this hack, because the audioscale lib doesn't handle
* rate conversions larger than a factor of 2 */
for (i = 0; i < gst_caps_get_size (caps); i++) {
- int rate_min, rate_max;
GstStructure *structure = gst_caps_get_structure (caps, i);
const GValue *value;
+ GValue dest = { 0 };
value = gst_structure_get_value (structure, "rate");
- if (value == NULL)
- return NULL;
-
- if (G_VALUE_TYPE (value) == G_TYPE_INT) {
- rate_min = g_value_get_int (value);
- rate_max = rate_min;
- } else if (G_VALUE_TYPE (value) == GST_TYPE_INT_RANGE) {
- rate_min = gst_value_get_int_range_min (value);
- rate_max = gst_value_get_int_range_max (value);
- } else {
+ if (value == NULL) {
+ GST_ERROR ("caps structure doesn't have required rate field");
return NULL;
}
- rate_min /= 2;
- if (rate_max < G_MAXINT / 2) {
- rate_max *= 2;
- rate_max = G_MAXINT;
- }
+ gst_audioscale_expand_value (&dest, value);
- gst_structure_set (structure, "rate", GST_TYPE_INT_RANGE, rate_min,
- rate_max, NULL);
+ gst_structure_set_value (structure, "rate", &dest);
}
return caps;
Index: Makefile.am
RCS file: /home/cvs/gstreamer/gst-plugins/gst/debug/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/Makefile.am 25 Mar 2004 01:03:37 -0000 1.5
+++ b/Makefile.am 31 Mar 2004 22:36:36 -0000 1.6
@@ -11,6 +11,9 @@
libgstnavigationtest_la_CFLAGS = $(GST_CFLAGS) -I$(top_srcdir)/gst/videofilter
libgstnavigationtest_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdebug_la_SOURCES = breakmydata.c
+libgstdebug_la_SOURCES = gstdebug.c \
+ breakmydata.c \
+ negotiation.c
libgstdebug_la_CFLAGS = $(GST_CFLAGS)
libgstdebug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
Index: breakmydata.c
RCS file: /home/cvs/gstreamer/gst-plugins/gst/debug/breakmydata.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/breakmydata.c 25 Mar 2004 01:03:37 -0000 1.1
+++ b/breakmydata.c 31 Mar 2004 22:36:36 -0000 1.2
@@ -252,8 +252,8 @@
(element), GST_STATE_SUCCESS);
-static gboolean
-plugin_init (GstPlugin * plugin)
+gboolean
+gst_break_my_data_plugin_init (GstPlugin * plugin)
if (!gst_element_register (plugin, "breakmydata", GST_RANK_NONE,
GST_TYPE_BREAK_MY_DATA))
@@ -264,9 +264,3 @@
return TRUE;
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
- GST_VERSION_MINOR,
- "debug",
- "elements for testing and debugging",
- plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
--- NEW FILE: gstdebug.c ---
/* GStreamer
* Copyright (C) 2004 Benjamin Otte <ot...@gn...>
*
* 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.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <gst/gst.h>
gboolean gst_break_my_data_plugin_init (GstPlugin * plugin);
gboolean gst_negotiation_plugin_init (GstPlugin * plugin);
static gboolean
plugin_init (GstPlugin * plugin)
{
gst_break_my_data_plugin_init (plugin);
gst_negotiation_plugin_init (plugin);
return TRUE;
}
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"debug",
"elements for testing and debugging",
plugin_init, VERSION, "LGPL", GST_PACKAGE, GST_ORIGIN)
--- NEW FILE: negotiation.c ---
/*
* GStreamer
* Copyright (C) 1999-2001 Erik Walthinsen <om...@cs...>
* Copyright (C) 2002 David A. Schleef <ds...@sc...>
#include "config.h"
#include <string.h>
#include <unistd.h>
#include <sys/mman.h>
#define GST_TYPE_NEGOTIATION \
(gst_gst_negotiation_get_type())
#define GST_NEGOTIATION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_NEGOTIATION,GstNegotiation))
#define GST_NEGOTIATION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_NEGOTIATION,GstNegotiation))
#define GST_IS_NEGOTIATION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_NEGOTIATION))
#define GST_IS_NEGOTIATION_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_NEGOTIATION))
typedef struct _GstNegotiation GstNegotiation;
typedef struct _GstNegotiationClass GstNegotiationClass;
struct _GstNegotiation
GstElement element;
GstPad *sinkpad, *srcpad;
};
struct _GstNegotiationClass
GstElementClass parent_class;
GType gst_gst_negotiation_get_type (void);
static GstElementDetails plugin_details = {
"Negotiation",
"Testing",
"This element acts like identity, except that one can control how "
"negotiation works",
"David A. Schleef <ds...@sc...>",
/* Filter signals and args */
enum
/* FILL ME */
LAST_SIGNAL
ARG_0
static GstStaticPadTemplate gst_negotiation_sink_factory =
GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
GST_STATIC_CAPS_ANY);
static GstStaticPadTemplate gst_negotiation_src_factory =
GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
static void gst_negotiation_base_init (gpointer g_class);
static void gst_negotiation_class_init (GstNegotiationClass * klass);
static void gst_negotiation_init (GstNegotiation * filter);
static GstCaps *gst_negotiation_getcaps (GstPad * pad);
static GstPadLinkReturn gst_negotiation_pad_link (GstPad * pad,
const GstCaps * caps);
static void gst_negotiation_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec);
static void gst_negotiation_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec);
static void gst_negotiation_chain (GstPad * pad, GstData * _data);
static GstElementClass *parent_class = NULL;
typedef struct _GstFencedBuffer GstFencedBuffer;
struct _GstFencedBuffer
GstBuffer buffer;
void *region;
unsigned int length;
GType
gst_gst_negotiation_get_type (void)
static GType plugin_type = 0;
if (!plugin_type) {
static const GTypeInfo plugin_info = {
sizeof (GstNegotiationClass),
gst_negotiation_base_init,
NULL,
(GClassInitFunc) gst_negotiation_class_init,
sizeof (GstNegotiation),
0,
(GInstanceInitFunc) gst_negotiation_init,
};
plugin_type = g_type_register_static (GST_TYPE_ELEMENT,
"GstNegotiation", &plugin_info, 0);
}
return plugin_type;
static void
gst_negotiation_base_init (gpointer g_class)
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&gst_negotiation_sink_factory));
gst_static_pad_template_get (&gst_negotiation_src_factory));
gst_element_class_set_details (element_class, &plugin_details);
gst_negotiation_class_init (GstNegotiationClass * klass)
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
gobject_class->set_property = gst_negotiation_set_property;
gobject_class->get_property = gst_negotiation_get_property;
gst_negotiation_init (GstNegotiation * filter)
filter->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get
(&gst_negotiation_sink_factory), "sink");
gst_pad_set_getcaps_function (filter->sinkpad, gst_negotiation_getcaps);
gst_pad_set_link_function (filter->sinkpad, gst_negotiation_pad_link);
filter->srcpad =
(&gst_negotiation_src_factory), "src");
gst_pad_set_getcaps_function (filter->srcpad, gst_negotiation_getcaps);
gst_pad_set_link_function (filter->srcpad, gst_negotiation_pad_link);
gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
gst_pad_set_chain_function (filter->sinkpad, gst_negotiation_chain);
static GstCaps *
gst_negotiation_getcaps (GstPad * pad)
GstNegotiation *negotiation = GST_NEGOTIATION (gst_pad_get_parent (pad));
GstPad *otherpad;
GstCaps *caps;
otherpad = (pad == negotiation->sinkpad) ? negotiation->srcpad :
negotiation->sinkpad;
caps = gst_pad_get_allowed_caps (otherpad);
GST_ERROR ("getcaps called on %" GST_PTR_FORMAT ", returning %"
GST_PTR_FORMAT, pad, caps);
return caps;
static GstPadLinkReturn
gst_negotiation_pad_link (GstPad * pad, const GstCaps * caps)
GstPadLinkReturn ret;
ret = gst_pad_try_set_caps (otherpad, caps);
GST_ERROR ("pad_link called on %" GST_PTR_FORMAT " with caps %"
GST_PTR_FORMAT ", returning %d", pad, caps, ret);
return ret;
gst_negotiation_chain (GstPad * pad, GstData * _data)
gst_pad_push (negotiation->srcpad, _data);
gst_negotiation_set_property (GObject * object, guint prop_id,
const GValue * value, GParamSpec * pspec)
GstNegotiation *filter;
g_return_if_fail (GST_IS_NEGOTIATION (object));
filter = GST_NEGOTIATION (object);
switch (prop_id) {
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
gst_negotiation_get_property (GObject * object, guint prop_id,
GValue * value, GParamSpec * pspec)
gboolean
gst_negotiation_plugin_init (GstPlugin * plugin)
if (!gst_element_register (plugin, "negotiation", GST_RANK_NONE,
GST_TYPE_NEGOTIATION))
return FALSE;
|