mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-02 16:52:42 +00:00
gst/tcp/gstmultifdsink.c: Turn warnings into info.
Original commit message from CVS: * gst/tcp/gstmultifdsink.c: (gst_multifdsink_add), (gst_multifdsink_remove), (gst_multifdsink_remove_client_link), (is_sync_frame), (gst_multifdsink_new_client), (gst_multifdsink_handle_client_write), (gst_multifdsink_recover_client), (gst_multifdsink_queue_buffer), (gst_multifdsink_handle_clients), (gst_multifdsink_change_state): Turn warnings into info. Don't allow a state change in the streaming thread.
This commit is contained in:
parent
30ffd67724
commit
1989b502da
2 changed files with 18 additions and 2 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2004-10-14 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
|
* gst/tcp/gstmultifdsink.c: (gst_multifdsink_add),
|
||||||
|
(gst_multifdsink_remove), (gst_multifdsink_remove_client_link),
|
||||||
|
(is_sync_frame), (gst_multifdsink_new_client),
|
||||||
|
(gst_multifdsink_handle_client_write),
|
||||||
|
(gst_multifdsink_recover_client), (gst_multifdsink_queue_buffer),
|
||||||
|
(gst_multifdsink_handle_clients), (gst_multifdsink_change_state):
|
||||||
|
Turn warnings into info.
|
||||||
|
Don't allow a state change in the streaming thread.
|
||||||
|
|
||||||
2004-10-14 Thomas Vander Stichele <thomas at apestaart dot org>
|
2004-10-14 Thomas Vander Stichele <thomas at apestaart dot org>
|
||||||
|
|
||||||
* ext/vorbis/oggvorbisenc.c:
|
* ext/vorbis/oggvorbisenc.c:
|
||||||
|
|
|
@ -1096,10 +1096,10 @@ gst_multifdsink_queue_buffer (GstMultiFdSink * sink, GstBuffer * buf)
|
||||||
if (newpos != client->bufpos) {
|
if (newpos != client->bufpos) {
|
||||||
client->bufpos = newpos;
|
client->bufpos = newpos;
|
||||||
client->discont = TRUE;
|
client->discont = TRUE;
|
||||||
GST_WARNING_OBJECT (sink, "client %p with fd %d position reset to %d",
|
GST_INFO_OBJECT (sink, "client %p with fd %d position reset to %d",
|
||||||
client, client->fd.fd, client->bufpos);
|
client, client->fd.fd, client->bufpos);
|
||||||
} else {
|
} else {
|
||||||
GST_WARNING_OBJECT (sink,
|
GST_INFO_OBJECT (sink,
|
||||||
"client %p with fd %d not recovering position", client,
|
"client %p with fd %d not recovering position", client,
|
||||||
client->fd.fd);
|
client->fd.fd);
|
||||||
}
|
}
|
||||||
|
@ -1216,6 +1216,7 @@ gst_multifdsink_handle_clients (GstMultiFdSink * sink)
|
||||||
/* interrupted system call, just redo the select */
|
/* interrupted system call, just redo the select */
|
||||||
try_again = TRUE;
|
try_again = TRUE;
|
||||||
} else {
|
} else {
|
||||||
|
/* this is quite bad... */
|
||||||
GST_ELEMENT_ERROR (sink, RESOURCE, READ, (NULL),
|
GST_ELEMENT_ERROR (sink, RESOURCE, READ, (NULL),
|
||||||
("select failed: %s", g_strerror (errno)));
|
("select failed: %s", g_strerror (errno)));
|
||||||
return;
|
return;
|
||||||
|
@ -1553,6 +1554,10 @@ gst_multifdsink_change_state (GstElement * element)
|
||||||
g_return_val_if_fail (GST_IS_MULTIFDSINK (element), GST_STATE_FAILURE);
|
g_return_val_if_fail (GST_IS_MULTIFDSINK (element), GST_STATE_FAILURE);
|
||||||
sink = GST_MULTIFDSINK (element);
|
sink = GST_MULTIFDSINK (element);
|
||||||
|
|
||||||
|
/* we disallow changing the state from the streaming thread */
|
||||||
|
if (g_thread_self () == sink->thread)
|
||||||
|
return GST_STATE_FAILURE;
|
||||||
|
|
||||||
switch (GST_STATE_TRANSITION (element)) {
|
switch (GST_STATE_TRANSITION (element)) {
|
||||||
case GST_STATE_NULL_TO_READY:
|
case GST_STATE_NULL_TO_READY:
|
||||||
if (!GST_FLAG_IS_SET (sink, GST_MULTIFDSINK_OPEN)) {
|
if (!GST_FLAG_IS_SET (sink, GST_MULTIFDSINK_OPEN)) {
|
||||||
|
|
Loading…
Reference in a new issue