Menu
▾
▴
[gst-cvs] rbultje gst-plugins: gst-plugins/ext/mpeg2dec/ gst-plugins/gst-libs/gst/audio/ gst-plugins/gst/y4m/
|
From: Ronald B. <rb...@us...> - 2003-07-06 20:50:27
|
CVS Root: /cvsroot/gstreamer
Module: gst-plugins
Changes by: rbultje
Date: Sun Jul 06 2003 13:50:22 PDT
Log message:
New mimetypes gone into effect today - this commit changes all old mimetypes over to the new mimetypes spec as described in the previous commit's document. Note: some plugins will break, some pipelines will break, expect HEAD to be broken or at least not 100% working for a few days, but don't forget to report bugs
Modified files:
ext/mpeg2dec : gstmpeg2dec.c
gst-libs/gst/audio: audio.h
gst/y4m : gsty4mencode.c gsty4mencode.h
Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/mpeg2dec/gstmpeg2dec.c.diff?r1=1.37&r2=1.38
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-libs/gst/audio/audio.h.diff?r1=1.4&r2=1.5
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/y4m/gsty4mencode.c.diff?r1=1.13&r2=1.14
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/y4m/gsty4mencode.h.diff?r1=1.3&r2=1.4
====Begin Diffs====
Index: gsty4mencode.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/y4m/gsty4mencode.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gsty4mencode.c 29 Jun 2003 19:46:07 -0000 1.13
+++ gsty4mencode.c 6 Jul 2003 20:49:49 -0000 1.14
@@ -21,14 +21,16 @@
#include "config.h"
#endif
#include <string.h>
+#include <math.h>
#include <gst/gst.h>
+#include <gst/video/video.h>
#include "gsty4mencode.h"
-static GstElementDetails lavencode_details = {
- "LavEncode",
+static GstElementDetails y4mencode_details = {
+ "Y4mEncode",
"Codec/Video/Encoder",
"LGPL",
- "Encodes a YUV frame into the lav format (mjpeg_tools)",
+ "Encodes a YUV frame into the yuv4mpeg format (mjpegtools)",
VERSION,
"Wim Taymans <wim...@ch...>",
"(C) 2001",
@@ -45,65 +47,75 @@
ARG_0
};
-GST_PAD_TEMPLATE_FACTORY (lavencode_src_factory,
+GST_PAD_TEMPLATE_FACTORY (y4mencode_src_factory,
"src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
GST_CAPS_NEW (
"test_src",
- "application/x-lav",
- NULL
+ "application/x-yuv4mpeg",
+ "y4mversion", GST_PROPS_INT (1)
)
)
-GST_PAD_TEMPLATE_FACTORY (lavencode_sink_factory,
+GST_PAD_TEMPLATE_FACTORY (y4mencode_sink_factory,
"sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_CAPS_NEW (
+ gst_caps_new (
"test_src",
- "video/raw",
- "format", GST_PROPS_FOURCC (GST_STR_FOURCC ("I420")),
- "width", GST_PROPS_INT_RANGE (0, G_MAXINT),
- "height", GST_PROPS_INT_RANGE (0, G_MAXINT)
+ "video/x-raw-yuv",
+ GST_VIDEO_YUV_PAD_TEMPLATE_PROPS (
+ GST_PROPS_FOURCC (GST_STR_FOURCC ("I420")))
)
)
-static void gst_lavencode_class_init (GstLavEncodeClass *klass);
-static void gst_lavencode_init (GstLavEncode *filter);
+static void gst_y4mencode_class_init (GstY4mEncodeClass *klass);
+static void gst_y4mencode_init (GstY4mEncode *filter);
-static void gst_lavencode_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void gst_lavencode_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void gst_y4mencode_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gst_y4mencode_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
-static void gst_lavencode_chain (GstPad *pad, GstBuffer *buf);
-static GstElementStateReturn gst_lavencode_change_state (GstElement *element);
+static void gst_y4mencode_chain (GstPad *pad,
+ GstBuffer *buf);
+static GstElementStateReturn
+ gst_y4mencode_change_state (GstElement *element);
static GstElementClass *parent_class = NULL;
/*static guint gst_filter_signals[LAST_SIGNAL] = { 0 }; */
GType
-gst_lavencode_get_type(void) {
- static GType lavencode_type = 0;
+gst_y4mencode_get_type(void) {
+ static GType y4mencode_type = 0;
- if (!lavencode_type) {
- static const GTypeInfo lavencode_info = {
- sizeof(GstLavEncodeClass), NULL,
+ if (!y4mencode_type) {
+ static const GTypeInfo y4mencode_info = {
+ sizeof(GstY4mEncodeClass),
NULL,
- (GClassInitFunc)gst_lavencode_class_init,
+ NULL,
+ (GClassInitFunc)gst_y4mencode_class_init,
NULL,
NULL,
- sizeof(GstLavEncode),
+ sizeof(GstY4mEncode),
0,
- (GInstanceInitFunc)gst_lavencode_init,
+ (GInstanceInitFunc)gst_y4mencode_init,
};
- lavencode_type = g_type_register_static(GST_TYPE_ELEMENT, "GstLavEncode", &lavencode_info, 0);
+ y4mencode_type = g_type_register_static(GST_TYPE_ELEMENT,
+ "GstY4mEncode",
+ &y4mencode_info, 0);
}
- return lavencode_type;
+ return y4mencode_type;
}
static void
-gst_lavencode_class_init (GstLavEncodeClass *klass)
+gst_y4mencode_class_init (GstY4mEncodeClass *klass)
{
GObjectClass *gobject_class;
GstElementClass *gstelement_class;
@@ -113,48 +125,74 @@
parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
- gstelement_class->change_state = gst_lavencode_change_state;
+ gstelement_class->change_state = gst_y4mencode_change_state;
- gobject_class->set_property = gst_lavencode_set_property;
- gobject_class->get_property = gst_lavencode_get_property;
+ gobject_class->set_property = gst_y4mencode_set_property;
+ gobject_class->get_property = gst_y4mencode_get_property;
}
static GstPadLinkReturn
-gst_lavencode_sinkconnect (GstPad *pad, GstCaps *caps)
+gst_y4mencode_sinkconnect (GstPad *pad, GstCaps *caps)
{
- GstLavEncode *filter;
+ GstY4mEncode *filter;
+ gint idx = -1, i;
+ gfloat fps;
+ float framerates[] = {
+ 00.000,
+ 23.976, 24.000, /* 24fps movie */
+ 25.000, /* PAL */
+ 29.970, 30.000, /* NTSC */
+ 50.000,
+ 59.940, 60.000
+ };
- filter = GST_LAVENCODE (gst_pad_get_parent (pad));
+ filter = GST_Y4MENCODE (gst_pad_get_parent (pad));
if (!GST_CAPS_IS_FIXED (caps))
return GST_PAD_LINK_DELAYED;
gst_caps_get_int (caps, "width", &filter->width);
gst_caps_get_int (caps, "height", &filter->height);
+ gst_caps_get_float (caps, "framerate", &fps);
+
+ /* find fps idx */
+ for (i = 1; i < 9; i++) {
+ if (idx == -1) {
+ idx = i;
+ } else {
+ gfloat old_diff = fabs(framerates[idx] - fps),
+ new_diff = fabs(framerates[i] - fps);
+
+ if (new_diff < old_diff) {
+ idx = i;
+ }
+ }
+ }
+ filter->fps_idx = idx;
return GST_PAD_LINK_OK;
}
static void
-gst_lavencode_init (GstLavEncode *filter)
+gst_y4mencode_init (GstY4mEncode *filter)
{
filter->sinkpad = gst_pad_new_from_template(
- GST_PAD_TEMPLATE_GET (lavencode_sink_factory), "sink");
+ GST_PAD_TEMPLATE_GET (y4mencode_sink_factory), "sink");
gst_element_add_pad (GST_ELEMENT (filter), filter->sinkpad);
- gst_pad_set_chain_function (filter->sinkpad, gst_lavencode_chain);
- gst_pad_set_link_function (filter->sinkpad, gst_lavencode_sinkconnect);
+ gst_pad_set_chain_function (filter->sinkpad, gst_y4mencode_chain);
+ gst_pad_set_link_function (filter->sinkpad, gst_y4mencode_sinkconnect);
filter->srcpad = gst_pad_new_from_template(
- GST_PAD_TEMPLATE_GET (lavencode_src_factory), "src");
+ GST_PAD_TEMPLATE_GET (y4mencode_src_factory), "src");
gst_element_add_pad (GST_ELEMENT (filter), filter->srcpad);
filter->init = TRUE;
}
static void
-gst_lavencode_chain (GstPad *pad,GstBuffer *buf)
+gst_y4mencode_chain (GstPad *pad,GstBuffer *buf)
{
- GstLavEncode *filter;
+ GstY4mEncode *filter;
GstBuffer* outbuf;
gchar *header;
gint len;
@@ -163,9 +201,9 @@
g_return_if_fail(GST_IS_PAD(pad));
g_return_if_fail(buf != NULL);
- filter = GST_LAVENCODE (gst_pad_get_parent (pad));
+ filter = GST_Y4MENCODE (gst_pad_get_parent (pad));
g_return_if_fail(filter != NULL);
- g_return_if_fail(GST_IS_LAVENCODE(filter));
+ g_return_if_fail(GST_IS_Y4MENCODE(filter));
outbuf = gst_buffer_new ();
GST_BUFFER_DATA (outbuf) = g_malloc (GST_BUFFER_SIZE (buf) + 256);
@@ -178,7 +216,8 @@
header = "FRAME\n";
}
- snprintf (GST_BUFFER_DATA (outbuf), 255, header, filter->width, filter->height, 3);
+ snprintf (GST_BUFFER_DATA (outbuf), 255, header,
+ filter->width, filter->height, filter->fps_idx);
len = strlen (GST_BUFFER_DATA (outbuf));
memcpy (GST_BUFFER_DATA (outbuf) + len, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
@@ -190,13 +229,13 @@
}
static void
-gst_lavencode_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+gst_y4mencode_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
{
- GstLavEncode *filter;
+ GstY4mEncode *filter;
/* it's not null if we got it, but it might not be ours */
- g_return_if_fail(GST_IS_LAVENCODE(object));
- filter = GST_LAVENCODE(object);
+ g_return_if_fail(GST_IS_Y4MENCODE(object));
+ filter = GST_Y4MENCODE(object);
switch (prop_id) {
default:
@@ -205,13 +244,13 @@
}
static void
-gst_lavencode_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+gst_y4mencode_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
{
- GstLavEncode *filter;
+ GstY4mEncode *filter;
/* it's not null if we got it, but it might not be ours */
- g_return_if_fail(GST_IS_LAVENCODE(object));
- filter = GST_LAVENCODE(object);
+ g_return_if_fail(GST_IS_Y4MENCODE(object));
+ filter = GST_Y4MENCODE(object);
switch (prop_id) {
default:
@@ -221,13 +260,13 @@
}
static GstElementStateReturn
-gst_lavencode_change_state (GstElement *element)
+gst_y4mencode_change_state (GstElement *element)
{
- GstLavEncode *filter;
+ GstY4mEncode *filter;
- g_return_val_if_fail (GST_IS_LAVENCODE (element), GST_STATE_FAILURE);
+ g_return_val_if_fail (GST_IS_Y4MENCODE (element), GST_STATE_FAILURE);
- filter = GST_LAVENCODE(element);
+ filter = GST_Y4MENCODE(element);
if (GST_STATE_TRANSITION (element) == GST_STATE_NULL_TO_READY) {
filter->init = TRUE;
@@ -244,14 +283,14 @@
{
GstElementFactory *factory;
- factory = gst_element_factory_new("lavenc",GST_TYPE_LAVENCODE,
- &lavencode_details);
+ factory = gst_element_factory_new("y4menc",GST_TYPE_Y4MENCODE,
+ &y4mencode_details);
g_return_val_if_fail(factory != NULL, FALSE);
gst_element_factory_add_pad_template (factory,
- GST_PAD_TEMPLATE_GET (lavencode_src_factory));
+ GST_PAD_TEMPLATE_GET (y4mencode_src_factory));
gst_element_factory_add_pad_template (factory,
- GST_PAD_TEMPLATE_GET (lavencode_sink_factory));
+ GST_PAD_TEMPLATE_GET (y4mencode_sink_factory));
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
@@ -261,6 +300,6 @@
GstPluginDesc plugin_desc = {
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- "lavenc",
+ "y4menc",
plugin_init
};
Index: gsty4mencode.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst/y4m/gsty4mencode.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gsty4mencode.h 20 Mar 2002 21:45:02 -0000 1.3
+++ gsty4mencode.h 6 Jul 2003 20:49:49 -0000 1.4
@@ -18,8 +18,8 @@
*/
-#ifndef __GST_LAVENCODE_H__
-#define __GST_LAVENCODE_H__
+#ifndef __GST_Y4MENCODE_H__
+#define __GST_Y4MENCODE_H__
#include <config.h>
@@ -32,40 +32,41 @@
#endif /* __cplusplus */
-#define GST_TYPE_LAVENCODE \
- (gst_lavencode_get_type())
-#define GST_LAVENCODE(obj) \
- (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_LAVENCODE,GstLavEncode))
-#define GST_LAVENCODE_CLASS(klass) \
- (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstLavEncode))
-#define GST_IS_LAVENCODE(obj) \
- (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_LAVENCODE))
-#define GST_IS_LAVENCODE_CLASS(obj) \
- (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_LAVENCODE))
+#define GST_TYPE_Y4MENCODE \
+ (gst_y4mencode_get_type())
+#define GST_Y4MENCODE(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_Y4MENCODE,GstY4mEncode))
+#define GST_Y4MENCODE_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstY4mEncode))
+#define GST_IS_Y4MENCODE(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_Y4MENCODE))
+#define GST_IS_Y4MENCODE_CLASS(obj) \
+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_Y4MENCODE))
-typedef struct _GstLavEncode GstLavEncode;
-typedef struct _GstLavEncodeClass GstLavEncodeClass;
+typedef struct _GstY4mEncode GstY4mEncode;
+typedef struct _GstY4mEncodeClass GstY4mEncodeClass;
-struct _GstLavEncode {
+struct _GstY4mEncode {
GstElement element;
GstPad *sinkpad,*srcpad;
gint width, height;
+ gfloat fps_idx;
gboolean init;
};
-struct _GstLavEncodeClass {
+struct _GstY4mEncodeClass {
GstElementClass parent_class;
};
-GType gst_lavencode_get_type(void);
+GType gst_y4mencode_get_type(void);
#ifdef __cplusplus
}
#endif /* __cplusplus */
-#endif /* __GST_STEREO_H__ */
+#endif /* __GST_Y4MENCODE_H__ */
Index: gstmpeg2dec.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/mpeg2dec/gstmpeg2dec.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gstmpeg2dec.c 29 Jun 2003 19:45:18 -0000 1.37
+++ gstmpeg2dec.c 6 Jul 2003 20:49:19 -0000 1.38
@@ -55,21 +55,16 @@
GST_PAD_ALWAYS,
GST_CAPS_NEW (
"mpeg2dec_src",
- "video/raw",
- "format", GST_PROPS_FOURCC (GST_MAKE_FOURCC ('Y','V','1','2')),
- "width", GST_PROPS_INT_RANGE (16, 4096),
- "height", GST_PROPS_INT_RANGE (16, 4096),
- "pixel_width", GST_PROPS_INT_RANGE (1, 255),
- "pixel_height", GST_PROPS_INT_RANGE (1, 255)
- ),
- GST_CAPS_NEW (
- "mpeg2dec_src",
- "video/raw",
- "format", GST_PROPS_FOURCC (GST_MAKE_FOURCC ('I','4','2','0')),
+ "video/x-raw-yuv",
+ "format", GST_PROPS_LIST (
+ GST_PROPS_FOURCC (GST_MAKE_FOURCC ('Y','V','1','2')),
+ GST_PROPS_FOURCC (GST_MAKE_FOURCC ('I','4','2','0'))
+ ),
"width", GST_PROPS_INT_RANGE (16, 4096),
"height", GST_PROPS_INT_RANGE (16, 4096),
"pixel_width", GST_PROPS_INT_RANGE (1, 255),
- "pixel_height", GST_PROPS_INT_RANGE (1, 255)
+ "pixel_height", GST_PROPS_INT_RANGE (1, 255),
+ "framerate", GST_PROPS_FLOAT_RANGE (0, G_MAXFLOAT)
)
);
@@ -91,6 +86,7 @@
GST_CAPS_NEW (
"mpeg2dec_sink",
"video/mpeg",
+ /* width/height/framerate not needed */
"mpegversion", GST_PROPS_INT_RANGE (1, 2),
"systemstream", GST_PROPS_BOOLEAN (FALSE)
)
@@ -316,18 +312,19 @@
if (!allowed) {
allowed = GST_CAPS_NEW (
"mpeg2dec_negotiate",
- "video/raw",
+ "video/x-raw-yuv",
"format", GST_PROPS_FOURCC (GST_STR_FOURCC ("I420"))
);
}
to_intersect = GST_CAPS_NEW (
"mpeg2dec_negotiate",
- "video/raw",
+ "video/x-raw-yuv",
"width", GST_PROPS_INT (mpeg2dec->width),
"height", GST_PROPS_INT (mpeg2dec->height),
"pixel_width", GST_PROPS_INT (mpeg2dec->pixel_width),
- "pixel_height", GST_PROPS_INT (mpeg2dec->pixel_height)
+ "pixel_height", GST_PROPS_INT (mpeg2dec->pixel_height),
+ "framerate", GST_PROPS_FLOAT (1. * GST_SECOND / mpeg2dec->frame_period)
);
/* try to fix our height */
Index: audio.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/gst-libs/gst/audio/audio.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- audio.h 9 Sep 2002 08:39:58 -0000 1.4
+++ audio.h 6 Jul 2003 20:49:49 -0000 1.5
@@ -52,8 +52,6 @@
#define GST_AUDIO_INT_PAD_TEMPLATE_PROPS \
gst_props_new (\
- "format", GST_PROPS_STRING ("int"),\
- "law", GST_PROPS_INT (0),\
"endianness", GST_PROPS_INT (G_BYTE_ORDER),\
"signed", GST_PROPS_LIST (\
GST_PROPS_BOOLEAN (TRUE),\
@@ -70,8 +68,6 @@
#define GST_AUDIO_INT_MONO_PAD_TEMPLATE_PROPS \
gst_props_new (\
- "format", GST_PROPS_STRING ("int"),\
- "law", GST_PROPS_INT (0),\
"endianness", GST_PROPS_INT (G_BYTE_ORDER),\
"signed", GST_PROPS_LIST (\
GST_PROPS_BOOLEAN (TRUE),\
@@ -88,8 +84,8 @@
#define GST_AUDIO_FLOAT_MONO_PAD_TEMPLATE_PROPS \
gst_props_new (\
- "format", GST_PROPS_STRING ("float"),\
- "layout", GST_PROPS_STRING ("gfloat"),\
+ "depth", GST_PROPS_INT (32),\
+ "endianness", GST_PROPS_INT (G_BYTE_ORDER),\
"intercept", GST_PROPS_FLOAT (0.0),\
"slope", GST_PROPS_FLOAT (1.0),\
"rate", GST_PROPS_INT_RANGE (GST_AUDIO_MIN_RATE, \
|