mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 16:08:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

ext/alsa/gstalsa.c: cast to GstClockTime to get higher granularity

Browse source 
Original commit message from CVS:
* ext/alsa/gstalsa.c: (gst_alsa_samples_to_timestamp):
cast to GstClockTime to get higher granularity
* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
use gst_element_set_time_delay to get the exact time
* ext/mad/gstmad.c: (gst_mad_chain):
use the negotiated rate instead of the current frame's rate which
might be wrong because of bit errors. This avoids emitting totally
bogus timestamps and screwing sync.
(fixes #143454)
This commit is contained in:
Benjamin Otte 2004-06-07 01:41:37 +00:00
parent 5b6ffe42de
commit b0d718fcc3
3 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2004-06-07 Benjamin Otte <otte@gnome.org>
* ext/alsa/gstalsa.c: (gst_alsa_samples_to_timestamp):
cast to GstClockTime to get higher granularity
* ext/alsa/gstalsasink.c: (gst_alsa_sink_check_event):
use gst_element_set_time_delay to get the exact time
* ext/mad/gstmad.c: (gst_mad_chain):
use the negotiated rate instead of the current frame's rate which
might be wrong because of bit errors. This avoids emitting totally
bogus timestamps and screwing sync.
(fixes #143454)
2004-06-07 Tim-Philipp Müller <t.i.m@zen.co.uk> 2004-06-07 Tim-Philipp Müller <t.i.m@zen.co.uk>
reviewed by Benjamin Otte <otte@gnome.org> reviewed by Benjamin Otte <otte@gnome.org>

2
ext/alsa/gstalsa.c
View file

@ -1650,7 +1650,7 @@ gst_alsa_timestamp_to_samples (GstAlsa * this, GstClockTime time)
inline GstClockTime inline GstClockTime
gst_alsa_samples_to_timestamp (GstAlsa * this, snd_pcm_uframes_t samples) gst_alsa_samples_to_timestamp (GstAlsa * this, snd_pcm_uframes_t samples)
{ {
return (GstClockTime) (samples * GST_SECOND / this->format->rate); return ((GstClockTime) samples) * GST_SECOND / this->format->rate;
} }
inline snd_pcm_uframes_t inline snd_pcm_uframes_t

9
ext/alsa/gstalsasink.c
View file

@ -210,20 +210,23 @@ gst_alsa_sink_check_event (GstAlsaSink * sink, gint pad_nr)
break; break;
case GST_EVENT_DISCONTINUOUS: case GST_EVENT_DISCONTINUOUS:
{ {
GstClockTime value; GstClockTime value, delay;
/* only the first pad may seek */ /* only the first pad may seek */
if (pad_nr != 0) { if (pad_nr != 0) {
break; break;
} }
delay =
GST_SECOND * this->transmitted / this->format->rate -
gst_alsa_sink_get_time (this);
if (gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) { if (gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {
gst_element_set_time (GST_ELEMENT (this), value); gst_element_set_time_delay (GST_ELEMENT (this), value, delay);
} else if (this->format && } else if (this->format &&
(gst_event_discont_get_value (event, GST_FORMAT_DEFAULT, &value) || (gst_event_discont_get_value (event, GST_FORMAT_DEFAULT, &value) ||
gst_event_discont_get_value (event, GST_FORMAT_BYTES, gst_event_discont_get_value (event, GST_FORMAT_BYTES,
&value))) { &value))) {
value = gst_alsa_samples_to_timestamp (this, value); value = gst_alsa_samples_to_timestamp (this, value);
gst_element_set_time (GST_ELEMENT (this), value); gst_element_set_time_delay (GST_ELEMENT (this), value, delay);
} else { } else {
GST_WARNING_OBJECT (this, GST_WARNING_OBJECT (this,
"couldn't extract time from discont event. Bad things might happen!"); "couldn't extract time from discont event. Bad things might happen!");