mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 07:35:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

xviddec and xvideenc ported to 0.10

Browse source 
Original commit message from CVS:
xviddec and xvideenc ported to 0.10
This commit is contained in:
Edgard Lima 2005-12-14 22:41:47 +00:00
parent 03fa6ba8b1
commit 96e747214a
9 changed files with 236 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2005-12-14 Edgard Lima <edgard.lima@indt.org.br>
* configure.ac:
* ext/Makefile.am:
* ext/xvid/gstxvid.c:
* ext/xvid/gstxvid.h:
* ext/xvid/gstxviddec.c:
* ext/xvid/gstxviddec.h:
* ext/xvid/gstxvidenc.c:
* ext/xvid/gstxvidenc.h:
xviddec and xvideenc ported to 0.10
2005-12-14 Edgard Lima <edgard.lima@indt.org.br> 2005-12-14 Edgard Lima <edgard.lima@indt.org.br>
* configure.ac: * configure.ac:

32
configure.ac
View file

@ -399,7 +399,6 @@ GST_CHECK_FEATURE(DTS, [dts library], dtsdec, [
AC_SUBST(DTS_LIBS) AC_SUBST(DTS_LIBS)
]) ])
dnl *** musepack *** dnl *** musepack ***
translit(dnm, m, l) AM_CONDITIONAL(USE_MUSEPACK, true) translit(dnm, m, l) AM_CONDITIONAL(USE_MUSEPACK, true)
GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [ GST_CHECK_FEATURE(MUSEPACK, [musepackdec], musepack, [
@ -471,6 +470,36 @@ GST_CHECK_FEATURE(GSM, [GSM library], gsmenc gsmdec, [
AC_SUBST(GSM_LIBS) AC_SUBST(GSM_LIBS)
]) ])
dnl *** XVID ***
translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true)
GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
HAVE_XVID=no
AC_CHECK_HEADER(xvid.h, [
OLD_LIBS="$LIBS"
LIBS="-lm"
AC_CHECK_LIB(xvidcore, xvid_encore, [
AC_CHECK_LIB(xvidcore, xvid_decore, [
AC_CHECK_LIB(xvidcore, xvid_global, [
AC_MSG_CHECKING([for uptodate XviD API version])
AC_TRY_RUN([
#include <xvid.h>
#if XVID_API_MAJOR(XVID_API) != 4
#error "Incompatible XviD API version"
#endif
int main () { return 0; }
],[ AC_MSG_RESULT(yes)
XVID_LIBS="-lxvidcore -lm"
AC_SUBST(XVID_LIBS)
HAVE_XVID=yes
], AC_MSG_RESULT(no) )
], )
], )
], )
LIBS="$OLD_LIBS"
], )
])
dnl also add builddir include for enumtypes and marshal dnl also add builddir include for enumtypes and marshal
GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_ERROR" GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_ERROR"
@ -552,6 +581,7 @@ ext/libmms/Makefile
ext/dts/Makefile ext/dts/Makefile
ext/musepack/Makefile ext/musepack/Makefile
ext/sdl/Makefile ext/sdl/Makefile
ext/xvid/Makefile
docs/Makefile docs/Makefile
docs/plugins/Makefile docs/plugins/Makefile
docs/version.entities docs/version.entities

11
ext/Makefile.am
View file

@ -190,11 +190,11 @@ TARKIN_DIR=
XINE_DIR= XINE_DIR=
# endif # endif
# if USE_XVID if USE_XVID
# XVID_DIR=xvid XVID_DIR=xvid
# else else
XVID_DIR= XVID_DIR=
# endif endif
SUBDIRS=\ SUBDIRS=\
$(ARTS_DIR) \ $(ARTS_DIR) \
@ -242,4 +242,5 @@ DIST_SUBDIRS= \
musepack \ musepack \
sdl \ sdl \
swfdec \ swfdec \
wavpack wavpack \
xvid

8
ext/xvid/gstxvid.c
View file

