mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-13 10:55:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-09-30 17:45:31 +02:00
commit d255e3db39
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ext/mpeg2dec/gstmpeg2dec.c
View file

@ -245,6 +245,8 @@ gst_mpeg2dec_qos_reset (GstMpeg2dec * mpeg2dec)
GST_OBJECT_LOCK (mpeg2dec);
mpeg2dec->proportion = 1.0;
mpeg2dec->earliest_time = -1;
mpeg2dec->dropped = 0;
mpeg2dec->processed = 0;
GST_OBJECT_UNLOCK (mpeg2dec);
}
@ -936,10 +938,33 @@ handle_slice (GstMpeg2dec * mpeg2dec, const mpeg2_info_t * info)
&& qostime <= mpeg2dec->earliest_time;
GST_OBJECT_UNLOCK (mpeg2dec);
if (need_skip)
if (need_skip) {
GstMessage *qos_msg;
guint64 stream_time;
gint64 jitter;
mpeg2dec->dropped++;
stream_time =
gst_segment_to_stream_time (&mpeg2dec->segment, GST_FORMAT_TIME,
time);
jitter = GST_CLOCK_DIFF (qostime, mpeg2dec->earliest_time);
qos_msg =
gst_message_new_qos (GST_OBJECT_CAST (mpeg2dec), FALSE, qostime,
stream_time, time, GST_BUFFER_DURATION (outbuf));
gst_message_set_qos_values (qos_msg, jitter, mpeg2dec->proportion,
1000000);
gst_message_set_qos_stats (qos_msg, GST_FORMAT_BUFFERS,
mpeg2dec->processed, mpeg2dec->dropped);
gst_element_post_message (GST_ELEMENT_CAST (mpeg2dec), qos_msg);
goto dropping_qos;
}
}
mpeg2dec->processed++;
/* ref before pushing it out, so we still have the ref in our
* array of buffers */
gst_buffer_ref (outbuf);

2
ext/mpeg2dec/gstmpeg2dec.h
View file

@ -110,6 +110,8 @@ struct _GstMpeg2dec {
/* QoS stuff */ /* with LOCK*/
gdouble proportion;
GstClockTime earliest_time;
guint64 processed;
guint64 dropped;
/* gather/decode queues for reverse playback */
GList *gather;