diff --git a/backends/gstreamer/src/audio_decoder.rs b/backends/gstreamer/src/audio_decoder.rs index 3eca3494..eb0469a5 100644 --- a/backends/gstreamer/src/audio_decoder.rs +++ b/backends/gstreamer/src/audio_decoder.rs @@ -58,11 +58,11 @@ impl AudioDecoder for GStreamerAudioDecoder { // a pad that will show up when a certain condition is met, // in decodebins case that is media being decoded if let Err(e) = pipeline.add_many(&[&appsrc, &decodebin]) { - return callbacks.error(AudioDecoderError::Backend(e.0.to_owned())); + return callbacks.error(AudioDecoderError::Backend(e.to_string())); } if let Err(e) = gst::Element::link_many(&[&appsrc, &decodebin]) { - return callbacks.error(AudioDecoderError::Backend(e.0.to_owned())); + return callbacks.error(AudioDecoderError::Backend(e.to_string())); } let appsrc = appsrc.downcast::().unwrap(); @@ -161,7 +161,7 @@ impl AudioDecoder for GStreamerAudioDecoder { deinterleave .set_property("keep-positions", &true.to_value()) - .map_err(|e| AudioDecoderError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioDecoderError::Backend(e.to_string()))?; let pipeline_ = pipeline.downgrade(); let callbacks_ = callbacks.clone(); deinterleave.connect_pad_added(move |_, src_pad| { @@ -189,7 +189,7 @@ impl AudioDecoder for GStreamerAudioDecoder { )?; let appsink = sink.clone().dynamic_cast::().unwrap(); sink.set_property("sync", &false.to_value()) - .map_err(|e| AudioDecoderError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioDecoderError::Backend(e.to_string()))?; let callbacks_ = callbacks.clone(); appsink.set_callbacks( @@ -262,13 +262,13 @@ impl AudioDecoder for GStreamerAudioDecoder { let elements = &[&queue, &sink]; pipeline .add_many(elements) - .map_err(|e| AudioDecoderError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioDecoderError::Backend(e.to_string()))?; gst::Element::link_many(elements) - .map_err(|e| AudioDecoderError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioDecoderError::Backend(e.to_string()))?; for e in elements { e.sync_state_with_parent() - .map_err(|e| AudioDecoderError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioDecoderError::Backend(e.to_string()))?; } let sink_pad = @@ -308,13 +308,13 @@ impl AudioDecoder for GStreamerAudioDecoder { let elements = &[&convert, &resample, &filter, &deinterleave]; pipeline .add_many(elements) - .map_err(|e| AudioDecoderError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioDecoderError::Backend(e.to_string()))?; gst::Element::link_many(elements) - .map_err(|e| AudioDecoderError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioDecoderError::Backend(e.to_string()))?; for e in elements { e.sync_state_with_parent() - .map_err(|e| AudioDecoderError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioDecoderError::Backend(e.to_string()))?; } let sink_pad = convert diff --git a/backends/gstreamer/src/audio_sink.rs b/backends/gstreamer/src/audio_sink.rs index 0999d7ab..12fc6fdc 100644 --- a/backends/gstreamer/src/audio_sink.rs +++ b/backends/gstreamer/src/audio_sink.rs @@ -106,9 +106,9 @@ impl AudioSink for GStreamerAudioSink { )?; self.pipeline .add_many(&[&appsrc, &resample, &convert, &sink]) - .map_err(|e| AudioSinkError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioSinkError::Backend(e.to_string()))?; gst::Element::link_many(&[&appsrc, &resample, &convert, &sink]) - .map_err(|e| AudioSinkError::Backend(e.0.to_owned()))?; + .map_err(|e| AudioSinkError::Backend(e.to_string()))?; Ok(()) } diff --git a/backends/gstreamer/src/player.rs b/backends/gstreamer/src/player.rs index 9dcd9f85..75598b22 100644 --- a/backends/gstreamer/src/player.rs +++ b/backends/gstreamer/src/player.rs @@ -304,14 +304,14 @@ impl GStreamerPlayer { config.set_position_update_interval(500u32); player .set_config(config) - .map_err(|e| PlayerError::Backend(e.0.to_owned()))?; + .map_err(|e| PlayerError::Backend(e.to_string()))?; let video_sink = gst::ElementFactory::make("appsink", None) .ok_or(PlayerError::Backend("appsink creation failed".to_owned()))?; let pipeline = player.get_pipeline(); pipeline .set_property("video-sink", &video_sink.to_value()) - .map_err(|e| PlayerError::Backend(e.0.to_owned()))?; + .map_err(|e| PlayerError::Backend(e.to_string()))?; let video_sink = video_sink.dynamic_cast::().unwrap(); video_sink.set_caps(&gst::Caps::new_simple( "video/x-raw", @@ -330,7 +330,7 @@ impl GStreamerPlayer { // https://github.com/servo/servo/issues/22010#issuecomment-432599657 player .set_property("uri", &Value::from("appsrc://")) - .map_err(|e| PlayerError::Backend(e.0.to_owned()))?; + .map_err(|e| PlayerError::Backend(e.to_string()))?; *self.inner.borrow_mut() = Some(Arc::new(Mutex::new(PlayerInner { player,