@ -166,7 +166,6 @@ gst_xvid_structure_to_csp (GstStructure * structure,
stride = w * bpp / 8; stride = w * bpp / 8;
} }
if (_stride) if (_stride)
*_stride = stride; *_stride = stride;
if (_bpp) if (_bpp)
@ -176,7 +175,7 @@ gst_xvid_structure_to_csp (GstStructure * structure,
} }
GstCaps * GstCaps *
gst_xvid_csp_to_caps (gint csp, gint w, gint h, gdouble fps) gst_xvid_csp_to_caps (gint csp, gint w, gint h, gint fps_n, gint fps_d)
{ {
GstCaps *caps = NULL; GstCaps *caps = NULL;
@ -263,7 +262,7 @@ gst_xvid_csp_to_caps (gint csp, gint w, gint h, gdouble fps)
"red_mask", G_TYPE_INT, r_mask, "red_mask", G_TYPE_INT, r_mask,
"green_mask", G_TYPE_INT, g_mask, "green_mask", G_TYPE_INT, g_mask,
"blue_mask", G_TYPE_INT, b_mask, "blue_mask", G_TYPE_INT, b_mask,
"framerate", G_TYPE_DOUBLE, fps, NULL); "framerate", GST_TYPE_FRACTION, fps_n, fps_d, NULL);
break; break;
} }
@ -291,12 +290,11 @@ gst_xvid_csp_to_caps (gint csp, gint w, gint h, gdouble fps)
fourcc = GST_MAKE_FOURCC ('Y', 'V', '1', '2'); fourcc = GST_MAKE_FOURCC ('Y', 'V', '1', '2');
break; break;
} }
caps = gst_caps_new_simple ("video/x-raw-yuv", caps = gst_caps_new_simple ("video/x-raw-yuv",
"width", G_TYPE_INT, w, "width", G_TYPE_INT, w,
"height", G_TYPE_INT, h, "height", G_TYPE_INT, h,
"format", GST_TYPE_FOURCC, fourcc, "format", GST_TYPE_FOURCC, fourcc,
"framerate", G_TYPE_DOUBLE, fps, NULL); "framerate", GST_TYPE_FRACTION, fps_n, fps_d, NULL);
break; break;
} }
} }

3
ext/xvid/gstxvid.h
View file

@ -47,7 +47,8 @@ extern gboolean gst_xvid_init (void);
extern gint gst_xvid_structure_to_csp (GstStructure *structure, extern gint gst_xvid_structure_to_csp (GstStructure *structure,
gint w, gint *stride, gint *bpp); gint w, gint *stride, gint *bpp);
extern GstCaps *gst_xvid_csp_to_caps (gint csp, gint w, gint h, gdouble fps); extern GstCaps *gst_xvid_csp_to_caps (gint csp, gint w, gint h,
gint fps_n, gint fps_d);
G_END_DECLS G_END_DECLS

204
ext/xvid/gstxviddec.c
View file

