mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-05 14:16:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-08-16 11:12:33 +02:00
parent bbab01747d 041b62db8b
commit b5aa7628bf
8 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 69b981f10caa234ad0ff639179d0fda8505bd94b
Subproject commit 605cd9a65ed61505f24b840d3fe8e252be72b151

1
examples/test-launch.c
View file

@ -64,6 +64,7 @@ main (int argc, char *argv[])
gst_rtsp_server_attach (server, NULL);
/* start serving */
g_print ("stream ready at rtsp://127.0.0.1:8554/test\n");
g_main_loop_run (loop);
return 0;

1
examples/test-readme.c
View file

@ -60,6 +60,7 @@ main (int argc, char *argv[])
gst_rtsp_server_attach (server, NULL);
/* start serving */
g_print ("stream ready at rtsp://127.0.0.1:8554/test\n");
g_main_loop_run (loop);
return 0;

1
examples/test-uri.c
View file

@ -82,6 +82,7 @@ main (int argc, char *argv[])
g_timeout_add_seconds (2, (GSourceFunc) timeout, server);
/* start serving */
g_print ("stream ready at rtsp://127.0.0.1:8554/test\n");
g_main_loop_run (loop);
return 0;

1
examples/test-video.c
View file

@ -99,6 +99,7 @@ main (int argc, char *argv[])
g_timeout_add_seconds (2, (GSourceFunc) timeout, server);
/* start serving, this never stops */
g_print ("stream ready at rtsp://127.0.0.1:8554/test\n");
g_main_loop_run (loop);
return 0;

7
gst/rtsp-server/rtsp-client.c
View file

@ -337,6 +337,8 @@ find_media (GstRTSPClient * client, GstRTSPClientState * state)
goto no_media;
g_object_unref (factory);
factory = NULL;
state->factory = NULL;
/* set ipv6 on the media before preparing */
media->is_ipv6 = client->is_ipv6;
@ -389,7 +391,6 @@ no_prepare:
{
send_generic_response (client, GST_RTSP_STS_SERVICE_UNAVAILABLE, state);
g_object_unref (media);
g_object_unref (factory);
return NULL;
}
}
@ -1665,9 +1666,9 @@ message_received (GstRTSPWatch * watch, GstRTSPMessage * message,
static GstRTSPResult
message_sent (GstRTSPWatch * watch, guint cseq, gpointer user_data)
{
GstRTSPClient *client;
/* GstRTSPClient *client; */
client = GST_RTSP_CLIENT (user_data);
/* client = GST_RTSP_CLIENT (user_data); */
/* GST_INFO ("client %p: sent a message with cseq %d", client, cseq); */

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

@ -1844,7 +1844,6 @@ gst_rtsp_media_set_state (GstRTSPMedia * media, GstState state,
GArray * transports)
{
gint i;
GstStateChangeReturn ret;
gboolean add, remove, do_state;
gint old_active;
@ -1963,7 +1962,7 @@ gst_rtsp_media_set_state (GstRTSPMedia * media, GstState state,
GST_INFO ("state %s media %p", gst_element_state_get_name (state),
media);
media->target_state = state;
ret = gst_element_set_state (media->pipeline, state);
gst_element_set_state (media->pipeline, state);
}
}
g_signal_emit (media, gst_rtsp_media_signals[SIGNAL_NEW_STATE], 0, state,

2
gst/rtsp-server/rtsp-server.c
View file

@ -706,11 +706,13 @@ unmanage_client (GstRTSPClient * client, GstRTSPServer * server)
{
GST_DEBUG_OBJECT (server, "unmanage client %p", client);
g_object_ref (server);
gst_rtsp_client_set_server (client, NULL);
GST_RTSP_SERVER_LOCK (server);
server->clients = g_list_remove (server->clients, client);
GST_RTSP_SERVER_UNLOCK (server);
g_object_unref (server);
g_object_unref (client);
}