mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-28 17:25:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/mikmod/gstmikmod.*: fix caps negotiation in mikmod

Browse source 
Original commit message from CVS:
2004-02-10  Benjamin Otte  <in7y118@public.uni-hamburg.de>

* ext/mikmod/gstmikmod.c: (gst_mikmod_init),
(gst_mikmod_srcfixate), (gst_mikmod_srclink), (gst_mikmod_loop):
* ext/mikmod/gstmikmod.h:
fix caps negotiation in mikmod
* ext/ogg/gstoggdemux.c: (gst_ogg_print):
output debug information
This commit is contained in:
Benjamin Otte 2004-02-10 08:37:50 +00:00
parent cb84762012
commit b1c2fb3ab7
3 changed files with 52 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,12 @@
2004-02-10 Benjamin Otte <in7y118@public.uni-hamburg.de>
* ext/mikmod/gstmikmod.c: (gst_mikmod_init),
(gst_mikmod_srcfixate), (gst_mikmod_srclink), (gst_mikmod_loop):
* ext/mikmod/gstmikmod.h:
fix caps negotiation in mikmod
* ext/ogg/gstoggdemux.c: (gst_ogg_print):
output debug information
2004-02-08 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst-libs/gst/colorbalance/Makefile.am:
@ -6,12 +15,6 @@
remove unused GST_OPT_CFLAGS from Makefiles
include X_CFLAGS and X_LIBS in xoverlay. (#131948)
2004-02-08 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst-libs/gst/colorbalance/Makefile.am:
* gst-libs/gst/navigation/Makefile.am:
* gst-libs/gst/xoverlay/Makefile.am:
2004-02-07 David Schleef <ds@schleef.org>
* ext/ogg/gstoggdemux.c: (gst_ogg_demux_handle_event): Don't

71
ext/mikmod/gstmikmod.c
View file

@ -22,7 +22,6 @@
#endif
#include "gstmikmod.h"
#include <gst/audio/audio.h>
#include <stdlib.h>
/* elementfactory information */
@ -57,13 +56,32 @@ enum {
ARG_SOFT_SNDFX
};
MODULE *module;
MREADER *reader;
GstPad *srcpad;
GstClockTime timestamp;
int need_sync;
static GstStaticPadTemplate mikmod_src_factory =
GST_STATIC_PAD_TEMPLATE (
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS)
GST_STATIC_CAPS (
"audio/x-raw-int, "
"endianness = (int) BYTE_ORDER, "
"signed = (boolean) TRUE, "
"width = (int) 16, "
"depth = (int) 16, "
"rate = (int) { 8000, 11025, 22050, 44100 }, "
"channels = (int) [ 1, 2 ]; "
"audio/x-raw-int, "
"signed = (boolean) FALSE, "
"width = (int) 8, "
"depth = (int) 8, "
"rate = (int) { 8000, 11025, 22050, 44100 }, "
"channels = (int) [ 1, 2 ]"
)
);
static GstStaticPadTemplate mikmod_sink_factory =
@ -80,6 +98,7 @@ static void gst_mikmod_init (GstMikMod *filter);
static void gst_mikmod_set_property (GObject *object, guint id, const GValue *value, GParamSpec *pspec );
static void gst_mikmod_get_property (GObject *object, guint id, GValue *value, GParamSpec *pspec );
static GstPadLinkReturn gst_mikmod_srclink (GstPad *pad, const GstCaps *caps);
static GstCaps * gst_mikmod_srcfixate (GstPad *pad, const GstCaps *caps);
static void gst_mikmod_loop (GstElement *element);
static gboolean gst_mikmod_setup (GstMikMod *mikmod);
static GstElementStateReturn gst_mikmod_change_state (GstElement *element);
@ -188,11 +207,11 @@ gst_mikmod_init (GstMikMod *filter)
gst_static_pad_template_get (&mikmod_sink_factory),"sink");
filter->srcpad = gst_pad_new_from_template(
gst_static_pad_template_get (&mikmod_src_factory),"src");
gst_pad_use_explicit_caps (filter->srcpad);
gst_element_add_pad(GST_ELEMENT(filter),filter->sinkpad);
gst_element_add_pad(GST_ELEMENT(filter),filter->srcpad);
gst_pad_set_link_function (filter->srcpad, gst_mikmod_srclink);
gst_pad_set_fixate_function (filter->srcpad, gst_mikmod_srcfixate);
gst_element_set_loop_function (GST_ELEMENT (filter), gst_mikmod_loop);
@ -213,32 +232,28 @@ gst_mikmod_init (GstMikMod *filter)
filter->modtype = NULL;
}
static GstPadLinkReturn
gst_mikmod_negotiate (GstMikMod *mikmod)
static GstCaps *
gst_mikmod_srcfixate (GstPad *pad, const GstCaps *caps)
{
gint width, sign;
GstCaps *ret;
GstStructure *structure;
/* FIXME: select est caps here */
if (gst_caps_get_size (caps) > 1)
return NULL;
if ( mikmod->_16bit ) {
width = 16;
sign = TRUE;
} else {
width = 8;
sign = FALSE;
}
ret = gst_caps_copy (caps);
structure = gst_caps_get_structure (ret, 0);
if (gst_caps_structure_fixate_field_nearest_int (structure, "channels", 2))
return ret;
if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", 44100))
return ret;
return gst_pad_set_explicit_caps (mikmod->srcpad,
gst_caps_new_simple ( "audio/x-raw-int",
"endianness", G_TYPE_INT, G_BYTE_ORDER,
"signed", G_TYPE_BOOLEAN, sign,
"width", G_TYPE_INT, width,
"depth", G_TYPE_INT, width,
"rate", G_TYPE_INT, mikmod->mixfreq,
"channels", G_TYPE_INT, mikmod->stereo ? 2 : 1,
NULL));
gst_caps_free (ret);
return NULL;
}
static GstPadLinkReturn
gst_mikmod_srclink (GstPad *pad, const GstCaps *caps)
{
@ -256,11 +271,10 @@ gst_mikmod_srclink (GstPad *pad, const GstCaps *caps)
gst_structure_get_int (structure, "channels", &channels);
filter->stereo = (channels == 2);
gst_structure_get_int (structure, "rate", &filter->mixfreq);
return gst_mikmod_negotiate(filter);
return gst_mikmod_setup (filter) ? GST_PAD_LINK_OK : GST_PAD_LINK_REFUSED;
}
static void
gst_mikmod_loop (GstElement *element)
{
@ -293,12 +307,11 @@ gst_mikmod_loop (GstElement *element)
}
if (!GST_PAD_CAPS (mikmod->srcpad)) {
if (gst_mikmod_negotiate (mikmod) <= 0) {
if (GST_PAD_LINK_SUCCESSFUL (gst_pad_renegotiate (mikmod->srcpad))) {
GST_ELEMENT_ERROR (mikmod, CORE, NEGOTIATION, (NULL), (NULL));
return;
}
}
gst_mikmod_setup( mikmod );
MikMod_RegisterDriver(&drv_gst);
MikMod_RegisterAllLoaders();

2
ext/mikmod/gstmikmod.h
View file

@ -75,7 +75,7 @@ typedef struct _GstMikModClass GstMikModClass;
extern MODULE *module;
extern MREADER *reader;
extern GstPad *srcpad;
extern gint64 timestamp;
extern GstClockTime timestamp;
extern int need_sync;
GType gst_mikmod_get_type(void);