FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ext/divx/gstdivxdec.*: Fix divx3 ("msmpeg4") playback using divxdec.

Browse Source 
Original commit message from CVS:
2004-01-23  Ronald Bultje  <rbultje@ronald.bitfreak.net>

* ext/divx/gstdivxdec.c: (gst_divxdec_init), (gst_divxdec_setup):
* ext/divx/gstdivxdec.h:
Fix divx3 ("msmpeg4") playback using divxdec.
This commit is contained in:
Ronald S. Bultje 2004-01-23 10:56:57 +00:00
parent 0b4511b951
commit 0c2e4e1cc2
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-01-23 Ronald Bultje <rbultje@ronald.bitfreak.net>
* ext/divx/gstdivxdec.c: (gst_divxdec_init), (gst_divxdec_setup):
* ext/divx/gstdivxdec.h:
Fix divx3 ("msmpeg4") playback using divxdec.
2004-01-23 Benjamin Otte <in7y118@public.uni-hamburg.de> 2004-01-23 Benjamin Otte <in7y118@public.uni-hamburg.de>
* gst/typefind/gsttypefindfunctions.c: * gst/typefind/gsttypefindfunctions.c:

17
ext/divx/gstdivxdec.c
View File

@ -185,6 +185,7 @@ gst_divxdec_init (GstDivxDec *divxdec)
/* bitrate, etc. */ /* bitrate, etc. */
divxdec->width = divxdec->height = divxdec->csp = divxdec->bitcnt = -1; divxdec->width = divxdec->height = divxdec->csp = divxdec->bitcnt = -1;
divxdec->version = 0;
/* set divx handle to NULL */ /* set divx handle to NULL */
divxdec->handle = NULL; divxdec->handle = NULL;
@ -213,7 +214,20 @@ gst_divxdec_setup (GstDivxDec *divxdec)
/* initialize the handle */ /* initialize the handle */
memset(&xinit, 0, sizeof(DEC_INIT)); memset(&xinit, 0, sizeof(DEC_INIT));
xinit.smooth_playback = 0; xinit.smooth_playback = 0;
xinit.codec_version = 500; switch (divxdec->version) {
case 3:
xinit.codec_version = 311;
break;
case 4:
xinit.codec_version = 400;
break;
case 5:
xinit.codec_version = 500;
break;
default:
xinit.codec_version = 0;
break;
}
if ((ret = decore(&handle, DEC_OPT_INIT, &xinit, NULL)) != 0) { if ((ret = decore(&handle, DEC_OPT_INIT, &xinit, NULL)) != 0) {
gst_element_error (divxdec, LIBRARY, INIT, NULL, gst_element_error (divxdec, LIBRARY, INIT, NULL,
("divx library error: %s (%d)", gst_divxdec_error (ret), ret)); ("divx library error: %s (%d)", gst_divxdec_error (ret), ret));
@ -439,6 +453,7 @@ gst_divxdec_connect (GstPad *pad,
gst_structure_get_int(structure, "width", &divxdec->width); gst_structure_get_int(structure, "width", &divxdec->width);
gst_structure_get_int(structure, "height", &divxdec->height); gst_structure_get_int(structure, "height", &divxdec->height);
gst_structure_get_double(structure, "framerate", &divxdec->fps); gst_structure_get_double(structure, "framerate", &divxdec->fps);
gst_structure_get_int(structure, "divxversion", &divxdec->version);
return gst_divxdec_negotiate(divxdec); return gst_divxdec_negotiate(divxdec);
} }

1
ext/divx/gstdivxdec.h
View File

@ -54,6 +54,7 @@ struct _GstDivxDec {
/* video (output) settings */ /* video (output) settings */
guint32 csp; guint32 csp;
int bitcnt, bpp; int bitcnt, bpp;
int version;
int width, height; int width, height;
gdouble fps; gdouble fps;
}; };