Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/sdroege/gst-plugin-rs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorFrançois Laignel <fengalin@free.fr>2022-10-23 21:46:18 +0300
committerFrançois Laignel <fengalin@free.fr>2022-10-23 22:22:31 +0300
commit86776be58c5d7e8607653edcd719ac1f0ba8d992 (patch)
tree64deeda8be7e7b4850157a1e306425f1ce8f965d /net
parentfe8e0a8bf8cdb67d913318f63b621370c45aedda (diff)
Remove `&` for `obj` in log macros
This is no longer necessary. See https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1137
Diffstat (limited to 'net')
-rw-r--r--net/ndi/src/ndisrc/receiver.rs18
-rw-r--r--net/rtp/src/gcc/imp.rs2
-rw-r--r--net/webrtc/src/signaller/imp.rs26
-rw-r--r--net/webrtc/src/webrtcsink/imp.rs20
4 files changed, 33 insertions, 33 deletions
diff --git a/net/ndi/src/ndisrc/receiver.rs b/net/ndi/src/ndisrc/receiver.rs
index ac88a762..97f05937 100644
--- a/net/ndi/src/ndisrc/receiver.rs
+++ b/net/ndi/src/ndisrc/receiver.rs
@@ -760,13 +760,13 @@ impl Receiver {
let flushing = {
let queue = (receiver.0.queue.0).0.lock().unwrap();
if queue.shutdown {
- gst::debug!(CAT, obj: &element, "Shutting down");
+ gst::debug!(CAT, obj: element, "Shutting down");
break;
}
// If an error happened in the meantime, just go out of here
if queue.error.is_some() {
- gst::error!(CAT, obj: &element, "Error while waiting for connection");
+ gst::error!(CAT, obj: element, "Error while waiting for connection");
return;
}
@@ -781,7 +781,7 @@ impl Receiver {
let res = match recv.capture(50) {
_ if flushing => {
- gst::debug!(CAT, obj: &element, "Flushing");
+ gst::debug!(CAT, obj: element, "Flushing");
Err(gst::FlowError::Flushing)
}
Err(_) => {
@@ -793,11 +793,11 @@ impl Receiver {
Err(gst::FlowError::Error)
}
Ok(None) if timeout > 0 && timer.elapsed().as_millis() >= timeout as u128 => {
- gst::debug!(CAT, obj: &element, "Timed out -- assuming EOS",);
+ gst::debug!(CAT, obj: element, "Timed out -- assuming EOS",);
Err(gst::FlowError::Eos)
}
Ok(None) => {
- gst::debug!(CAT, obj: &element, "No frame received yet, retry");
+ gst::debug!(CAT, obj: element, "No frame received yet, retry");
continue;
}
Ok(Some(Frame::Video(frame))) => {
@@ -832,7 +832,7 @@ impl Receiver {
if let Some(metadata) = frame.metadata() {
gst::debug!(
CAT,
- obj: &element,
+ obj: element,
"Received metadata at timecode {}: {}",
(frame.timecode() as u64 * 100).nseconds(),
metadata,
@@ -849,7 +849,7 @@ impl Receiver {
while queue.buffer_queue.len() > receiver.0.max_queue_length {
gst::warning!(
CAT,
- obj: &element,
+ obj: element,
"Dropping old buffer -- queue has {} items",
queue.buffer_queue.len()
);
@@ -860,7 +860,7 @@ impl Receiver {
timer = time::Instant::now();
}
Err(gst::FlowError::Eos) => {
- gst::debug!(CAT, obj: &element, "Signalling EOS");
+ gst::debug!(CAT, obj: element, "Signalling EOS");
let mut queue = (receiver.0.queue.0).0.lock().unwrap();
queue.timeout = true;
(receiver.0.queue.0).1.notify_one();
@@ -874,7 +874,7 @@ impl Receiver {
timer = time::Instant::now();
}
Err(err) => {
- gst::error!(CAT, obj: &element, "Signalling error");
+ gst::error!(CAT, obj: element, "Signalling error");
let mut queue = (receiver.0.queue.0).0.lock().unwrap();
if queue.error.is_none() {
queue.error = Some(err);
diff --git a/net/rtp/src/gcc/imp.rs b/net/rtp/src/gcc/imp.rs
index 09f82c5d..a851ad62 100644
--- a/net/rtp/src/gcc/imp.rs
+++ b/net/rtp/src/gcc/imp.rs
@@ -1106,7 +1106,7 @@ impl BandwidthEstimator {
if !list.is_empty() {
if let Err(err) = bwe.imp().push_list(list) {
- gst::error!(CAT, obj: &bwe, "pause task, reason: {err:?}");
+ gst::error!(CAT, obj: bwe, "pause task, reason: {err:?}");
pause()
}
}
diff --git a/net/webrtc/src/signaller/imp.rs b/net/webrtc/src/signaller/imp.rs
index 145d27c5..41153f46 100644
--- a/net/webrtc/src/signaller/imp.rs
+++ b/net/webrtc/src/signaller/imp.rs
@@ -85,7 +85,7 @@ impl Signaller {
let send_task_handle = task::spawn(async move {
while let Some(msg) = websocket_receiver.next().await {
if let Some(element) = element_clone.upgrade() {
- gst::trace!(CAT, obj: &element, "Sending websocket message {:?}", msg);
+ gst::trace!(CAT, obj: element, "Sending websocket message {:?}", msg);
}
ws_sink
.send(WsMessage::Text(serde_json::to_string(&msg).unwrap()))
@@ -93,7 +93,7 @@ impl Signaller {
}
if let Some(element) = element_clone.upgrade() {
- gst::info!(CAT, obj: &element, "Done sending");
+ gst::info!(CAT, obj: element, "Done sending");
}
ws_sink.send(WsMessage::Close(None)).await?;
@@ -121,14 +121,14 @@ impl Signaller {
if let Some(element) = element_clone.upgrade() {
match msg {
Ok(WsMessage::Text(msg)) => {
- gst::trace!(CAT, obj: &element, "Received message {}", msg);
+ gst::trace!(CAT, obj: element, "Received message {}", msg);
if let Ok(msg) = serde_json::from_str::<p::OutgoingMessage>(&msg) {
match msg {
p::OutgoingMessage::Welcome { peer_id } => {
gst::info!(
CAT,
- obj: &element,
+ obj: element,
"We are registered with the server, our peer id is {}",
peer_id
);
@@ -140,14 +140,14 @@ impl Signaller {
if let Err(err) =
element.start_session(&session_id, &peer_id)
{
- gst::warning!(CAT, obj: &element, "{}", err);
+ gst::warning!(CAT, obj: element, "{}", err);
}
}
p::OutgoingMessage::EndSession(session_info) => {
if let Err(err) =
element.end_session(&session_info.session_id)
{
- gst::warning!(CAT, obj: &element, "{}", err);
+ gst::warning!(CAT, obj: element, "{}", err);
}
}
p::OutgoingMessage::Peer(p::PeerMessage {
@@ -165,7 +165,7 @@ impl Signaller {
.unwrap(),
),
) {
- gst::warning!(CAT, obj: &element, "{}", err);
+ gst::warning!(CAT, obj: element, "{}", err);
}
}
p::PeerMessageInner::Sdp(p::SdpMessage::Offer {
@@ -173,7 +173,7 @@ impl Signaller {
}) => {
gst::warning!(
CAT,
- obj: &element,
+ obj: element,
"Ignoring offer from peer"
);
}
@@ -187,14 +187,14 @@ impl Signaller {
None,
&candidate,
) {
- gst::warning!(CAT, obj: &element, "{}", err);
+ gst::warning!(CAT, obj: element, "{}", err);
}
}
},
_ => {
gst::warning!(
CAT,
- obj: &element,
+ obj: element,
"Ignoring unsupported message {:?}",
msg
);
@@ -203,7 +203,7 @@ impl Signaller {
} else {
gst::error!(
CAT,
- obj: &element,
+ obj: element,
"Unknown message from server: {}",
msg
);
@@ -215,7 +215,7 @@ impl Signaller {
Ok(WsMessage::Close(reason)) => {
gst::info!(
CAT,
- obj: &element,
+ obj: element,
"websocket connection closed: {:?}",
reason
);
@@ -235,7 +235,7 @@ impl Signaller {
}
if let Some(element) = element_clone.upgrade() {
- gst::info!(CAT, obj: &element, "Stopped websocket receiving");
+ gst::info!(CAT, obj: element, "Stopped websocket receiving");
}
});
diff --git a/net/webrtc/src/webrtcsink/imp.rs b/net/webrtc/src/webrtcsink/imp.rs
index e9f2b240..387b72e0 100644
--- a/net/webrtc/src/webrtcsink/imp.rs
+++ b/net/webrtc/src/webrtcsink/imp.rs
@@ -1302,7 +1302,7 @@ impl WebRTCSink {
Ok(None) => {
gst::warning!(
CAT,
- obj: &element,
+ obj: element,
"Promise returned without a reply for {}",
session_id
);
@@ -1312,7 +1312,7 @@ impl WebRTCSink {
Err(err) => {
gst::warning!(
CAT,
- obj: &element,
+ obj: element,
"Promise returned with an error for {}: {:?}",
session_id,
err
@@ -1522,7 +1522,7 @@ impl WebRTCSink {
let this = Self::from_instance(&element);
gst::warning!(
CAT,
- obj: &element,
+ obj: element,
"Connection state for in session {} (peer {}) failed",
session_id_clone,
peer_id_clone
@@ -1532,7 +1532,7 @@ impl WebRTCSink {
_ => {
gst::log!(
CAT,
- obj: &element,
+ obj: element,
"Connection state in session {} (peer {}) changed: {:?}",
session_id_clone,
peer_id_clone,
@@ -1556,7 +1556,7 @@ impl WebRTCSink {
gst_webrtc::WebRTCICEConnectionState::Failed => {
gst::warning!(
CAT,
- obj: &element,
+ obj: element,
"Ice connection state in session {} (peer {}) failed",
session_id_clone,
peer_id_clone,
@@ -1566,7 +1566,7 @@ impl WebRTCSink {
_ => {
gst::log!(
CAT,
- obj: &element,
+ obj: element,
"Ice connection state in session {} (peer {}) changed: {:?}",
session_id_clone,
peer_id_clone,
@@ -1603,7 +1603,7 @@ impl WebRTCSink {
if let Some(element) = element_clone.upgrade() {
gst::log!(
CAT,
- obj: &element,
+ obj: element,
"Ice gathering state in session {} (peer {}) changed: {:?}",
session_id_clone,
peer_id_clone,
@@ -1708,7 +1708,7 @@ impl WebRTCSink {
}
gst::MessageView::Latency(..) => {
if let Some(pipeline) = pipeline_clone.upgrade() {
- gst::info!(CAT, obj: &pipeline, "Recalculating latency");
+ gst::info!(CAT, obj: pipeline, "Recalculating latency");
let _ = pipeline.recalculate_latency();
}
}
@@ -2295,7 +2295,7 @@ impl WebRTCSink {
match fut.await {
Ok(Err(err)) => {
- gst::error!(CAT, obj: &element, "error: {}", err);
+ gst::error!(CAT, obj: element, "error: {}", err);
gst::element_error!(
element,
gst::StreamError::CodecNotFound,
@@ -2638,7 +2638,7 @@ impl ObjectImpl for WebRTCSink {
gst::debug!(
CAT,
- obj: &element,
+ obj: element,
"applying default configuration on encoder {:?}",
enc
);