summaryrefslogtreecommitdiff
path: root/transmitters
diff options
context:
space:
mode:
authorOlivier CrĂȘte <olivier.crete@collabora.com>2014-10-09 16:23:24 -0400
committerOlivier CrĂȘte <olivier.crete@collabora.com>2014-10-09 16:23:24 -0400
commit5f6f8aa6c7eeeeb0cf564499967e292f5a0eee07 (patch)
treef95bc2fe4cc03efe8587c5dfb2822fd0595bbc55 /transmitters
parent5128b46b1f981668eb9fdfd436ce900abba506fb (diff)
downloadfarstream-5f6f8aa6c7eeeeb0cf564499967e292f5a0eee07.tar.gz
nice stream transmitter: Ignore ICE-TCP candidates for now
Diffstat (limited to 'transmitters')
-rw-r--r--transmitters/nice/fs-nice-stream-transmitter.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/transmitters/nice/fs-nice-stream-transmitter.c b/transmitters/nice/fs-nice-stream-transmitter.c
index e266d632..4d3dd832 100644
--- a/transmitters/nice/fs-nice-stream-transmitter.c
+++ b/transmitters/nice/fs-nice-stream-transmitter.c
@@ -997,7 +997,7 @@ nice_candidate_transport_to_fs_network_protocol (NiceCandidateTransport trans)
return FS_NETWORK_PROTOCOL_UDP;
default:
GST_WARNING ("Invalid Nice network transport type %u", trans);
- return FS_NETWORK_PROTOCOL_UDP;
+ return FS_NETWORK_PROTOCOL_TCP;
}
}
@@ -1655,6 +1655,9 @@ agent_new_candidate (NiceAgent *agent,
{
NiceCandidate *candidate = item->data;
+ if (candidate->transport != NICE_CANDIDATE_TRANSPORT_UDP)
+ continue;
+
if (!strcmp (candidate->foundation, foundation))
{
fscandidate = nice_candidate_to_fs_candidate (agent, candidate, TRUE);
@@ -1700,8 +1703,9 @@ agent_new_candidate (NiceAgent *agent,
}
else
{
+ FS_NICE_STREAM_TRANSMITTER_UNLOCK (self);
GST_WARNING ("Could not find local candidate with foundation %s"
- " for component_ %d in stream %d", foundation, component_id,
+ " for component %d in stream %d", foundation, component_id,
stream_id);
}
}