aggregator: Ignore the "first" mode if the segment not a time segment

This commit is contained in:
Olivier Crête 2015-07-29 20:06:11 -04:00
parent b21f01276c
commit 50b7d1d577

View file

@ -1953,12 +1953,20 @@ gst_aggregator_pad_chain (GstPad * pad, GstObject * object, GstBuffer * buffer)
start_time = 0; start_time = 0;
break; break;
case GST_AGGREGATOR_START_TIME_SELECTION_FIRST: case GST_AGGREGATOR_START_TIME_SELECTION_FIRST:
start_time = GST_BUFFER_PTS (actual_buf); if (aggpad->segment.format == GST_FORMAT_TIME) {
if (start_time != -1) { start_time = GST_BUFFER_PTS (actual_buf);
start_time = MAX (start_time, aggpad->segment.start); if (start_time != -1) {
start_time = start_time = MAX (start_time, aggpad->segment.start);
gst_segment_to_running_time (&aggpad->segment, GST_FORMAT_TIME, start_time =
start_time); gst_segment_to_running_time (&aggpad->segment, GST_FORMAT_TIME,
start_time);
}
} else {
start_time = 0;
GST_WARNING_OBJECT (aggpad,
"Ignoring request of selecting the first start time "
"as the segment is a %s segment instead of a time segment",
gst_format_get_name (aggpad->segment.format));
} }
break; break;
case GST_AGGREGATOR_START_TIME_SELECTION_SET: case GST_AGGREGATOR_START_TIME_SELECTION_SET: