From 0c2e4e1cc2e5444f29e79714ccd94f4520dfaed2 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Fri, 23 Jan 2004 10:56:57 +0000 Subject: [PATCH] ext/divx/gstdivxdec.*: Fix divx3 ("msmpeg4") playback using divxdec. Original commit message from CVS: 2004-01-23 Ronald Bultje * ext/divx/gstdivxdec.c: (gst_divxdec_init), (gst_divxdec_setup): * ext/divx/gstdivxdec.h: Fix divx3 ("msmpeg4") playback using divxdec. --- ChangeLog | 6 ++++++ ext/divx/gstdivxdec.c | 17 ++++++++++++++++- ext/divx/gstdivxdec.h | 1 + 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8711cc7..a6512d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-01-23 Ronald Bultje + + * 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 * gst/typefind/gsttypefindfunctions.c: diff --git a/ext/divx/gstdivxdec.c b/ext/divx/gstdivxdec.c index 1f3e68f..869858a 100644 --- a/ext/divx/gstdivxdec.c +++ b/ext/divx/gstdivxdec.c @@ -185,6 +185,7 @@ gst_divxdec_init (GstDivxDec *divxdec) /* bitrate, etc. */ divxdec->width = divxdec->height = divxdec->csp = divxdec->bitcnt = -1; + divxdec->version = 0; /* set divx handle to NULL */ divxdec->handle = NULL; @@ -213,7 +214,20 @@ gst_divxdec_setup (GstDivxDec *divxdec) /* initialize the handle */ memset(&xinit, 0, sizeof(DEC_INIT)); 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) { gst_element_error (divxdec, LIBRARY, INIT, NULL, ("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, "height", &divxdec->height); gst_structure_get_double(structure, "framerate", &divxdec->fps); + gst_structure_get_int(structure, "divxversion", &divxdec->version); return gst_divxdec_negotiate(divxdec); } diff --git a/ext/divx/gstdivxdec.h b/ext/divx/gstdivxdec.h index f181a08..0468ff0 100644 --- a/ext/divx/gstdivxdec.h +++ b/ext/divx/gstdivxdec.h @@ -54,6 +54,7 @@ struct _GstDivxDec { /* video (output) settings */ guint32 csp; int bitcnt, bpp; + int version; int width, height; gdouble fps; }; -- 2.7.4