fixes

Author: kbalt

media-video/capture/src/wayland/mod.rs

@@ -1,5 +1,8 @@
 use ashpd::{
-    desktop::screencast::{CursorMode, Screencast},
+    desktop::{
+        Session,
+        screencast::{CursorMode, Screencast},
+    },
     enumflags2::BitFlags,
 };
 use std::{os::fd::OwnedFd, thread};
@@ -168,8 +171,8 @@ pub struct CapturedDmaBufferSync {
 #[error("Stream has been closed")]
 pub struct StreamClosedError;
 
-#[derive(Clone)]
 pub struct StreamHandle {
+    session: Session<'static, Screencast<'static>>,
     sender: pipewire::channel::Sender<stream::Command>,
 }
 
@@ -186,7 +189,11 @@ impl StreamHandle {
             .map_err(|_| StreamClosedError)
     }
 
-    pub fn close(&self) -> Result<(), StreamClosedError> {
+    pub async fn close(&self) -> Result<(), StreamClosedError> {
+        if let Err(e) = self.session.close().await {
+            log::warn!("Failed to close xdg session properly {e}");
+        }
+
         self.sender
             .send(stream::Command::Close)
             .map_err(|_| StreamClosedError)
@@ -279,5 +286,5 @@ async fn start_screen_capture_boxed(
         .await
         .map_err(|_| StartCaptureError::CaptureThreadPanicked)??;
 
-    Ok(StreamHandle { sender })
+    Ok(StreamHandle { session, sender })
 }

media/rtc/src/rtp_session/inbound/mod.rs

@@ -4,7 +4,7 @@ use super::{ntp_timestamp::NtpTimestamp, report::ReportsQueue};
 use queue::InboundQueue;
 use rtp::{
     RtpPacket, Ssrc,
-    rtcp_types::{Fir, PayloadFeedback, Pli, ReportBlock, SenderReport},
+    rtcp_types::{Fir, PayloadFeedback, Pli, ReportBlock, SenderReport, TransportFeedback},
 };
 use std::time::{Duration, Instant};
 
@@ -114,8 +114,8 @@ impl RtpInboundStream {
         if self.emit_nack
             && let Some(nack) = self.queue.poll_nack(now)
         {
-            reports.add_payload_feedback(
-                PayloadFeedback::builder_owned(nack)
+            reports.add_transport_feedback(
+                TransportFeedback::builder_owned(nack)
                     .media_ssrc(self.ssrc.0)
                     .sender_ssrc(fallback_sender_ssrc.0),
             );