gst/flx/gstflxdec.c: If the speed of the file is null in the header, set the frame_time to the default setting of GST...

Original commit message from CVS:
* gst/flx/gstflxdec.c: (gst_flxdec_chain):
If the speed of the file is null in the header, set the frame_time to the default
setting of GST_SECOND / 70. Which is the default frame_delay for .fli files as
stated in this document : http://www.compuphase.com/flic.htm
Would be nice to have the time conversion done properly too
(duration = flxh->frames * flxdec->frame_time)
This commit is contained in:
Edward Hervey 2005-12-13 10:45:04 +00:00
parent ea9090e73f
commit f5b7ab5af1
2 changed files with 11 additions and 0 deletions

View file

@ -1,3 +1,12 @@
2005-12-13 Edward Hervey <edward@fluendo.com>
* gst/flx/gstflxdec.c: (gst_flxdec_chain):
If the speed of the file is null in the header, set the frame_time to the default
setting of GST_SECOND / 70. Which is the default frame_delay for .fli files as
stated in this document : http://www.compuphase.com/flic.htm
Would be nice to have the time conversion done properly too
(duration = flxh->frames * flxdec->frame_time)
2005-12-12 Julien MOUTTE <julien@moutte.net> 2005-12-12 Julien MOUTTE <julien@moutte.net>
* docs/plugins/Makefile.am: * docs/plugins/Makefile.am:

View file

@ -492,6 +492,8 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
if (flxh->type == FLX_MAGICHDR_FLI) { if (flxh->type == FLX_MAGICHDR_FLI) {
flxdec->frame_time = JIFFIE * flxh->speed; flxdec->frame_time = JIFFIE * flxh->speed;
} else if (flxh->speed == 0) {
flxdec->frame_time = GST_SECOND / 70;
} else { } else {
flxdec->frame_time = flxh->speed * GST_MSECOND; flxdec->frame_time = flxh->speed * GST_MSECOND;
} }