mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 14:32:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/ffmpeg/gstffmpegdec.c: Don´t SIGFPE right away.

Browse source 
Original commit message from CVS:
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame):
Don´t SIGFPE right away.
This commit is contained in:
Ronald S. Bultje 2005-02-01 21:15:20 +00:00
parent d40aa0a0df
commit 385671eb80
2 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2005-02-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_frame):
Don´t SIGFPE right away.
2005-02-01 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
reviewed by: <delete if not using a buddy>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_lowres_get_type),
(gst_ffmpegdec_skipframe_get_type), (gst_ffmpegdec_class_init),
(gst_ffmpegdec_init), (gst_ffmpegdec_connect),
(gst_ffmpegdec_frame), (gst_ffmpegdec_set_property),
(gst_ffmpegdec_get_property):
2005-01-31 Ronald S. Bultje <rbultje@ronald.bitfreak.net> 2005-01-31 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_lowres_get_type), * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_lowres_get_type),

23
ext/ffmpeg/gstffmpegdec.c
View file

@ -660,26 +660,35 @@ gst_ffmpegdec_frame (GstFFMpegDec * ffmpegdec,
* For B-frame containing movies, we get all pictures delayed * For B-frame containing movies, we get all pictures delayed
* except for the I frames, so we synchronize only on I frames * except for the I frames, so we synchronize only on I frames
* and keep an internal counter based on FPS for the others. */ * and keep an internal counter based on FPS for the others. */
if (ffmpegdec->picture->pict_type == FF_I_TYPE && if ((ffmpegdec->picture->pict_type == FF_I_TYPE ||
GST_CLOCK_TIME_IS_VALID (*in_ts) && !GST_CLOCK_TIME_IS_VALID (ffmpegdec->next_ts)) &&
ffmpegdec->context->frame_rate > 0) { GST_CLOCK_TIME_IS_VALID (*in_ts)) {
ffmpegdec->next_ts = *in_ts; ffmpegdec->next_ts = *in_ts;
} }
GST_BUFFER_TIMESTAMP (outbuf) = ffmpegdec->next_ts; GST_BUFFER_TIMESTAMP (outbuf) = ffmpegdec->next_ts;
if (ffmpegdec->context->frame_rate_base != 0 &&
ffmpegdec->context->frame_rate != 0) {
GST_BUFFER_DURATION (outbuf) = GST_SECOND * GST_BUFFER_DURATION (outbuf) = GST_SECOND *
ffmpegdec->context->frame_rate_base / ffmpegdec->context->frame_rate_base /
ffmpegdec->context->frame_rate; ffmpegdec->context->frame_rate;
ffmpegdec->next_ts += GST_BUFFER_DURATION (outbuf); ffmpegdec->next_ts += GST_BUFFER_DURATION (outbuf);
} else {
ffmpegdec->next_ts = GST_CLOCK_TIME_NONE;
}
} else if (ffmpegdec->picture->pict_type != -1) { } else if (ffmpegdec->picture->pict_type != -1) {
/* update time for skip-frame */ /* update time for skip-frame */
if (ffmpegdec->picture->pict_type == FF_I_TYPE && if ((ffmpegdec->picture->pict_type == FF_I_TYPE ||
GST_CLOCK_TIME_IS_VALID (*in_ts) && !GST_CLOCK_TIME_IS_VALID (ffmpegdec->next_ts)) &&
ffmpegdec->context->frame_rate > 0) { GST_CLOCK_TIME_IS_VALID (*in_ts)) {
ffmpegdec->next_ts = *in_ts; ffmpegdec->next_ts = *in_ts;
} else { }
if (ffmpegdec->context->frame_rate_base != 0 &&
ffmpegdec->context->frame_rate != 0) {
ffmpegdec->next_ts += GST_SECOND * ffmpegdec->next_ts += GST_SECOND *
ffmpegdec->context->frame_rate_base / ffmpegdec->context->frame_rate_base /
ffmpegdec->context->frame_rate; ffmpegdec->context->frame_rate;
} else {
ffmpegdec->next_ts = GST_CLOCK_TIME_NONE;
} }
} }
break; break;