@ -40,7 +40,7 @@ static GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-xvid, " GST_STATIC_CAPS ("video/x-xvid, "
"width = (int) [ 0, MAX ], " "width = (int) [ 0, MAX ], "
"height = (int) [ 0, MAX ], " "framerate = (double) [ 0, MAX ]") "height = (int) [ 0, MAX ], " "framerate = (fraction) [0/1, MAX]")
); );
static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src", static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
@ -69,24 +69,19 @@ enum
/* FILL ME */ /* FILL ME */
}; };
static void gst_xviddec_base_init (gpointer g_class); static void gst_xviddec_base_init (GstXvidDecClass * klass);
static void gst_xviddec_class_init (GstXvidDecClass * klass); static void gst_xviddec_class_init (GstXvidDecClass * klass);
static void gst_xviddec_init (GstXvidDec * xviddec); static void gst_xviddec_init (GstXvidDec * xviddec);
static void gst_xviddec_chain (GstPad * pad, GstData * data); static GstFlowReturn gst_xviddec_chain (GstPad * pad, GstBuffer * buf);
static GstPadLinkReturn static gboolean gst_xviddec_setcaps (GstPad * pad, GstCaps * caps);
gst_xviddec_sink_link (GstPad * pad, const GstCaps * vscapslist); static gboolean gst_xviddec_negotiate (GstXvidDec * xviddec);
static GstPadLinkReturn
gst_xviddec_src_link (GstPad * pad, const GstCaps * vscapslist);
static GstCaps *gst_xviddec_src_getcaps (GstPad * pad);
static GstStateChangeReturn gst_xviddec_change_state (GstElement * element, static GstStateChangeReturn gst_xviddec_change_state (GstElement * element,
GstStateChange transition); GstStateChange transition);
static GstElementClass *parent_class = NULL; static GstElementClass *parent_class = NULL;
/* static guint gst_xviddec_signals[LAST_SIGNAL] = { 0 }; */ /* static guint gst_xviddec_signals[LAST_SIGNAL] = { 0 }; */
GType GType
gst_xviddec_get_type (void) gst_xviddec_get_type (void)
{ {
@ -95,7 +90,7 @@ gst_xviddec_get_type (void)
if (!xviddec_type) { if (!xviddec_type) {
static const GTypeInfo xviddec_info = { static const GTypeInfo xviddec_info = {
sizeof (GstXvidDecClass), sizeof (GstXvidDecClass),
gst_xviddec_base_init, (GBaseInitFunc) gst_xviddec_base_init,
NULL, NULL,
(GClassInitFunc) gst_xviddec_class_init, (GClassInitFunc) gst_xviddec_class_init,
NULL, NULL,
@ -112,9 +107,9 @@ gst_xviddec_get_type (void)
} }
static void static void
gst_xviddec_base_init (gpointer g_class) gst_xviddec_base_init (GstXvidDecClass * klass)
{ {
GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
gst_element_class_add_pad_template (element_class, gst_element_class_add_pad_template (element_class,
gst_static_pad_template_get (&sink_template)); gst_static_pad_template_get (&sink_template));
@ -127,14 +122,13 @@ gst_xviddec_base_init (gpointer g_class)
static void static void
gst_xviddec_class_init (GstXvidDecClass * klass) gst_xviddec_class_init (GstXvidDecClass * klass)
{ {
GstElementClass *gstelement_class = (GstElementClass *) klass; GstElementClass *gstelement_class = GST_ELEMENT_CLASS (klass);
parent_class = g_type_class_ref (GST_TYPE_ELEMENT); parent_class = g_type_class_peek_parent (klass);
gstelement_class->change_state = gst_xviddec_change_state; gstelement_class->change_state = gst_xviddec_change_state;
} }
static void static void
gst_xviddec_init (GstXvidDec * xviddec) gst_xviddec_init (GstXvidDec * xviddec)
{ {
@ -145,18 +139,15 @@ gst_xviddec_init (GstXvidDec * xviddec)
gst_pad_new_from_template (gst_static_pad_template_get (&sink_template), gst_pad_new_from_template (gst_static_pad_template_get (&sink_template),
"sink"); "sink");
gst_element_add_pad (GST_ELEMENT (xviddec), xviddec->sinkpad); gst_element_add_pad (GST_ELEMENT (xviddec), xviddec->sinkpad);
gst_pad_set_chain_function (xviddec->sinkpad, gst_xviddec_chain); gst_pad_set_chain_function (xviddec->sinkpad, gst_xviddec_chain);
gst_pad_set_link_function (xviddec->sinkpad, gst_xviddec_sink_link); gst_pad_set_setcaps_function (xviddec->sinkpad, gst_xviddec_setcaps);
/* create the src pad */ /* create the src pad */
xviddec->srcpad = xviddec->srcpad =
gst_pad_new_from_template (gst_static_pad_template_get (&src_template), gst_pad_new_from_template (gst_static_pad_template_get (&src_template),
"src"); "src");
gst_element_add_pad (GST_ELEMENT (xviddec), xviddec->srcpad); gst_element_add_pad (GST_ELEMENT (xviddec), xviddec->srcpad);
gst_pad_use_fixed_caps (xviddec->srcpad);
gst_pad_set_getcaps_function (xviddec->srcpad, gst_xviddec_src_getcaps);
gst_pad_set_link_function (xviddec->srcpad, gst_xviddec_src_link);
/* size, etc. */ /* size, etc. */
xviddec->width = xviddec->height = xviddec->csp = -1; xviddec->width = xviddec->height = xviddec->csp = -1;
@ -196,36 +187,30 @@ gst_xviddec_setup (GstXvidDec * xviddec)
} }
xviddec->handle = xdec.handle; xviddec->handle = xdec.handle;
return TRUE; return TRUE;
} }
static GstFlowReturn
static void gst_xviddec_chain (GstPad * pad, GstBuffer * buf)
gst_xviddec_chain (GstPad * pad, GstData * _data)
{ {
GstBuffer *buf = GST_BUFFER (_data); GstXvidDec *xviddec = GST_XVIDDEC (gst_pad_get_parent (pad));
GstXvidDec *xviddec = GST_XVIDDEC (GST_OBJECT_PARENT (pad)); GstBuffer *outbuf = NULL;
GstBuffer *outbuf;
xvid_dec_frame_t xframe; xvid_dec_frame_t xframe;
int ret; GstFlowReturn ret = GST_FLOW_OK;
int error = 0;
g_return_if_fail (pad != NULL); if (xviddec->handle == NULL) {
g_return_if_fail (GST_IS_PAD (pad)); if (!gst_xviddec_negotiate (xviddec))
goto not_negotiated;
if (!xviddec->handle) {
GST_ELEMENT_ERROR (xviddec, CORE, NEGOTIATION, (NULL),
("format wasn't negotiated before chain function"));
gst_buffer_unref (buf);
return;
} }
outbuf = gst_buffer_new_and_alloc (xviddec->width * guint bufsize = (xviddec->width * xviddec->height * xviddec->bpp / 8);
xviddec->height * xviddec->bpp / 8);
outbuf = gst_buffer_new_and_alloc (bufsize);
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf); GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buf); GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buf);
GST_BUFFER_SIZE (outbuf) = xviddec->width * GST_BUFFER_SIZE (outbuf) = bufsize;
xviddec->height * xviddec->bpp / 8;
/* decode and so ... */ /* decode and so ... */
gst_xvid_init_struct (xframe); gst_xvid_init_struct (xframe);
@ -247,23 +232,39 @@ gst_xviddec_chain (GstPad * pad, GstData * _data)
xframe.output.stride[0] = xviddec->stride; xframe.output.stride[0] = xviddec->stride;
} }
if ((ret = xvid_decore (xviddec->handle, XVID_DEC_DECODE, &xframe, NULL)) < 0) { if ((error =
xvid_decore (xviddec->handle, XVID_DEC_DECODE, &xframe, NULL)) < 0) {
goto not_decoding;
}
gst_buffer_set_caps (outbuf, GST_PAD_CAPS (xviddec->srcpad));
gst_pad_push (xviddec->srcpad, outbuf);
gst_buffer_unref (buf);
return ret;
not_negotiated:
{
GST_ELEMENT_ERROR (xviddec, CORE, NEGOTIATION, (NULL),
("format wasn't negotiated before chain function"));
gst_buffer_unref (buf);
return GST_FLOW_NOT_NEGOTIATED;
}
not_decoding:
{
GST_ELEMENT_ERROR (xviddec, STREAM, DECODE, (NULL), GST_ELEMENT_ERROR (xviddec, STREAM, DECODE, (NULL),
("Error decoding xvid frame: %s (%d)\n", gst_xvid_error (ret), ret)); ("Error decoding xvid frame: %s (%d)\n", gst_xvid_error (error),
error));
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
return; return GST_FLOW_ERROR;
}
} }
gst_pad_push (xviddec->srcpad, GST_DATA (outbuf)); static gboolean
gst_buffer_unref (buf); gst_xviddec_negotiate (GstXvidDec * xviddec)
}
static GstCaps *
gst_xviddec_src_getcaps (GstPad * pad)
{ {
GstXvidDec *xviddec = GST_XVIDDEC (gst_pad_get_parent (pad)); GstCaps *caps = NULL;
GstCaps *caps;
gint csp[] = { gint csp[] = {
XVID_CSP_I420, XVID_CSP_I420,
XVID_CSP_YV12, XVID_CSP_YV12,
@ -282,92 +283,93 @@ gst_xviddec_src_getcaps (GstPad * pad)
0 0
}, i; }, i;
if (!GST_PAD_CAPS (xviddec->sinkpad)) {
GstPadTemplate *templ = gst_static_pad_template_get (&src_template);
return gst_caps_copy (gst_pad_template_get_caps (templ));
}
caps = gst_caps_new_empty (); caps = gst_caps_new_empty ();
for (i = 0; csp[i] != 0; i++) { for (i = 0; csp[i] != 0; i++) {
GstCaps *one = gst_xvid_csp_to_caps (csp[i], xviddec->width, GstCaps *one = gst_xvid_csp_to_caps (csp[i], xviddec->width,
xviddec->height, xviddec->fps); xviddec->height, xviddec->fps_n, xviddec->fps_d);
gst_caps_append (caps, one); if (gst_pad_set_caps (xviddec->srcpad, one)) {
} GstStructure *structure = gst_caps_get_structure (one, 0);
return caps;
}
static GstPadLinkReturn
gst_xviddec_src_link (GstPad * pad, const GstCaps * vscaps)
{
GstXvidDec *xviddec = GST_XVIDDEC (gst_pad_get_parent (pad));
GstStructure *structure = gst_caps_get_structure (vscaps, 0);
if (!GST_PAD_CAPS (xviddec->sinkpad))
return GST_PAD_LINK_DELAYED;
/* if there's something old around, remove it */
if (xviddec->handle) {
gst_xviddec_unset (xviddec);
}
xviddec->csp = gst_xvid_structure_to_csp (structure, xviddec->width, xviddec->csp = gst_xvid_structure_to_csp (structure, xviddec->width,
&xviddec->stride, &xviddec->bpp); &xviddec->stride, &xviddec->bpp);
if (xviddec->csp < 0) if (xviddec->csp < 0) {
return GST_PAD_LINK_REFUSED; return FALSE;
if (!gst_xviddec_setup (xviddec))
return GST_PAD_LINK_REFUSED;
return GST_PAD_LINK_OK;
} }
static GstPadLinkReturn break;
gst_xviddec_sink_link (GstPad * pad, const GstCaps * vscaps) }
}
gst_xviddec_setup (xviddec);
return TRUE;
}
static gboolean
gst_xviddec_setcaps (GstPad * pad, GstCaps * caps)
{ {
GstXvidDec *xviddec = GST_XVIDDEC (gst_pad_get_parent (pad)); GstXvidDec *xviddec = GST_XVIDDEC (gst_pad_get_parent (pad));
GstStructure *structure; GstStructure *structure;
GstPadLinkReturn ret; const GValue *fps;
/* if there's something old around, remove it */ /* if there's something old around, remove it */
if (xviddec->handle) { if (xviddec->handle) {
gst_xviddec_unset (xviddec); gst_xviddec_unset (xviddec);
} }
if (!gst_pad_set_caps (xviddec->srcpad, caps)) {
return FALSE;
}
/* if we get here, we know the input is xvid. we /* if we get here, we know the input is xvid. we
* only need to bother with the output colorspace, * only need to bother with the output colorspace,
* which the src_link function takes care of. */ * which the src_link function takes care of. */
structure = gst_caps_get_structure (vscaps, 0); structure = gst_caps_get_structure (caps, 0);
gst_structure_get_int (structure, "width", &xviddec->width); gst_structure_get_int (structure, "width", &xviddec->width);
gst_structure_get_int (structure, "height", &xviddec->height); gst_structure_get_int (structure, "height", &xviddec->height);
gst_structure_get_double (structure, "framerate", &xviddec->fps);
ret = gst_pad_renegotiate (xviddec->srcpad); fps = gst_structure_get_value (structure, "framerate");
if (ret == GST_PAD_LINK_DELAYED) if (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps)) {
ret = GST_PAD_LINK_OK; xviddec->fps_n = gst_value_get_fraction_numerator (fps);
xviddec->fps_d = gst_value_get_fraction_denominator (fps);
} else {
xviddec->fps_n = -1;
}
return ret; return gst_xviddec_negotiate (xviddec);
} }
static GstStateChangeReturn static GstStateChangeReturn
gst_xviddec_change_state (GstElement * element, GstStateChange transition) gst_xviddec_change_state (GstElement * element, GstStateChange transition)
{ {
GstXvidDec *xviddec = GST_XVIDDEC (element); GstXvidDec *xviddec = GST_XVIDDEC (element);
GstStateChangeReturn ret;
switch (GST_STATE_PENDING (element)) { switch (transition) {
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_NULL_TO_READY:
if (xviddec->handle) { break;
gst_xviddec_unset (xviddec); case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
}
break; break;
default: default:
break; break;
} }
if (parent_class->change_state) ret = parent_class->change_state (element, transition);
return parent_class->change_state (element, transition);
return GST_STATE_CHANGE_SUCCESS; switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY:
if (xviddec->handle) {
gst_xviddec_unset (xviddec);
}
break;
case GST_STATE_CHANGE_READY_TO_NULL:
break;
default:
break;
}
return ret;
} }

