mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 11:41:09 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoaggregator: Fix for unhandled negative rate

Browse source 
Nagative rates have been considered only in
gst_video_aggregator_advance_on_timeout(). Update other places
to fix broken reverse playback.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1500>
This commit is contained in:
Seungha Yang 2022-01-07 20:02:46 +09:00 committed by GStreamer Marge Bot
parent 21dd2076f6
commit 61d2a9ffde
2 changed files with 182 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
subprojects/gst-plugins-base/gst-libs/gst/video/gstvideoaggregator.c
View file

@ -1761,6 +1761,7 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
buf = gst_aggregator_pad_peek_buffer (bpad);
if (buf) {
GstClockTime start_time, end_time;
GstClockTime start_running_time, end_running_time;
check_again:
GST_TRACE_OBJECT (pad, "Next buffer %" GST_PTR_FORMAT, buf);
@ -1773,7 +1774,6 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
return GST_FLOW_ERROR;
}
/* FIXME: Make all this work with negative rates */
end_time = GST_BUFFER_DURATION (buf);
if (end_time == -1) {
@ -1855,16 +1855,25 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
start_time = MAX (start_time, segment.start);
if (segment.stop != -1)
end_time = MIN (end_time, segment.stop);
start_time =
gst_segment_to_running_time (&segment, GST_FORMAT_TIME, start_time);
end_time =
gst_segment_to_running_time (&segment, GST_FORMAT_TIME, end_time);
g_assert (start_time != -1 && end_time != -1);
if (segment.rate >= 0) {
start_running_time =
gst_segment_to_running_time (&segment, GST_FORMAT_TIME, start_time);
end_running_time =
gst_segment_to_running_time (&segment, GST_FORMAT_TIME, end_time);
} else {
start_running_time =
gst_segment_to_running_time (&segment, GST_FORMAT_TIME, end_time);
end_running_time =
gst_segment_to_running_time (&segment, GST_FORMAT_TIME, start_time);
}
g_assert (start_running_time != -1 && end_running_time != -1);
GST_TRACE_OBJECT (pad, "dealing with buffer %p start %" GST_TIME_FORMAT
" end %" GST_TIME_FORMAT " out start %" GST_TIME_FORMAT
" out end %" GST_TIME_FORMAT, buf, GST_TIME_ARGS (start_time),
GST_TIME_ARGS (end_time), GST_TIME_ARGS (output_start_running_time),
" out end %" GST_TIME_FORMAT, buf, GST_TIME_ARGS (start_running_time),
GST_TIME_ARGS (end_running_time),
GST_TIME_ARGS (output_start_running_time),
GST_TIME_ARGS (output_end_running_time));
if (pad->priv->end_time != -1 && pad->priv->end_time > end_time) {
@ -1874,11 +1883,11 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
continue;
}
if (end_time > output_start_running_time
&& start_time < output_end_running_time) {
if (end_running_time > output_start_running_time
&& start_running_time < output_end_running_time) {
GST_DEBUG_OBJECT (pad,
"Taking new buffer with start time %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time));
GST_TIME_ARGS (start_running_time));
gst_buffer_replace (&pad->priv->buffer, buf);
if (pad->priv->pending_vinfo.finfo) {
gst_caps_replace (&pad->priv->caps, pad->priv->pending_caps);
@ -1887,15 +1896,15 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
need_reconfigure = TRUE;
pad->priv->pending_vinfo.finfo = NULL;
}
pad->priv->start_time = start_time;
pad->priv->end_time = end_time;
pad->priv->start_time = start_running_time;
pad->priv->end_time = end_running_time;
gst_buffer_unref (buf);
gst_aggregator_pad_drop_buffer (bpad);
eos = FALSE;
} else if (start_time >= output_end_running_time) {
} else if (start_running_time >= output_end_running_time) {
GST_DEBUG_OBJECT (pad, "Keeping buffer until %" GST_TIME_FORMAT,
GST_TIME_ARGS (start_time));
GST_TIME_ARGS (start_running_time));
gst_buffer_unref (buf);
eos = FALSE;
} else {
@ -1907,8 +1916,8 @@ gst_video_aggregator_fill_queues (GstVideoAggregator * vagg,
need_reconfigure = TRUE;
pad->priv->pending_vinfo.finfo = NULL;
}
pad->priv->start_time = start_time;
pad->priv->end_time = end_time;
pad->priv->start_time = start_running_time;
pad->priv->end_time = end_running_time;
GST_DEBUG_OBJECT (pad,
"replacing old buffer with a newer buffer, start %" GST_TIME_FORMAT
" out end %" GST_TIME_FORMAT, GST_TIME_ARGS (start_time),
@ -2072,13 +2081,14 @@ clean_pad (GstElement * agg, GstPad * pad, gpointer user_data)
static GstFlowReturn
gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg,
GstClockTime output_start_time, GstClockTime output_end_time,
GstClockTime output_start_running_time, GstBuffer ** outbuf)
GstBuffer ** outbuf)
{
GstAggregator *agg = GST_AGGREGATOR (vagg);
GstFlowReturn ret = GST_FLOW_OK;
GstElementClass *klass = GST_ELEMENT_GET_CLASS (vagg);
GstVideoAggregatorClass *vagg_klass = (GstVideoAggregatorClass *) klass;
GstClockTime out_stream_time;
GstSegment *agg_segment = &GST_AGGREGATOR_PAD (agg->srcpad)->segment;
g_assert (vagg_klass->aggregate_frames != NULL);
g_assert (vagg_klass->create_output_buffer != NULL);
@ -2093,13 +2103,18 @@ gst_video_aggregator_do_aggregate (GstVideoAggregator * vagg,
return GST_FLOW_OK;
}
GST_BUFFER_TIMESTAMP (*outbuf) = output_start_time;
GST_BUFFER_DURATION (*outbuf) = output_end_time - output_start_time;
GST_OBJECT_LOCK (agg->srcpad);
out_stream_time =
gst_segment_to_stream_time (&GST_AGGREGATOR_PAD (agg->srcpad)->segment,
GST_FORMAT_TIME, output_start_time);
if (agg_segment->rate >= 0) {
GST_BUFFER_TIMESTAMP (*outbuf) = output_start_time;
GST_BUFFER_DURATION (*outbuf) = output_end_time - output_start_time;
out_stream_time = gst_segment_to_stream_time (agg_segment,
GST_FORMAT_TIME, output_start_time);
} else {
GST_BUFFER_TIMESTAMP (*outbuf) = output_end_time;
GST_BUFFER_DURATION (*outbuf) = output_start_time - output_end_time;
out_stream_time = gst_segment_to_stream_time (agg_segment,
GST_FORMAT_TIME, output_end_time);
}
GST_OBJECT_UNLOCK (agg->srcpad);
/* Sync pad properties to the stream time */
@ -2220,9 +2235,24 @@ gst_video_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
goto unlock_and_return;
}
if (agg_segment->rate < 0 && !GST_CLOCK_TIME_IS_VALID (agg_segment->stop)) {
GST_ERROR_OBJECT (vagg, "Unknown segment.stop for negative rate");
flow_ret = GST_FLOW_ERROR;
goto unlock_and_return;
}
output_start_time = agg_segment->position;
if (agg_segment->position == -1 || agg_segment->position < agg_segment->start)
output_start_time = agg_segment->start;
if (agg_segment->rate >= 0) {
if (agg_segment->position == -1 ||
agg_segment->position < agg_segment->start) {
output_start_time = agg_segment->start;
}
} else {
if (agg_segment->position == -1 ||
agg_segment->position > agg_segment->stop) {
output_start_time = agg_segment->stop;
}
}
if (vagg->priv->nframes == 0) {
vagg->priv->ts_offset = output_start_time;
@ -2233,15 +2263,25 @@ gst_video_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
if (GST_VIDEO_INFO_FPS_N (&vagg->info) == 0) {
output_end_time = -1;
} else {
output_end_time =
vagg->priv->ts_offset +
gst_util_uint64_scale_round (vagg->priv->nframes + 1,
guint64 dur = gst_util_uint64_scale_round (vagg->priv->nframes + 1,
GST_SECOND * GST_VIDEO_INFO_FPS_D (&vagg->info),
GST_VIDEO_INFO_FPS_N (&vagg->info));
if (agg_segment->rate >= 0)
output_end_time = vagg->priv->ts_offset + dur;
else if (vagg->priv->ts_offset >= dur)
output_end_time = vagg->priv->ts_offset - dur;
else
output_end_time = -1;
}
if (agg_segment->stop != -1)
output_end_time = MIN (output_end_time, agg_segment->stop);
if (agg_segment->rate >= 0) {
if (agg_segment->stop != -1)
output_end_time = MIN (output_end_time, agg_segment->stop);
} else {
if (agg_segment->start != -1)
output_end_time = MAX (output_end_time, agg_segment->start);
}
output_start_running_time =
gst_segment_to_running_time (agg_segment, GST_FORMAT_TIME,
@ -2292,7 +2332,7 @@ gst_video_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
jitter = gst_video_aggregator_do_qos (vagg, output_start_time);
if (jitter <= 0) {
flow_ret = gst_video_aggregator_do_aggregate (vagg, output_start_time,
output_end_time, output_start_running_time, &outbuf);
output_end_time, &outbuf);
if (flow_ret != GST_FLOW_OK)
goto done;
vagg->priv->qos_processed++;

110
subprojects/gst-plugins-base/tests/check/elements/compositor.c
View file

@ -2268,6 +2268,115 @@ GST_START_TEST (test_signals)
GST_END_TEST;
static void
on_reverse_handoff (GstElement * sink, GstBuffer * buffer, GstPad * pad,
GstClockTime * pos)
{
GstClockTime pts = GST_BUFFER_PTS (buffer);
GstClockTime dur = GST_BUFFER_DURATION (buffer);
fail_unless (GST_CLOCK_TIME_IS_VALID (pts));
fail_unless_equals_clocktime (dur, GST_MSECOND * 100);
if (!GST_CLOCK_TIME_IS_VALID (*pos)) {
*pos = pts;
} else {
fail_unless (pts < *pos);
*pos = pts;
}
}
GST_START_TEST (test_reverse)
{
GstElement *bin, *src1, *src2, *compositor, *sink;
GstElement *cp1, *cp2, *cp3;
GstCaps *caps;
GstBus *bus;
GstEvent *seek_event;
GstStateChangeReturn state_res;
gboolean res;
GstClockTime pos = GST_CLOCK_TIME_NONE;
GST_INFO ("preparing test");
/* build pipeline */
bin = gst_pipeline_new ("pipeline");
bus = gst_element_get_bus (bin);
gst_bus_add_signal_watch_full (bus, G_PRIORITY_HIGH);
src1 = gst_element_factory_make ("videotestsrc", "src1");
src2 = gst_element_factory_make ("videotestsrc", "src2");
compositor = gst_element_factory_make ("compositor", "compositor");
cp1 = gst_element_factory_make ("capsfilter", "cp1");
cp2 = gst_element_factory_make ("capsfilter", "cp2");
cp3 = gst_element_factory_make ("capsfilter", "cp3");
sink = gst_element_factory_make ("fakesink", "sink");
gst_bin_add_many (GST_BIN (bin), src1, src2, compositor, sink, cp1, cp2,
cp3, NULL);
res = gst_element_link_many (src1, cp1, compositor, NULL);
fail_unless (res == TRUE, NULL);
res = gst_element_link_many (src2, cp2, compositor, NULL);
fail_unless (res == TRUE, NULL);
res = gst_element_link_many (compositor, cp3, sink, NULL);
fail_unless (res == TRUE, NULL);
caps = gst_caps_from_string ("video/x-raw,width=(int)64,height=(int)64,"
"framerate=(fraction)10/1");
fail_unless (caps != NULL, NULL);
g_object_set (cp1, "caps", caps, NULL);
g_object_set (cp2, "caps", caps, NULL);
g_object_set (cp3, "caps", caps, NULL);
gst_caps_unref (caps);
seek_event = gst_event_new_seek (-1.0, GST_FORMAT_TIME,
GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_TRICKMODE,
GST_SEEK_TYPE_SET, (GstClockTime) 0,
GST_SEEK_TYPE_SET, (GstClockTime) 2 * GST_SECOND);
main_loop = g_main_loop_new (NULL, FALSE);
g_signal_connect (bus, "message::error", (GCallback) message_received, bin);
g_signal_connect (bus, "message::warning", (GCallback) message_received, bin);
g_signal_connect (bus, "message::eos", (GCallback) message_received, bin);
GST_INFO ("starting test");
/* prepare playing */
state_res = gst_element_set_state (bin, GST_STATE_PAUSED);
ck_assert_int_ne (state_res, GST_STATE_CHANGE_FAILURE);
/* wait for completion */
state_res = gst_element_get_state (bin, NULL, NULL, GST_CLOCK_TIME_NONE);
ck_assert_int_ne (state_res, GST_STATE_CHANGE_FAILURE);
g_object_set (sink, "signal-handoffs", TRUE, NULL);
g_signal_connect (sink, "handoff", G_CALLBACK (on_reverse_handoff), &pos);
res = gst_element_send_event (bin, seek_event);
fail_unless (res == TRUE, NULL);
/* run pipeline */
state_res = gst_element_set_state (bin, GST_STATE_PLAYING);
ck_assert_int_ne (state_res, GST_STATE_CHANGE_FAILURE);
GST_INFO ("running main loop");
g_main_loop_run (main_loop);
state_res = gst_element_set_state (bin, GST_STATE_NULL);
ck_assert_int_ne (state_res, GST_STATE_CHANGE_FAILURE);
fail_unless_equals_clocktime (pos, 0);
/* cleanup */
g_main_loop_unref (main_loop);
gst_bus_remove_signal_watch (bus);
gst_object_unref (bus);
gst_object_unref (bin);
}
GST_END_TEST;
static Suite *
compositor_suite (void)
{
@ -2308,6 +2417,7 @@ compositor_suite (void)
tcase_add_test (tc_chain, test_start_time_first_live_drop_3_unlinked_1);
tcase_add_test (tc_chain, test_gap_events);
tcase_add_test (tc_chain, test_signals);
tcase_add_test (tc_chain, test_reverse);
return s;
}