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

Fix some weird-ass segfaults in xvid

Browse source 
Original commit message from CVS:
Fix some weird-ass segfaults in xvid
This commit is contained in:
Ronald S. Bultje 2003-07-14 06:31:26 +00:00
parent 0848c5302e
commit ff1182f0bd
3 changed files with 36 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
ext/xvid/gstxvid.c
View file

@ -56,24 +56,6 @@ static gboolean
plugin_init (GModule *module,
GstPlugin *plugin)
{
XVID_INIT_PARAM xinit;
gint ret;
/* set up xvid initially (function pointers, CPU flags) */
memset(&xinit, 0, sizeof(XVID_INIT_PARAM));
xinit.cpu_flags = 0;
if ((ret = xvid_init(NULL, 0, &xinit, NULL)) != XVID_ERR_OK) {
g_warning("Faied to initialize XviD: %s (%d)",
gst_xvid_error(ret), ret);
return FALSE;
}
if (xinit.api_version != API_VERSION) {
g_warning("Xvid API version mismatch! %d.%d (that's us) != %d.%d (lib)",
(API_VERSION >> 8) & 0xff, API_VERSION & 0xff,
(xinit.api_version >> 8) & 0xff, xinit.api_version & 0xff);
}
return (gst_xviddec_plugin_init(module, plugin) &&
gst_xvidenc_plugin_init(module, plugin));
}

21
ext/xvid/gstxviddec.c
View file

@ -135,6 +135,23 @@ static void
gst_xviddec_class_init (GstXvidDecClass *klass)
{
GObjectClass *gobject_class = (GObjectClass *) klass;
XVID_INIT_PARAM xinit;
gint ret;
/* set up xvid initially (function pointers, CPU flags) */
memset(&xinit, 0, sizeof(XVID_INIT_PARAM));
xinit.cpu_flags = 0;
if ((ret = xvid_init(NULL, 0, &xinit, NULL)) != XVID_ERR_OK) {
g_warning("Failed to initialize XviD: %s (%d)",
gst_xvid_error(ret), ret);
return;
}
if (xinit.api_version != API_VERSION) {
g_warning("Xvid API version mismatch! %d.%d (that's us) != %d.%d (lib)",
(API_VERSION >> 8) & 0xff, API_VERSION & 0xff,
(xinit.api_version >> 8) & 0xff, xinit.api_version & 0xff);
}
parent_class = g_type_class_ref(GST_TYPE_ELEMENT);
@ -248,7 +265,7 @@ gst_xviddec_chain (GstPad *pad,
xframe.bitstream = (void *) GST_BUFFER_DATA(buf);
xframe.image = (void *) GST_BUFFER_DATA(outbuf);
xframe.length = GST_BUFFER_SIZE(buf);
xframe.stride = xviddec->width * xviddec->bpp / 8;
xframe.stride = 0; /*xviddec->width * xviddec->bpp / 8;*/
xframe.colorspace = xviddec->csp;
if ((ret = xvid_decore(xviddec->handle, XVID_DEC_DECODE,
@ -278,8 +295,8 @@ gst_xviddec_negotiate (GstXvidDec *xviddec)
{ GST_MAKE_FOURCC('Y','U','Y','V'), 16, 16, XVID_CSP_YUY2 },
{ GST_MAKE_FOURCC('U','Y','V','Y'), 16, 16, XVID_CSP_UYVY },
{ GST_MAKE_FOURCC('Y','V','Y','U'), 16, 16, XVID_CSP_YVYU },
{ GST_MAKE_FOURCC('I','4','2','0'), 12, 12, XVID_CSP_I420 },
{ GST_MAKE_FOURCC('Y','V','1','2'), 12, 12, XVID_CSP_YV12 },
{ GST_MAKE_FOURCC('I','4','2','0'), 12, 12, XVID_CSP_I420 },
{ GST_MAKE_FOURCC('R','G','B',' '), 32, 32, XVID_CSP_RGB32 },
{ GST_MAKE_FOURCC('R','G','B',' '), 24, 24, XVID_CSP_RGB24 },
{ GST_MAKE_FOURCC('R','G','B',' '), 16, 16, XVID_CSP_RGB555 },

17
ext/xvid/gstxvidenc.c
View file

@ -147,6 +147,23 @@ gst_xvidenc_class_init (GstXvidEncClass *klass)
{
GstElementClass *gstelement_class;
GObjectClass *gobject_class;
XVID_INIT_PARAM xinit;
gint ret;
/* set up xvid initially (function pointers, CPU flags) */
memset(&xinit, 0, sizeof(XVID_INIT_PARAM));
xinit.cpu_flags = 0;
if ((ret = xvid_init(NULL, 0, &xinit, NULL)) != XVID_ERR_OK) {
g_warning("Failed to initialize XviD: %s (%d)",
gst_xvid_error(ret), ret);
return;
}
if (xinit.api_version != API_VERSION) {
g_warning("Xvid API version mismatch! %d.%d (that's us) != %d.%d (lib)",
(API_VERSION >> 8) & 0xff, API_VERSION & 0xff,
(xinit.api_version >> 8) & 0xff, xinit.api_version & 0xff);
}
gobject_class = (GObjectClass *) klass;
gstelement_class = (GstElementClass *) klass;