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

Fix various clippy warnings in the Rust sendrecv demo

Browse source
This commit is contained in:
Sebastian Dröge 2018-06-21 09:03:18 +03:00
parent b826f968cb
commit 2614249149
1 changed files with 52 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
webrtc/sendrecv/gst-rust/src/main.rs
View file

@ -22,7 +22,7 @@ use std::sync::{mpsc, Arc, Mutex};
use std::thread; use std::thread;
use websocket::message::OwnedMessage; use websocket::message::OwnedMessage;
const STUN_SERVER: &'static str = "stun://stun.l.google.com:19302 "; const STUN_SERVER: &str = "stun://stun.l.google.com:19302 ";
lazy_static! { lazy_static! {
static ref RTP_CAPS_OPUS: gst::GstRc<gst::CapsRef> = { static ref RTP_CAPS_OPUS: gst::GstRc<gst::CapsRef> = {
gst::Caps::new_simple( gst::Caps::new_simple(
@ -46,9 +46,9 @@ lazy_static! {
}; };
} }
#[derive(PartialEq, PartialOrd, Eq, Debug, Clone, Ord)] #[derive(PartialEq, PartialOrd, Eq, Debug, Copy, Clone, Ord)]
enum AppState { enum AppState {
AppStateErr = 1, Error = 1,
ServerConnected, ServerConnected,
ServerRegistering = 2000, ServerRegistering = 2000,
ServerRegisteringError, ServerRegisteringError,
@ -76,7 +76,7 @@ enum JsonMsg {
}, },
} }
#[derive(Debug)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
enum MediaType { enum MediaType {
Audio, Audio,
Video, Video,
@ -138,14 +138,14 @@ fn check_plugins() -> Result<(), Error> {
missing.push(plugin_name) missing.push(plugin_name)
} }
} }
if missing.len() > 0 { if !missing.is_empty() {
Err(MissingElements(missing))? Err(MissingElements(missing))?
} else { } else {
Ok(()) Ok(())
} }
} }
fn send_sdp_offer(app_control: &AppControl, offer: gst_webrtc::WebRTCSessionDescription) { fn send_sdp_offer(app_control: &AppControl, offer: &gst_webrtc::WebRTCSessionDescription) {
if app_control.app_state_cmp( if app_control.app_state_cmp(
AppState::PeerCallNegotiating, AppState::PeerCallNegotiating,
"Can't send offer, not in call", "Can't send offer, not in call",
@ -162,7 +162,7 @@ fn send_sdp_offer(app_control: &AppControl, offer: gst_webrtc::WebRTCSessionDesc
fn on_offer_created( fn on_offer_created(
app_control: &AppControl, app_control: &AppControl,
webrtc: gst::Element, webrtc: &gst::Element,
promise: &gst::Promise, promise: &gst::Promise,
) -> Result<(), Error> { ) -> Result<(), Error> {
if !app_control.app_state_eq( if !app_control.app_state_eq(
@ -180,7 +180,7 @@ fn on_offer_created(
.expect("Invalid argument"); .expect("Invalid argument");
webrtc.emit("set-local-description", &[&offer, &None::<gst::Promise>])?; webrtc.emit("set-local-description", &[&offer, &None::<gst::Promise>])?;
send_sdp_offer(&app_control, offer); send_sdp_offer(&app_control, &offer);
Ok(()) Ok(())
} }
@ -190,7 +190,7 @@ fn on_negotiation_needed(app_control: &AppControl, values: &[glib::Value]) -> Re
let webrtc_clone = webrtc.clone(); let webrtc_clone = webrtc.clone();
let app_control_clone = app_control.clone(); let app_control_clone = app_control.clone();
let promise = gst::Promise::new_with_change_func(move |promise| { let promise = gst::Promise::new_with_change_func(move |promise| {
on_offer_created(&app_control_clone, webrtc, promise).unwrap(); on_offer_created(&app_control_clone, &webrtc, promise).unwrap();
}); });
webrtc_clone.emit("create-offer", &[&None::<gst::Structure>, &promise])?; webrtc_clone.emit("create-offer", &[&None::<gst::Structure>, &promise])?;
Ok(()) Ok(())
@ -252,20 +252,21 @@ fn on_incoming_decodebin_stream(
let caps = pad.get_current_caps().unwrap(); let caps = pad.get_current_caps().unwrap();
let name = caps.get_structure(0).unwrap().get_name(); let name = caps.get_structure(0).unwrap().get_name();
match if name.starts_with("video") {
let handled = if name.starts_with("video") {
handle_media_stream(&pad, &pipe, MediaType::Video) handle_media_stream(&pad, &pipe, MediaType::Video)
} else if name.starts_with("audio") { } else if name.starts_with("audio") {
handle_media_stream(&pad, &pipe, MediaType::Audio) handle_media_stream(&pad, &pipe, MediaType::Audio)
} else { } else {
println!("Unknown pad {:?}, ignoring", pad); println!("Unknown pad {:?}, ignoring", pad);
Ok(()) Ok(())
} {
Ok(()) => return None,
Err(err) => {
app_control.send_bus_error(format!("Error adding pad with caps {} {:?}", name, err));
return None;
}
}; };
if let Err(err) = handled {
app_control.send_bus_error(&format!("Error adding pad with caps {} {:?}", name, err));
}
None
} }
fn on_incoming_stream( fn on_incoming_stream(
@ -302,7 +303,7 @@ fn send_ice_candidate_message(app_control: &AppControl, values: &[glib::Value])
let mlineindex = values[1].get::<u32>().expect("Invalid argument"); let mlineindex = values[1].get::<u32>().expect("Invalid argument");
let candidate = values[2].get::<String>().expect("Invalid argument"); let candidate = values[2].get::<String>().expect("Invalid argument");
let message = serde_json::to_string(&JsonMsg::Ice { let message = serde_json::to_string(&JsonMsg::Ice {
candidate: candidate, candidate,
sdp_mline_index: mlineindex, sdp_mline_index: mlineindex,
}).unwrap(); }).unwrap();
app_control.send_text_msg(message.to_string()); app_control.send_text_msg(message.to_string());
@ -374,7 +375,7 @@ fn add_audio_source(pipeline: &gst::Pipeline, webrtcbin: &gst::Element) -> Resul
impl AppControl { impl AppControl {
fn app_state_eq(&self, state: AppState, error_msg: &'static str) -> bool { fn app_state_eq(&self, state: AppState, error_msg: &'static str) -> bool {
if { self.0.lock().unwrap().app_state != state } { if { self.0.lock().unwrap().app_state != state } {
self.send_bus_error(String::from(error_msg)); self.send_bus_error(error_msg);
false false
} else { } else {
true true
@ -384,14 +385,14 @@ impl AppControl {
fn app_state_cmp(&self, state: AppState, error_msg: &'static str) -> Ordering { fn app_state_cmp(&self, state: AppState, error_msg: &'static str) -> Ordering {
match { self.0.lock().unwrap().app_state.cmp(&state) } { match { self.0.lock().unwrap().app_state.cmp(&state) } {
Ordering::Less => { Ordering::Less => {
self.send_bus_error(String::from(error_msg)); self.send_bus_error(error_msg);
Ordering::Less Ordering::Less
} }
_foo => _foo, _foo => _foo,
} }
} }
fn send_bus_error(&self, body: String) { fn send_bus_error(&self, body: &str) {
let mbuilder = let mbuilder =
gst::Message::new_application(gst::Structure::new("error", &[("body", &body)])); gst::Message::new_application(gst::Structure::new("error", &[("body", &body)]));
let _ = self.0.lock().unwrap().bus.post(&mbuilder.build()); let _ = self.0.lock().unwrap().bus.post(&mbuilder.build());
@ -422,7 +423,8 @@ impl AppControl {
fn start_pipeline(&self) -> Result<(), Error> { fn start_pipeline(&self) -> Result<(), Error> {
let pipe = self.construct_pipeline()?; let pipe = self.construct_pipeline()?;
let webrtc = pipe.clone() let webrtc = pipe
.clone()
.dynamic_cast::<gst::Bin>() .dynamic_cast::<gst::Bin>()
.unwrap() .unwrap()
.get_by_name("sendrecv") .get_by_name("sendrecv")
@ -495,20 +497,21 @@ impl AppControl {
AppState::ServerRegisteringError => AppState::ServerRegisteringError, AppState::ServerRegisteringError => AppState::ServerRegisteringError,
AppState::PeerConnectionError => AppState::PeerConnectionError, AppState::PeerConnectionError => AppState::PeerConnectionError,
AppState::PeerCallError => AppState::PeerCallError, AppState::PeerCallError => AppState::PeerCallError,
AppState::AppStateErr => AppState::AppStateErr, AppState::Error => AppState::Error,
AppState::ServerConnected => AppState::AppStateErr, AppState::ServerConnected => AppState::Error,
AppState::ServerRegistered => AppState::AppStateErr, AppState::ServerRegistered => AppState::Error,
AppState::PeerCallStarted => AppState::AppStateErr, AppState::PeerCallStarted => AppState::Error,
}; };
return Err(WsError(error))?;
Err(WsError(error))?
} }
fn handle_sdp(&self, type_: String, sdp: String) { fn handle_sdp(&self, type_: &str, sdp: &str) {
if !self.app_state_eq(AppState::PeerCallNegotiating, "Not ready to handle sdp") { if !self.app_state_eq(AppState::PeerCallNegotiating, "Not ready to handle sdp") {
return; return;
} }
if type_ != "answer" { if type_ != "answer" {
self.send_bus_error(String::from("Sdp type is not \"anser\"")); self.send_bus_error("Sdp type is not \"answer\"");
return; return;
} }
@ -527,7 +530,7 @@ impl AppControl {
.unwrap(); .unwrap();
app_control.app_state = AppState::PeerCallStarted; app_control.app_state = AppState::PeerCallStarted;
} }
fn handle_ice(&self, sdp_mline_index: u32, candidate: String) { fn handle_ice(&self, sdp_mline_index: u32, candidate: &str) {
let app_control = self.0.lock().unwrap(); let app_control = self.0.lock().unwrap();
app_control app_control
.webrtc .webrtc
@ -536,7 +539,7 @@ impl AppControl {
.emit("add-ice-candidate", &[&sdp_mline_index, &candidate]) .emit("add-ice-candidate", &[&sdp_mline_index, &candidate])
.unwrap(); .unwrap();
} }
fn on_message(&mut self, msg: String) -> Result<(), Error> { fn on_message(&mut self, msg: &str) -> Result<(), Error> {
if msg == "HELLO" { if msg == "HELLO" {
return self.handle_hello(); return self.handle_hello();
} }
@ -548,18 +551,18 @@ impl AppControl {
println!("Got error message! {}", msg); println!("Got error message! {}", msg);
return self.handle_error(); return self.handle_error();
} }
let json_msg: JsonMsg = serde_json::from_str(&msg)?; let json_msg: JsonMsg = serde_json::from_str(msg)?;
match json_msg { match json_msg {
JsonMsg::Sdp { type_, sdp } => self.handle_sdp(type_, sdp), JsonMsg::Sdp { type_, sdp } => self.handle_sdp(&type_, &sdp),
JsonMsg::Ice { JsonMsg::Ice {
sdp_mline_index, sdp_mline_index,
candidate, candidate,
} => self.handle_ice(sdp_mline_index, candidate), } => self.handle_ice(sdp_mline_index, &candidate),
}; };
Ok(()) Ok(())
} }
fn close_and_quit(&self, err: Error) { fn close_and_quit(&self, err: &Error) {
let app_control = self.0.lock().unwrap(); let app_control = self.0.lock().unwrap();
println!("{}\nquitting", err); println!("{}\nquitting", err);
app_control app_control
@ -614,13 +617,12 @@ fn send_loop(
return; return;
} }
}; };
match msg {
OwnedMessage::Close(_) => { if let OwnedMessage::Close(_) = msg {
let _ = sender.send_message(&msg); let _ = sender.send_message(&msg);
return; return;
} }
_ => (),
}
match sender.send_message(&msg) { match sender.send_message(&msg) {
Ok(()) => (), Ok(()) => (),
Err(err) => println!("Error sending {:?}", err), Err(err) => println!("Error sending {:?}", err),
@ -683,7 +685,7 @@ fn handle_application_msg(
let msg = struc.get_value("body").unwrap(); let msg = struc.get_value("body").unwrap();
app_control.on_message(msg.get().unwrap()) app_control.on_message(msg.get().unwrap())
} }
"ws-error" => Err(WsError(app_control.0.lock().unwrap().app_state.clone()))?, "ws-error" => Err(WsError(app_control.0.lock().unwrap().app_state))?,
"error" => { "error" => {
let msg: String = struc.get_value("body").unwrap().get().unwrap(); let msg: String = struc.get_value("body").unwrap().get().unwrap();
Err(BusError(msg))? Err(BusError(msg))?
@ -697,13 +699,10 @@ fn handle_application_msg(
fn main() { fn main() {
gst::init().unwrap(); gst::init().unwrap();
match check_plugins() { if let Err(err) = check_plugins() {
Err(err) => {
println!("{:?}", err); println!("{:?}", err);
return; return;
} }
_ => {}
}
let (server, peer_id) = parse_args(); let (server, peer_id) = parse_args();
@ -733,8 +732,8 @@ fn main() {
let app_control = AppControl(Arc::new(Mutex::new(AppControlInner { let app_control = AppControl(Arc::new(Mutex::new(AppControlInner {
webrtc: None, webrtc: None,
pipeline: pipeline, pipeline,
send_msg_tx: send_msg_tx, send_msg_tx,
bus: bus.clone(), bus: bus.clone(),
main_loop: main_loop.clone(), main_loop: main_loop.clone(),
peer_id: peer_id.to_string(), peer_id: peer_id.to_string(),
@ -746,16 +745,15 @@ fn main() {
let mut app_control = app_control.clone(); let mut app_control = app_control.clone();
use gst::message::MessageView; use gst::message::MessageView;
match msg.view() { match msg.view() {
MessageView::Error(err) => app_control.close_and_quit(Error::from(err.get_error())), MessageView::Error(err) => app_control.close_and_quit(&Error::from(err.get_error())),
MessageView::Warning(warning) => { MessageView::Warning(warning) => {
println!("Warning: \"{}\"", warning.get_debug().unwrap()); println!("Warning: \"{}\"", warning.get_debug().unwrap());
} }
MessageView::Application(a) => { MessageView::Application(a) => {
let struc = a.get_structure().unwrap(); let struc = a.get_structure().unwrap();
match handle_application_msg(&mut app_control, struc) { if let Err(err) = handle_application_msg(&mut app_control, struc) {
Err(err) => app_control.close_and_quit(err), app_control.close_and_quit(&err)
_ => {} }
};
} }
_ => {} _ => {}
}; };