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

audiomixer: Track discont-time per pad instead of globally

Browse source 
We do discont handling per pad, not per element!
This commit is contained in:
Sebastian Dröge 2014-12-19 13:04:58 +01:00
parent bc418c7a85
commit bf3896b2bd
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst/audiomixer/gstaudiomixer.c
View file

@ -130,6 +130,7 @@ gst_audiomixer_pad_flush_pad (GstAggregatorPad * aggpad,
GST_OBJECT_LOCK (aggpad); GST_OBJECT_LOCK (aggpad);
pad->position = pad->size = 0; pad->position = pad->size = 0;
pad->output_offset = pad->next_offset = -1; pad->output_offset = pad->next_offset = -1;
pad->discont_time = GST_CLOCK_TIME_NONE;
gst_buffer_replace (&pad->buffer, NULL); gst_buffer_replace (&pad->buffer, NULL);
GST_OBJECT_UNLOCK (aggpad); GST_OBJECT_UNLOCK (aggpad);
@ -168,7 +169,7 @@ gst_audiomixer_pad_init (GstAudioMixerPad * pad)
pad->size = 0; pad->size = 0;
pad->output_offset = -1; pad->output_offset = -1;
pad->next_offset = -1; pad->next_offset = -1;
pad->discont_time = GST_CLOCK_TIME_NONE;
} }
#define DEFAULT_ALIGNMENT_THRESHOLD (40 * GST_MSECOND) #define DEFAULT_ALIGNMENT_THRESHOLD (40 * GST_MSECOND)
@ -714,7 +715,6 @@ gst_audiomixer_reset (GstAudioMixer * audiomixer)
{ {
audiomixer->offset = 0; audiomixer->offset = 0;
gst_caps_replace (&audiomixer->current_caps, NULL); gst_caps_replace (&audiomixer->current_caps, NULL);
audiomixer->discont_time = GST_CLOCK_TIME_NONE;
} }
static gboolean static gboolean
@ -768,7 +768,6 @@ gst_audiomixer_send_event (GstElement * element, GstEvent * event)
return res; return res;
} }
static void static void
gst_audiomixer_class_init (GstAudioMixerClass * klass) gst_audiomixer_class_init (GstAudioMixerClass * klass)
{ {
@ -1046,19 +1045,18 @@ gst_audio_mixer_fill_buffer (GstAudioMixer * audiomixer, GstAudioMixerPad * pad,
/* Discont! */ /* Discont! */
if (G_UNLIKELY (diff >= max_sample_diff)) { if (G_UNLIKELY (diff >= max_sample_diff)) {
if (audiomixer->discont_wait > 0) { if (audiomixer->discont_wait > 0) {
if (audiomixer->discont_time == GST_CLOCK_TIME_NONE) { if (pad->discont_time == GST_CLOCK_TIME_NONE) {
audiomixer->discont_time = start_time; pad->discont_time = start_time;
} else if (start_time - audiomixer->discont_time >= } else if (start_time - pad->discont_time >= audiomixer->discont_wait) {
audiomixer->discont_wait) {
discont = TRUE; discont = TRUE;
audiomixer->discont_time = GST_CLOCK_TIME_NONE; pad->discont_time = GST_CLOCK_TIME_NONE;
} }
} else { } else {
discont = TRUE; discont = TRUE;
} }
} else if (G_UNLIKELY (audiomixer->discont_time != GST_CLOCK_TIME_NONE)) { } else if (G_UNLIKELY (pad->discont_time != GST_CLOCK_TIME_NONE)) {
/* we have had a discont, but are now back on track! */ /* we have had a discont, but are now back on track! */
audiomixer->discont_time = GST_CLOCK_TIME_NONE; pad->discont_time = GST_CLOCK_TIME_NONE;
} }
} }
@ -1070,7 +1068,7 @@ gst_audio_mixer_fill_buffer (GstAudioMixer * audiomixer, GstAudioMixerPad * pad,
pad->next_offset, start_offset); pad->next_offset, start_offset);
pad->output_offset = -1; pad->output_offset = -1;
} else { } else {
audiomixer->discont_time = GST_CLOCK_TIME_NONE; pad->discont_time = GST_CLOCK_TIME_NONE;
} }
pad->next_offset = end_offset; pad->next_offset = end_offset;

5
gst/audiomixer/gstaudiomixer.h
View file

@ -69,8 +69,6 @@ struct _GstAudioMixer {
GstClockTime alignment_threshold; GstClockTime alignment_threshold;
GstClockTime discont_wait; GstClockTime discont_wait;
/* Last time we noticed a discont */
GstClockTime discont_time;
gint64 base_time; gint64 base_time;
/* Size in samples that is output per buffer */ /* Size in samples that is output per buffer */
@ -111,6 +109,9 @@ struct _GstAudioMixerPad {
current buffer. */ current buffer. */
guint64 next_offset; /* Next expected offset in the input segment */ guint64 next_offset; /* Next expected offset in the input segment */
/* Last time we noticed a discont */
GstClockTime discont_time;
}; };
struct _GstAudioMixerPadClass { struct _GstAudioMixerPadClass {