2
ext/xvid/gstxviddec.h
View file

@ -54,7 +54,7 @@ struct _GstXvidDec {
/* video (output) settings */ /* video (output) settings */
gint csp, bpp, stride; gint csp, bpp, stride;
gint width, height; gint width, height;
double fps; gint fps_n, fps_d;
}; };
struct _GstXvidDecClass { struct _GstXvidDecClass {

126
ext/xvid/gstxvidenc.c
View file

@ -53,7 +53,7 @@ static GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS ("video/x-xvid, " GST_STATIC_CAPS ("video/x-xvid, "
"width = (int) [ 0, MAX ], " "width = (int) [ 0, MAX ], "
"height = (int) [ 0, MAX ], " "framerate = (double) [ 0.0, MAX ]") "height = (int) [ 0, MAX ], " "framerate = (fraction) [0/1, MAX]")
); );
@ -83,9 +83,9 @@ enum
static void gst_xvidenc_base_init (gpointer g_class); static void gst_xvidenc_base_init (gpointer g_class);
static void gst_xvidenc_class_init (GstXvidEncClass * klass); static void gst_xvidenc_class_init (GstXvidEncClass * klass);
static void gst_xvidenc_init (GstXvidEnc * xvidenc); static void gst_xvidenc_init (GstXvidEnc * xvidenc);
static void gst_xvidenc_chain (GstPad * pad, GstData * data); static GstFlowReturn gst_xvidenc_chain (GstPad * pad, GstBuffer * buf);
static GstPadLinkReturn static gboolean gst_xvidenc_setcaps (GstPad * pad, GstCaps * caps);
gst_xvidenc_link (GstPad * pad, const GstCaps * vscapslist);
/* properties */ /* properties */
static void gst_xvidenc_set_property (GObject * object, static void gst_xvidenc_set_property (GObject * object,
@ -173,13 +173,13 @@ gst_xvidenc_base_init (gpointer g_class)
static void static void
gst_xvidenc_class_init (GstXvidEncClass * klass) gst_xvidenc_class_init (GstXvidEncClass * klass)
{ {
GstElementClass *gstelement_class; GstElementClass *gstelement_class = (GstElementClass *) klass;
GObjectClass *gobject_class; GObjectClass *gobject_class = (GObjectClass *) klass;
gobject_class = (GObjectClass *) klass; parent_class = g_type_class_peek_parent (klass);
gstelement_class = (GstElementClass *) klass;
parent_class = g_type_class_ref (GST_TYPE_ELEMENT); gobject_class->set_property = gst_xvidenc_set_property;
gobject_class->get_property = gst_xvidenc_get_property;
/* encoding profile */ /* encoding profile */
g_object_class_install_property (gobject_class, ARG_PROFILE, g_object_class_install_property (gobject_class, ARG_PROFILE,
@ -201,8 +201,6 @@ gst_xvidenc_class_init (GstXvidEncClass * klass)
g_param_spec_ulong ("buffer_size", "Buffer Size", g_param_spec_ulong ("buffer_size", "Buffer Size",
"Size of the video buffers", 0, G_MAXULONG, 0, G_PARAM_READWRITE)); "Size of the video buffers", 0, G_MAXULONG, 0, G_PARAM_READWRITE));
gobject_class->set_property = gst_xvidenc_set_property;
gobject_class->get_property = gst_xvidenc_get_property;
gstelement_class->change_state = gst_xvidenc_change_state; gstelement_class->change_state = gst_xvidenc_change_state;
gst_xvidenc_signals[FRAME_ENCODED] = gst_xvidenc_signals[FRAME_ENCODED] =
@ -222,10 +220,9 @@ gst_xvidenc_init (GstXvidEnc * xvidenc)
xvidenc->sinkpad = xvidenc->sinkpad =
gst_pad_new_from_template (gst_static_pad_template_get (&sink_template), gst_pad_new_from_template (gst_static_pad_template_get (&sink_template),
"sink"); "sink");
gst_element_add_pad (GST_ELEMENT (xvidenc), xvidenc->sinkpad);
gst_pad_set_chain_function (xvidenc->sinkpad, gst_xvidenc_chain); gst_pad_set_chain_function (xvidenc->sinkpad, gst_xvidenc_chain);
gst_pad_set_link_function (xvidenc->sinkpad, gst_xvidenc_link); gst_pad_set_setcaps_function (xvidenc->sinkpad, gst_xvidenc_setcaps);
gst_element_add_pad (GST_ELEMENT (xvidenc), xvidenc->sinkpad);
/* create the src pad */ /* create the src pad */
xvidenc->srcpad = xvidenc->srcpad =
@ -263,7 +260,7 @@ gst_xvidenc_setup (GstXvidEnc * xvidenc)
xenc.global = XVID_GLOBAL_PACKED; xenc.global = XVID_GLOBAL_PACKED;
xenc.fbase = 1000000; xenc.fbase = 1000000;
xenc.fincr = (int) (xenc.fbase / xvidenc->fps); xenc.fincr = (int) (xenc.fbase / xvidenc->fps_n / xvidenc->fps_d); /* FIX? */
xenc.max_key_interval = (xvidenc->max_key_interval == -1) ? xenc.max_key_interval = (xvidenc->max_key_interval == -1) ?
(2 * xenc.fbase / xenc.fincr) : xvidenc->max_key_interval; (2 * xenc.fbase / xenc.fincr) : xvidenc->max_key_interval;
xenc.handle = NULL; xenc.handle = NULL;
@ -293,19 +290,15 @@ gst_xvidenc_setup (GstXvidEnc * xvidenc)
} }
static void static GstFlowReturn
gst_xvidenc_chain (GstPad * pad, GstData * _data) gst_xvidenc_chain (GstPad * pad, GstBuffer * buf)
{ {
GstBuffer *buf = GST_BUFFER (_data); GstXvidEnc *xvidenc = GST_XVIDENC (gst_pad_get_parent (pad));
GstXvidEnc *xvidenc = GST_XVIDENC (GST_OBJECT_PARENT (pad));
GstBuffer *outbuf; GstBuffer *outbuf;
xvid_enc_frame_t xframe; xvid_enc_frame_t xframe;
xvid_enc_stats_t xstats; xvid_enc_stats_t xstats;
gint ret; gint ret;
g_return_if_fail (pad != NULL);
g_return_if_fail (GST_IS_PAD (pad));
outbuf = gst_buffer_new_and_alloc (xvidenc->buffer_size << 10); outbuf = gst_buffer_new_and_alloc (xvidenc->buffer_size << 10);
GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf); GST_BUFFER_TIMESTAMP (outbuf) = GST_BUFFER_TIMESTAMP (buf);
GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buf); GST_BUFFER_DURATION (outbuf) = GST_BUFFER_DURATION (buf);
@ -332,7 +325,7 @@ gst_xvidenc_chain (GstPad * pad, GstData * _data)
} }
xframe.type = XVID_TYPE_AUTO; xframe.type = XVID_TYPE_AUTO;
xframe.bitstream = (void *) GST_BUFFER_DATA (outbuf); xframe.bitstream = (void *) GST_BUFFER_DATA (outbuf);
xframe.length = GST_BUFFER_MAXSIZE (outbuf); xframe.length = GST_BUFFER_SIZE (outbuf); /* GST_BUFFER_MAXSIZE */
gst_xvid_init_struct (xstats); gst_xvid_init_struct (xstats);
if ((ret = xvid_encore (xvidenc->handle, XVID_ENC_ENCODE, if ((ret = xvid_encore (xvidenc->handle, XVID_ENC_ENCODE,
@ -341,32 +334,32 @@ gst_xvidenc_chain (GstPad * pad, GstData * _data)
("Error encoding xvid frame: %s (%d)", gst_xvid_error (ret), ret)); ("Error encoding xvid frame: %s (%d)", gst_xvid_error (ret), ret));
gst_buffer_unref (buf); gst_buffer_unref (buf);
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
return; return GST_FLOW_ERROR;
} }
GST_BUFFER_SIZE (outbuf) = xstats.length; GST_BUFFER_SIZE (outbuf) = xstats.length;
if (xframe.out_flags & XVID_KEYFRAME)
GST_BUFFER_FLAG_SET (outbuf, GST_BUFFER_KEY_UNIT);
/* go out, multiply! */ /* go out, multiply! */
gst_pad_push (xvidenc->srcpad, GST_DATA (outbuf)); gst_buffer_set_caps (outbuf, GST_PAD_CAPS (xvidenc->srcpad));
gst_pad_push (xvidenc->srcpad, outbuf);
/* proclaim destiny */ /* proclaim destiny */
g_signal_emit (G_OBJECT (xvidenc), gst_xvidenc_signals[FRAME_ENCODED], 0); g_signal_emit (G_OBJECT (xvidenc), gst_xvidenc_signals[FRAME_ENCODED], 0);
/* until the final judgement */ /* until the final judgement */
gst_buffer_unref (buf); gst_buffer_unref (buf);
return GST_FLOW_OK;
} }
static GstPadLinkReturn static gboolean
gst_xvidenc_link (GstPad * pad, const GstCaps * vscaps) gst_xvidenc_setcaps (GstPad * pad, GstCaps * caps)
{ {
GstXvidEnc *xvidenc; GstXvidEnc *xvidenc;
GstStructure *structure; GstStructure *structure = gst_caps_get_structure (caps, 0);
const gchar *mime; const gchar *mime;
gint w, h; gint w, h;
double fps; const GValue *fps;
gint xvid_cs = -1, stride = -1; gint xvid_cs = -1, stride = -1;
xvidenc = GST_XVIDENC (gst_pad_get_parent (pad)); xvidenc = GST_XVIDENC (gst_pad_get_parent (pad));
@ -377,43 +370,43 @@ gst_xvidenc_link (GstPad * pad, const GstCaps * vscaps)
xvidenc->handle = NULL; xvidenc->handle = NULL;
} }
g_return_val_if_fail (gst_caps_get_size (vscaps) == 1, GST_PAD_LINK_REFUSED);
structure = gst_caps_get_structure (vscaps, 0);
gst_structure_get_int (structure, "width", &w); gst_structure_get_int (structure, "width", &w);
gst_structure_get_int (structure, "height", &h); gst_structure_get_int (structure, "height", &h);
gst_structure_get_double (structure, "framerate", &fps);
fps = gst_structure_get_value (structure, "framerate");
if (fps != NULL && GST_VALUE_HOLDS_FRACTION (fps)) {
xvidenc->fps_n = gst_value_get_fraction_numerator (fps);
xvidenc->fps_d = gst_value_get_fraction_denominator (fps);
} else {
xvidenc->fps_n = -1;
}
mime = gst_structure_get_name (structure); mime = gst_structure_get_name (structure);
xvid_cs = gst_xvid_structure_to_csp (structure, w, &stride, NULL); xvid_cs = gst_xvid_structure_to_csp (structure, w, &stride, NULL);
g_return_val_if_fail (xvid_cs != -1, GST_PAD_LINK_REFUSED);
xvidenc->csp = xvid_cs; xvidenc->csp = xvid_cs;
xvidenc->width = w; xvidenc->width = w;
xvidenc->height = h; xvidenc->height = h;
xvidenc->stride = stride; xvidenc->stride = stride;
xvidenc->fps = fps;
if (gst_xvidenc_setup (xvidenc)) { if (gst_xvidenc_setup (xvidenc)) {
GstPadLinkReturn ret; GstCaps *new_caps = NULL;
GstCaps *new_caps;
new_caps = gst_caps_new_simple ("video/x-xvid", new_caps = gst_caps_new_simple ("video/x-xvid",
"width", G_TYPE_INT, w, "width", G_TYPE_INT, w,
"height", G_TYPE_INT, h, "framerate", G_TYPE_DOUBLE, fps, NULL); "height", G_TYPE_INT, h,
ret = gst_pad_try_set_caps (xvidenc->srcpad, new_caps); "framerate", GST_TYPE_FRACTION, xvidenc->fps_n, xvidenc->fps_d, NULL);
if (GST_PAD_LINK_FAILED (ret)) { if (!gst_pad_set_caps (xvidenc->srcpad, new_caps)) {
if (xvidenc->handle) { if (xvidenc->handle) {
xvid_encore (xvidenc->handle, XVID_ENC_DESTROY, NULL, NULL); xvid_encore (xvidenc->handle, XVID_ENC_DESTROY, NULL, NULL);
xvidenc->handle = NULL; xvidenc->handle = NULL;
} }
return FALSE;
} }
return TRUE;
return ret;
} }
/* if we got here - it's not good */ /* if we got here - it's not good */
return GST_PAD_LINK_REFUSED; return FALSE;
} }
@ -421,10 +414,9 @@ static void
gst_xvidenc_set_property (GObject * object, gst_xvidenc_set_property (GObject * object,
guint prop_id, const GValue * value, GParamSpec * pspec) guint prop_id, const GValue * value, GParamSpec * pspec)
{ {
GstXvidEnc *xvidenc; GstXvidEnc *xvidenc = GST_XVIDENC (object);
g_return_if_fail (GST_IS_XVIDENC (object)); GST_OBJECT_LOCK (xvidenc);
xvidenc = GST_XVIDENC (object);
switch (prop_id) { switch (prop_id) {
case ARG_PROFILE: case ARG_PROFILE:
@ -443,17 +435,18 @@ gst_xvidenc_set_property (GObject * object,
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
} }
}
GST_OBJECT_UNLOCK (xvidenc);
}
static void static void
gst_xvidenc_get_property (GObject * object, gst_xvidenc_get_property (GObject * object,
guint prop_id, GValue * value, GParamSpec * pspec) guint prop_id, GValue * value, GParamSpec * pspec)
{ {
GstXvidEnc *xvidenc; GstXvidEnc *xvidenc = GST_XVIDENC (object);
g_return_if_fail (GST_IS_XVIDENC (object)); GST_OBJECT_LOCK (xvidenc);
xvidenc = GST_XVIDENC (object);
switch (prop_id) { switch (prop_id) {
case ARG_PROFILE: case ARG_PROFILE:
@ -472,26 +465,41 @@ gst_xvidenc_get_property (GObject * object,
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
} }
GST_OBJECT_UNLOCK (xvidenc);
} }
static GstStateChangeReturn static GstStateChangeReturn
gst_xvidenc_change_state (GstElement * element, GstStateChange transition) gst_xvidenc_change_state (GstElement * element, GstStateChange transition)
{ {
GstXvidEnc *xvidenc = GST_XVIDENC (element); GstXvidEnc *xvidenc = GST_XVIDENC (element);
GstStateChangeReturn ret;
switch (GST_STATE_PENDING (element)) { switch (transition) {
case GST_STATE_CHANGE_NULL_TO_READY:
break;
case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
break;
default:
break;
}
ret = parent_class->change_state (element, transition);
switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
if (xvidenc->handle) { if (xvidenc->handle) {
xvid_encore (xvidenc->handle, XVID_ENC_DESTROY, NULL, NULL); xvid_encore (xvidenc->handle, XVID_ENC_DESTROY, NULL, NULL);
xvidenc->handle = NULL; xvidenc->handle = NULL;
} }
break; break;
case GST_STATE_CHANGE_READY_TO_NULL:
break;
default: default:
break; break;
} }
if (parent_class->change_state) return ret;
return parent_class->change_state (element, transition);
return GST_STATE_CHANGE_SUCCESS;
} }

2
ext/xvid/gstxvidenc.h
View file

@ -65,7 +65,7 @@ struct _GstXvidEnc {
void *handle; void *handle;
gint csp; gint csp;
gint width, height, stride; gint width, height, stride;
gdouble fps; gint fps_n, fps_d;
}; };
struct _GstXvidEncClass { struct _GstXvidEncClass {