nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1520550 - Remove TCP/TLS/RTP/SAVPF from Rust parser r=mjf

Browse source 
This makes the Rust parser's C API consistent with the changes made to sipcc
(i.e., the removal of unregistered transport types).

Differential Revision: https://phabricator.services.mozilla.com/D36203

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Ryan Alderete 2019-07-09 20:55:06 +00:00
parent 4abe2056e8
commit 790ab483b4
3 changed files with 6 additions and 13 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
media/webrtc/signaling/src/sdp/rsdparsa/src/media_type.rs
View file

@ -61,7 +61,6 @@ pub enum SdpProtocolValue {
DtlsSctp,
UdpDtlsSctp,
TcpDtlsSctp,
TcpTlsRtpSavpf, /* not standardized - to be removed */
}
impl ToString for SdpProtocolValue {
@ -78,7 +77,6 @@ impl ToString for SdpProtocolValue {
SdpProtocolValue::DtlsSctp => "DTLS/SCTP",
SdpProtocolValue::UdpDtlsSctp => "UDP/DTLS/SCTP",
SdpProtocolValue::TcpDtlsSctp => "TCP/DTLS/SCTP",
SdpProtocolValue::TcpTlsRtpSavpf => "TCP/TLS/RTP/SAVPF",
}
.to_string()
}
@ -322,8 +320,6 @@ fn parse_protocol_token(value: &str) -> Result<SdpProtocolValue, SdpParserIntern
"DTLS/SCTP" => SdpProtocolValue::DtlsSctp,
"UDP/DTLS/SCTP" => SdpProtocolValue::UdpDtlsSctp,
"TCP/DTLS/SCTP" => SdpProtocolValue::TcpDtlsSctp,
/* to be removed */
"TCP/TLS/RTP/SAVPF" => SdpProtocolValue::TcpTlsRtpSavpf,
_ => {
return Err(SdpParserInternalError::Unsupported(format!(
"unsupported protocol value: {}",

13
media/webrtc/signaling/src/sdp/rsdparsa_capi/src/lib.rs
View file

@ -160,13 +160,12 @@ pub unsafe extern "C" fn sdp_add_media_section(session: *mut SdpSession,
let protocol = match protocol {
20 => SdpProtocolValue::RtpSavpf, // Protocol::kRtpSavpf
21 => SdpProtocolValue::UdpTlsRtpSavp, // Protocol::kUdpTlsRtpSavp
23 => SdpProtocolValue::TcpDtlsRtpSavp, // Protocol::kTcpDtlsRtpSavp
25 => SdpProtocolValue::UdpTlsRtpSavpf, // Protocol::kUdpTlsRtpSavpf
26 => SdpProtocolValue::TcpTlsRtpSavpf, // Protocol::kTcpTlsRtpSavpf
27 => SdpProtocolValue::TcpDtlsRtpSavpf, // Protocol::kTcpTlsRtpSavpf
39 => SdpProtocolValue::DtlsSctp, // Protocol::kDtlsSctp
40 => SdpProtocolValue::UdpDtlsSctp, // Protocol::kUdpDtlsSctp
41 => SdpProtocolValue::TcpDtlsSctp, // Protocol::kTcpDtlsSctp
22 => SdpProtocolValue::TcpDtlsRtpSavp, // Protocol::kTcpDtlsRtpSavp
24 => SdpProtocolValue::UdpTlsRtpSavpf, // Protocol::kUdpTlsRtpSavpf
25 => SdpProtocolValue::TcpDtlsRtpSavpf, // Protocol::kTcpTlsRtpSavpf
37 => SdpProtocolValue::DtlsSctp, // Protocol::kDtlsSctp
38 => SdpProtocolValue::UdpDtlsSctp, // Protocol::kUdpDtlsSctp
39 => SdpProtocolValue::TcpDtlsSctp, // Protocol::kTcpDtlsSctp
_ => {
return NS_ERROR_INVALID_ARG;
}

2
media/webrtc/signaling/src/sdp/rsdparsa_capi/src/media_section.rs
View file

@ -51,7 +51,6 @@ pub enum RustSdpProtocolValue {
UdpTlsRtpSavp,
TcpDtlsRtpSavp,
UdpTlsRtpSavpf,
TcpTlsRtpSavpf,
TcpDtlsRtpSavpf,
DtlsSctp,
UdpDtlsSctp,
@ -68,7 +67,6 @@ impl<'a> From<&'a SdpProtocolValue> for RustSdpProtocolValue {
SdpProtocolValue::UdpTlsRtpSavp => RustSdpProtocolValue::UdpTlsRtpSavp,
SdpProtocolValue::TcpDtlsRtpSavp => RustSdpProtocolValue::TcpDtlsRtpSavp,
SdpProtocolValue::UdpTlsRtpSavpf => RustSdpProtocolValue::UdpTlsRtpSavpf,
SdpProtocolValue::TcpTlsRtpSavpf => RustSdpProtocolValue::TcpTlsRtpSavpf,
SdpProtocolValue::TcpDtlsRtpSavpf => RustSdpProtocolValue::TcpDtlsRtpSavpf,
SdpProtocolValue::DtlsSctp => RustSdpProtocolValue::DtlsSctp,
SdpProtocolValue::UdpDtlsSctp => RustSdpProtocolValue::UdpDtlsSctp,