mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 10:42:22 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtsp-media: fix RECORD getting stuck

Browse source 
The test_record case was working because async=false had
been added in https://bugzilla.gnome.org/show_bug.cgi?id=757488
but that was incorrect, as it should not be needed.

Removing async=false made the test fail as expected, this is
fixed by not trying to preroll when preparing the media for
RECORD, as start_prepare is called upon receiving ANNOUNCE,
and our peer will not start sending media until it has received
a response to that request, and sent and received a response
to RECORD as well, thus obviously preventing preroll.

https://bugzilla.gnome.org/show_bug.cgi?id=793738
This commit is contained in:
Mathieu Duponchelle 2018-02-22 20:17:33 +01:00
parent 99edc9445a
commit ddb0d83844
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/rtsp-server/rtsp-media.c
View file

@ -3058,8 +3058,14 @@ start_prepare (GstRTSPMedia * media)
g_object_set_data (G_OBJECT (elem), "gst-rtsp-dynpay-handlers", handlers);
}
if (!start_preroll (media))
if (priv->nb_dynamic_elements == 0 && is_receive_only (media)) {
/* If we are receive_only (RECORD), do not try to preroll, to avoid
* a second ASYNC state change failing */
priv->is_live = TRUE;
gst_rtsp_media_set_status (media, GST_RTSP_MEDIA_STATUS_PREPARED);
} else if (!start_preroll (media)) {
goto preroll_failed;
}
g_rec_mutex_unlock (&priv->state_lock);

2
tests/check/gst/rtspclientsink.c
View file

@ -157,7 +157,7 @@ GST_START_TEST (test_record)
mfactory =
start_record_server
("( rtppcmadepay name=depay0 ! appsink name=sink async=false )");
("( rtppcmadepay name=depay0 ! appsink name=sink )");
g_signal_connect (mfactory, "media-constructed",
G_CALLBACK (media_constructed_cb), &server_sink);