mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

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...

Browse source 
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)
This commit is contained in:
Tim-Philipp Müller 2005-02-21 23:41:23 +00:00
parent 34e90421fe
commit 3b9710a1da
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -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> 2005-02-21 Maciej Katafiasz <mathrick@freedesktop.org>
* ext/faad/gstfaad.c: (gst_faad_sinkconnect), (gst_faad_chain): * ext/faad/gstfaad.c: (gst_faad_sinkconnect), (gst_faad_chain):

4
configure.ac
View file

@ -887,9 +887,9 @@ dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
dnl *** dirac *** dnl *** dirac ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DIRAC, true) translit(dnm, m, l) AM_CONDITIONAL(USE_DIRAC, true)
GST_CHECK_FEATURE(DIRAC, [dirac plug-ins], dirac, [ 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 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 fi
AC_SUBST(DIRAC_CFLAGS) AC_SUBST(DIRAC_CFLAGS)
AC_SUBST(DIRAC_LIBS) AC_SUBST(DIRAC_LIBS)

7
ext/dirac/gstdiracdec.cc
View file

@ -253,13 +253,18 @@ gst_diracdec_chain (GstPad * pad, GstData * _data)
case STATE_SEQUENCE:{ case STATE_SEQUENCE:{
guint8 *buf[3]; 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 */ /* start-of-sequence - allocate buffer */
if (!gst_diracdec_link (diracdec, if (!gst_diracdec_link (diracdec,
diracdec->decoder->seq_params.width, diracdec->decoder->seq_params.width,
diracdec->decoder->seq_params.height, diracdec->decoder->seq_params.height,
(gdouble) fps_num / (gdouble) fps_denom,
gst_diracdec_chroma_to_fourcc (diracdec->decoder->seq_params. gst_diracdec_chroma_to_fourcc (diracdec->decoder->seq_params.
chroma), diracdec->decoder->seq_params.frame_rate)) { chroma))) {
GST_ELEMENT_ERROR (diracdec, CORE, NEGOTIATION, (NULL), GST_ELEMENT_ERROR (diracdec, CORE, NEGOTIATION, (NULL),
("Failed to set caps to %dx%d @ %d fps (format=" GST_FOURCC_FORMAT ("Failed to set caps to %dx%d @ %d fps (format=" GST_FOURCC_FORMAT
"/%d)", diracdec->decoder->seq_params.width, "/%d)", diracdec->decoder->seq_params.width,