mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-04-29 13:05:00 +00:00
Code Issues Projects Releases Wiki Activity

webrtchttp: Do not import element_imp_error

Browse source 
element_imp_error and such macros should not be imported but rather
only be accessed via gst namespace.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1008>
This commit is contained in:
Sanchayan Maity 2022-11-29 10:40:01 +05:30 committed by Sebastian Dröge
parent 3202c4dc39
commit 1d4d9b3bdb
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
net/webrtchttp/src/whepsrc/imp.rs
View file

@ -13,7 +13,7 @@ use crate::utils::{
use crate::GstRsWebRTCICETransportPolicy; use crate::GstRsWebRTCICETransportPolicy;
use bytes::Bytes; use bytes::Bytes;
use futures::future; use futures::future;
use gst::{element_imp_error, glib, prelude::*, subclass::prelude::*, ErrorMessage}; use gst::{glib, prelude::*, subclass::prelude::*, ErrorMessage};
use gst_sdp::*; use gst_sdp::*;
use gst_webrtc::*; use gst_webrtc::*;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
@ -469,7 +469,7 @@ impl WhepSrc {
} }
WebRTCICEConnectionState::Failed => { WebRTCICEConnectionState::Failed => {
self_.terminate_session(); self_.terminate_session();
element_imp_error!(self_, gst::ResourceError::Failed, ["ICE failed"]); gst::element_imp_error!(self_, gst::ResourceError::Failed, ["ICE failed"]);
} }
WebRTCICEConnectionState::Disconnected => (), WebRTCICEConnectionState::Disconnected => (),
WebRTCICEConnectionState::Closed => (), WebRTCICEConnectionState::Closed => (),
@ -498,7 +498,7 @@ impl WhepSrc {
WebRTCPeerConnectionState::Disconnected => (), WebRTCPeerConnectionState::Disconnected => (),
WebRTCPeerConnectionState::Failed => { WebRTCPeerConnectionState::Failed => {
self_.terminate_session(); self_.terminate_session();
element_imp_error!( gst::element_imp_error!(
self_, self_,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["PeerConnection failed"] ["PeerConnection failed"]
@ -550,7 +550,7 @@ impl WhepSrc {
let endpoint = let endpoint =
reqwest::Url::parse(settings.whep_endpoint.as_ref().unwrap().as_str()); reqwest::Url::parse(settings.whep_endpoint.as_ref().unwrap().as_str());
if let Err(e) = endpoint { if let Err(e) = endpoint {
element_imp_error!( gst::element_imp_error!(
self_, self_,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Could not parse WHEP endpoint URL :{}", e] ["Could not parse WHEP endpoint URL :{}", e]
@ -568,7 +568,7 @@ impl WhepSrc {
drop(state); drop(state);
if let Err(e) = self_.initial_post_request(endpoint.unwrap()) { if let Err(e) = self_.initial_post_request(endpoint.unwrap()) {
element_imp_error!( gst::element_imp_error!(
self_, self_,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Error in initial post request - {}", e.to_string()] ["Error in initial post request - {}", e.to_string()]
@ -801,7 +801,7 @@ impl WhepSrc {
let reply = match reply { let reply = match reply {
Ok(Some(reply)) => reply, Ok(Some(reply)) => reply,
Ok(None) => { Ok(None) => {
element_imp_error!( gst::element_imp_error!(
self_, self_,
gst::LibraryError::Failed, gst::LibraryError::Failed,
["generate offer::Promise returned with no reply"] ["generate offer::Promise returned with no reply"]
@ -809,7 +809,7 @@ impl WhepSrc {
return; return;
} }
Err(e) => { Err(e) => {
element_imp_error!( gst::element_imp_error!(
self_, self_,
gst::LibraryError::Failed, gst::LibraryError::Failed,
["generate offer::Promise returned with error {:?}", e] ["generate offer::Promise returned with error {:?}", e]
@ -835,7 +835,7 @@ impl WhepSrc {
); );
} else { } else {
gst::error!(CAT, imp: self_, "Reply without an offer: {}", reply); gst::error!(CAT, imp: self_, "Reply without an offer: {}", reply);
element_imp_error!( gst::element_imp_error!(
self_, self_,
gst::LibraryError::Failed, gst::LibraryError::Failed,
["generate offer::Promise returned with no reply"] ["generate offer::Promise returned with no reply"]
@ -907,7 +907,7 @@ impl WhepSrc {
let offer_sdp = match local_desc { let offer_sdp = match local_desc {
None => { None => {
element_imp_error!( gst::element_imp_error!(
self, self,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Local description is not set"] ["Local description is not set"]
@ -925,7 +925,7 @@ impl WhepSrc {
); );
if let Err(e) = self.send_sdp(offer_sdp.sdp()) { if let Err(e) = self.send_sdp(offer_sdp.sdp()) {
element_imp_error!( gst::element_imp_error!(
self, self,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Error in sending answer - {}", e.to_string()] ["Error in sending answer - {}", e.to_string()]
@ -1034,7 +1034,7 @@ impl WhepSrc {
(State::Stopped, whep_resource_url.clone()) (State::Stopped, whep_resource_url.clone())
} }
_ => { _ => {
element_imp_error!( gst::element_imp_error!(
self, self,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Terminated in unexpected state"] ["Terminated in unexpected state"]

9
net/webrtchttp/src/whipsink/imp.rs
View file

@ -12,7 +12,6 @@ use crate::utils::{
}; };
use crate::GstRsWebRTCICETransportPolicy; use crate::GstRsWebRTCICETransportPolicy;
use futures::future; use futures::future;
use gst::element_imp_error;
use gst::glib; use gst::glib;
use gst::prelude::*; use gst::prelude::*;
use gst::subclass::prelude::*; use gst::subclass::prelude::*;
@ -498,7 +497,7 @@ impl WhipSink {
/* Note that we check for a valid WHIP endpoint in change_state */ /* Note that we check for a valid WHIP endpoint in change_state */
let endpoint = reqwest::Url::parse(settings.whip_endpoint.as_ref().unwrap().as_str()); let endpoint = reqwest::Url::parse(settings.whip_endpoint.as_ref().unwrap().as_str());
if let Err(e) = endpoint { if let Err(e) = endpoint {
element_imp_error!( gst::element_imp_error!(
self, self,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Could not parse endpoint URL: {}", e] ["Could not parse endpoint URL: {}", e]
@ -520,7 +519,7 @@ impl WhipSink {
let offer_sdp = match local_desc { let offer_sdp = match local_desc {
None => { None => {
element_imp_error!( gst::element_imp_error!(
self, self,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Local description is not set"] ["Local description is not set"]
@ -540,7 +539,7 @@ impl WhipSink {
match self.do_post(offer_sdp, endpoint.unwrap()) { match self.do_post(offer_sdp, endpoint.unwrap()) {
Ok(_) => (), Ok(_) => (),
Err(e) => { Err(e) => {
element_imp_error!( gst::element_imp_error!(
self, self,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Failed to send offer: {}", e] ["Failed to send offer: {}", e]
@ -831,7 +830,7 @@ impl WhipSink {
(State::Stopped, resource_url.clone()) (State::Stopped, resource_url.clone())
} }
_ => { _ => {
element_imp_error!( gst::element_imp_error!(
self, self,
gst::ResourceError::Failed, gst::ResourceError::Failed,
["Terminated in unexpected state"] ["Terminated in unexpected state"]