diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2005-02-21 23:41:23 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2005-02-21 23:41:23 +0000 |
| commit | 3b9710a1da22b24e4dd5046fe9291beb60fd3cc5 (patch) | |
| tree | 0e720356aec6378c7427155140a6c76a507ef98d | |
| parent | 34e90421fe00b1744ccd06424220442afcda040c (diff) | |
| download | gst-plugins-bad-3b9710a1da22b24e4dd5046fe9291beb60fd3cc5.tar.gz gst-plugins-bad-3b9710a1da22b24e4dd5046fe9291beb60fd3cc5.tar.bz2 gst-plugins-bad-3b9710a1da22b24e4dd5046fe9291beb60fd3cc5.zip | |
Since dirac 0.5.0 the framerate in dirac is expressed as a rational number. Fix build and up requirement to 0.5.0, an...
Original commit message from CVS:
Since dirac 0.5.0 the framerate in dirac is expressed as a rational number. Fix build and up requirement to 0.5.0, and also pass parameters to gst_diracdec_link in the right order. (fixes #167959)
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | ext/dirac/gstdiracdec.cc | 7 |
3 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2005-02-21 Tim-Philipp Müller <tim at centricular dot net> + + * configure.ac: + * ext/dirac/gstdiracdec.cc: + (gst_diracdec_chain): + Since dirac 0.5.0 the framerate in dirac is expressed as a + rational number. Fix build and up requirement to 0.5.0, and + also pass parameters to gst_diracdec_link in the right order + (fixes #167959). + 2005-02-21 Maciej Katafiasz <mathrick@freedesktop.org> * ext/faad/gstfaad.c: (gst_faad_sinkconnect), (gst_faad_chain): diff --git a/configure.ac b/configure.ac index 4c1d31e3..4cd6b5b3 100644 --- a/configure.ac +++ b/configure.ac @@ -887,9 +887,9 @@ dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no) dnl *** dirac *** translit(dnm, m, l) AM_CONDITIONAL(USE_DIRAC, true) GST_CHECK_FEATURE(DIRAC, [dirac plug-ins], dirac, [ - PKG_CHECK_MODULES(DIRAC, dirac-pic >= 0.4, HAVE_DIRAC="yes", HAVE_DIRAC="no") + PKG_CHECK_MODULES(DIRAC, dirac-pic >= 0.5.0, HAVE_DIRAC="yes", HAVE_DIRAC="no") if test x$HAVE_DIRAC = xno ; then - PKG_CHECK_MODULES(DIRAC, dirac >= 0.4, HAVE_DIRAC="yes", HAVE_DIRAC="no") + PKG_CHECK_MODULES(DIRAC, dirac >= 0.5.0, HAVE_DIRAC="yes", HAVE_DIRAC="no") fi AC_SUBST(DIRAC_CFLAGS) AC_SUBST(DIRAC_LIBS) diff --git a/ext/dirac/gstdiracdec.cc b/ext/dirac/gstdiracdec.cc index 6a9c3abf..c9f8501a 100644 --- a/ext/dirac/gstdiracdec.cc +++ b/ext/dirac/gstdiracdec.cc @@ -253,13 +253,18 @@ gst_diracdec_chain (GstPad * pad, GstData * _data) case STATE_SEQUENCE:{ guint8 *buf[3]; + gint fps_num, fps_denom; + + fps_num = diracdec->decoder->seq_params.frame_rate.numerator; + fps_denom = diracdec->decoder->seq_params.frame_rate.denominator; /* start-of-sequence - allocate buffer */ if (!gst_diracdec_link (diracdec, diracdec->decoder->seq_params.width, diracdec->decoder->seq_params.height, + (gdouble) fps_num / (gdouble) fps_denom, gst_diracdec_chroma_to_fourcc (diracdec->decoder->seq_params. - chroma), diracdec->decoder->seq_params.frame_rate)) { + chroma))) { GST_ELEMENT_ERROR (diracdec, CORE, NEGOTIATION, (NULL), ("Failed to set caps to %dx%d @ %d fps (format=" GST_FOURCC_FORMAT "/%d)", diracdec->decoder->seq_params.width, |