* Example: An initiator value would be translated to @@ -318,7 +317,8 @@ public static MediaStreamTarget extractDefaultTarget( catch (UnknownHostException exc) { throw new IllegalArgumentException( - "Failed to parse address " + rtpCand.getIP(), exc); + "Failed to parse address " + rtpCand.getIP(), + exc); } //rtp port @@ -346,11 +346,13 @@ public static MediaStreamTarget extractDefaultTarget( catch (UnknownHostException exc) { throw new IllegalArgumentException( - "Failed to parse address " + rtcpCand.getIP(), exc); + "Failed to parse address " + rtcpCand.getIP(), + exc); } //rtcp port int rtcpPort = rtcpCand.getPort(); + rtcpTarget = new InetSocketAddress(rtcpAddress, rtcpPort); } @@ -376,8 +378,7 @@ public static CandidatePacketExtension getFirstCandidate( //passing IceUdp would also return RawUdp transports as one extends //the other. IceUdpTransportPacketExtension transport - = (IceUdpTransportPacketExtension)content.getFirstChildOfType( - IceUdpTransportPacketExtension.class); + = content.getFirstChildOfType(IceUdpTransportPacketExtension.class); if ( transport == null) return null; @@ -473,9 +474,7 @@ public static PayloadTypePacketExtension formatToPayloadType( int payloadType = format.getRTPPayloadType(); if (payloadType == MediaFormat.RTP_PAYLOAD_TYPE_UNKNOWN) - { payloadType = ptRegistry.obtainPayloadTypeNumber(format); - } ptExt.setId(payloadType); ptExt.setName(format.getEncoding()); @@ -520,23 +519,21 @@ public static IceUdpTransportPacketExtension createTransport( IceMediaStream stream) { IceUdpTransportPacketExtension trans - = new IceUdpTransportPacketExtension(); + = new IceUdpTransportPacketExtension(); + Agent iceAgent = stream.getParentAgent(); - trans.setUfrag(stream.getParentAgent().getLocalUfrag()); - trans.setPassword(stream.getParentAgent().getLocalPassword()); + trans.setUfrag(iceAgent.getLocalUfrag()); + trans.setPassword(iceAgent.getLocalPassword()); for(Component component : stream.getComponents()) { for(Candidate cand : component.getLocalCandidates()) - { trans.addCandidate(createCandidate(cand)); - } } return trans; } - /** * Creates a {@link CandidatePacketExtension} and initializes it so that it * would describe the state of candidate @@ -556,14 +553,19 @@ private static CandidatePacketExtension createCandidate(Candidate candidate) //make sure that doesn't change ... possibly by setting a property there packet.setFoundation(Integer.parseInt( candidate.getFoundation())); - packet.setComponent( candidate.getParentComponent().getComponentID()); + Component component = candidate.getParentComponent(); + + packet.setComponent(component.getComponentID()); packet.setProtocol(candidate.getTransport().toString()); packet.setPriority(candidate.getPriority()); - packet.setGeneration(candidate.getParentComponent() - .getParentStream().getParentAgent().getGeneration()); + packet.setGeneration( + component.getParentStream().getParentAgent().getGeneration()); + + TransportAddress transportAddress = candidate.getTransportAddress(); + + packet.setIP(transportAddress.getHostAddress()); + packet.setPort(transportAddress.getPort()); - packet.setIP(candidate.getTransportAddress().getHostAddress()); - packet.setPort(candidate.getTransportAddress().getPort()); packet.setType(CandidateType.valueOf(candidate.getType().toString())); TransportAddress relAddr = candidate.getRelatedAddress(); @@ -574,8 +576,6 @@ private static CandidatePacketExtension createCandidate(Candidate candidate) packet.setRelPort(relAddr.getPort()); } - return packet; } - }