mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 17:50:36 +00:00
inputselector: Correctly get current running time when syncing to the segment information
Fixes bug #677263.
This commit is contained in:
parent
eb55ee10e7
commit
83559a5970
1 changed files with 24 additions and 19 deletions
|
@ -396,6 +396,12 @@ gst_selector_pad_free_cached_buffer (GstSelectorPadCachedBuffer * cached_buffer)
|
||||||
static void
|
static void
|
||||||
gst_selector_pad_cache_buffer (GstSelectorPad * selpad, GstBuffer * buffer)
|
gst_selector_pad_cache_buffer (GstSelectorPad * selpad, GstBuffer * buffer)
|
||||||
{
|
{
|
||||||
|
if (selpad->segment.format != GST_FORMAT_TIME) {
|
||||||
|
GST_DEBUG_OBJECT (selpad, "Buffer %p with segment not in time format, "
|
||||||
|
"not caching", buffer);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (selpad, "Caching buffer %p", buffer);
|
GST_DEBUG_OBJECT (selpad, "Caching buffer %p", buffer);
|
||||||
if (!selpad->cached_buffers)
|
if (!selpad->cached_buffers)
|
||||||
selpad->cached_buffers = g_queue_new ();
|
selpad->cached_buffers = g_queue_new ();
|
||||||
|
@ -644,6 +650,7 @@ gst_input_selector_wait_running_time (GstInputSelector * sel,
|
||||||
if (running_time > seg->stop) {
|
if (running_time > seg->stop) {
|
||||||
running_time = seg->stop;
|
running_time = seg->stop;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
running_time =
|
running_time =
|
||||||
gst_segment_to_running_time (seg, GST_FORMAT_TIME, running_time);
|
gst_segment_to_running_time (seg, GST_FORMAT_TIME, running_time);
|
||||||
/* If this is outside the segment don't sync */
|
/* If this is outside the segment don't sync */
|
||||||
|
@ -651,7 +658,6 @@ gst_input_selector_wait_running_time (GstInputSelector * sel,
|
||||||
GST_INPUT_SELECTOR_UNLOCK (sel);
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
cur_running_time = GST_CLOCK_TIME_NONE;
|
cur_running_time = GST_CLOCK_TIME_NONE;
|
||||||
if (sel->sync_mode == GST_INPUT_SELECTOR_SYNC_MODE_CLOCK) {
|
if (sel->sync_mode == GST_INPUT_SELECTOR_SYNC_MODE_CLOCK) {
|
||||||
|
@ -689,11 +695,12 @@ gst_input_selector_wait_running_time (GstInputSelector * sel,
|
||||||
(sel->cache_buffers || active_selpad->pushed) &&
|
(sel->cache_buffers || active_selpad->pushed) &&
|
||||||
(sel->blocked || cur_running_time == -1
|
(sel->blocked || cur_running_time == -1
|
||||||
|| running_time >= cur_running_time)) {
|
|| running_time >= cur_running_time)) {
|
||||||
if (!sel->blocked)
|
if (!sel->blocked) {
|
||||||
GST_DEBUG_OBJECT (selpad,
|
GST_DEBUG_OBJECT (selpad,
|
||||||
"Waiting for active streams to advance. %" GST_TIME_FORMAT " >= %"
|
"Waiting for active streams to advance. %" GST_TIME_FORMAT " >= %"
|
||||||
GST_TIME_FORMAT, GST_TIME_ARGS (running_time),
|
GST_TIME_FORMAT, GST_TIME_ARGS (running_time),
|
||||||
GST_TIME_ARGS (cur_running_time));
|
GST_TIME_ARGS (cur_running_time));
|
||||||
|
}
|
||||||
|
|
||||||
GST_INPUT_SELECTOR_WAIT (sel);
|
GST_INPUT_SELECTOR_WAIT (sel);
|
||||||
} else {
|
} else {
|
||||||
|
@ -764,15 +771,10 @@ static void
|
||||||
gst_input_selector_cleanup_old_cached_buffers (GstInputSelector * sel,
|
gst_input_selector_cleanup_old_cached_buffers (GstInputSelector * sel,
|
||||||
GstPad * pad)
|
GstPad * pad)
|
||||||
{
|
{
|
||||||
GstSelectorPad *selpad;
|
|
||||||
GstSegment *seg;
|
|
||||||
GstClock *clock;
|
GstClock *clock;
|
||||||
gint64 cur_running_time;
|
gint64 cur_running_time;
|
||||||
GList *walk;
|
GList *walk;
|
||||||
|
|
||||||
selpad = GST_SELECTOR_PAD_CAST (pad);
|
|
||||||
seg = &selpad->segment;
|
|
||||||
|
|
||||||
cur_running_time = GST_CLOCK_TIME_NONE;
|
cur_running_time = GST_CLOCK_TIME_NONE;
|
||||||
if (sel->sync_mode == GST_INPUT_SELECTOR_SYNC_MODE_CLOCK) {
|
if (sel->sync_mode == GST_INPUT_SELECTOR_SYNC_MODE_CLOCK) {
|
||||||
clock = gst_element_get_clock (GST_ELEMENT_CAST (sel));
|
clock = gst_element_get_clock (GST_ELEMENT_CAST (sel));
|
||||||
|
@ -806,14 +808,18 @@ gst_input_selector_cleanup_old_cached_buffers (GstInputSelector * sel,
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (sel, "Cleaning up old cached buffers");
|
GST_DEBUG_OBJECT (sel, "Cleaning up old cached buffers");
|
||||||
for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = g_list_next (walk)) {
|
for (walk = GST_ELEMENT_CAST (sel)->sinkpads; walk; walk = g_list_next (walk)) {
|
||||||
GstSelectorPad *selpad = GST_SELECTOR_PAD_CAST (walk->data);
|
GstSelectorPad *selpad;
|
||||||
|
GstSegment *seg;
|
||||||
GstSelectorPadCachedBuffer *cached_buffer;
|
GstSelectorPadCachedBuffer *cached_buffer;
|
||||||
GSList *maybe_remove;
|
GSList *maybe_remove;
|
||||||
guint queue_position;
|
guint queue_position;
|
||||||
|
|
||||||
|
selpad = GST_SELECTOR_PAD_CAST (walk->data);
|
||||||
if (!selpad->cached_buffers)
|
if (!selpad->cached_buffers)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
seg = &selpad->segment;
|
||||||
|
|
||||||
maybe_remove = NULL;
|
maybe_remove = NULL;
|
||||||
queue_position = 0;
|
queue_position = 0;
|
||||||
while ((cached_buffer = g_queue_peek_nth (selpad->cached_buffers,
|
while ((cached_buffer = g_queue_peek_nth (selpad->cached_buffers,
|
||||||
|
@ -838,13 +844,13 @@ gst_input_selector_cleanup_old_cached_buffers (GstInputSelector * sel,
|
||||||
running_time += GST_BUFFER_DURATION (buffer);
|
running_time += GST_BUFFER_DURATION (buffer);
|
||||||
/* Only use the segment to convert to running time if the segment is
|
/* Only use the segment to convert to running time if the segment is
|
||||||
* in TIME format, otherwise do our best to try to sync */
|
* in TIME format, otherwise do our best to try to sync */
|
||||||
if (seg->format == GST_FORMAT_TIME && GST_CLOCK_TIME_IS_VALID (seg->stop)) {
|
if (GST_CLOCK_TIME_IS_VALID (seg->stop)) {
|
||||||
if (running_time > seg->stop) {
|
if (running_time > seg->stop) {
|
||||||
running_time = seg->stop;
|
running_time = seg->stop;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
running_time =
|
running_time =
|
||||||
gst_segment_to_running_time (seg, GST_FORMAT_TIME, running_time);
|
gst_segment_to_running_time (seg, GST_FORMAT_TIME, running_time);
|
||||||
}
|
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (selpad,
|
GST_DEBUG_OBJECT (selpad,
|
||||||
"checking if buffer %p running time=%" GST_TIME_FORMAT
|
"checking if buffer %p running time=%" GST_TIME_FORMAT
|
||||||
|
@ -1046,8 +1052,7 @@ ignore:
|
||||||
{
|
{
|
||||||
gboolean active_pad_pushed = GST_SELECTOR_PAD_CAST (active_sinkpad)->pushed;
|
gboolean active_pad_pushed = GST_SELECTOR_PAD_CAST (active_sinkpad)->pushed;
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (pad, "Pad not active or buffer timestamp is invalid, "
|
GST_DEBUG_OBJECT (pad, "Pad not active, discard buffer %p", buf);
|
||||||
"discard buffer %p", buf);
|
|
||||||
/* when we drop a buffer, we're creating a discont on this pad */
|
/* when we drop a buffer, we're creating a discont on this pad */
|
||||||
selpad->discont = TRUE;
|
selpad->discont = TRUE;
|
||||||
GST_INPUT_SELECTOR_UNLOCK (sel);
|
GST_INPUT_SELECTOR_UNLOCK (sel);
|
||||||
|
|
Loading…
Reference in a new issue