WIP: Make XDG notification end stream trigger on pipewire error

Instead of stopping the stream by detecting the same resolution/position
do so based on the pipewire error (no target node available). This
persists until the portal is restarted (either by invalidation or
Sunshine restart)

Author: Kishi85

src/platform/linux/portalgrab.cpp

@@ -741,8 +741,10 @@ namespace portal {
           }
 
           dbus_.reset();
-
           valid_ = false;
+
+          // Reset cached no target node indicator as the portal was reset
+          no_target_node_ = false;
         }
       } catch (const std::exception &e) {
         BOOST_LOG(error) << "[portalgrab] Exception during session invalidation: "sv << e.what();
@@ -759,6 +761,14 @@ namespace portal {
       maxframerate_failed_ = true;
     }
 
+    bool has_no_target_node() const {
+      return no_target_node_;
+    }
+
+    void set_no_target_node() {
+      no_target_node_ = true;
+    }
+
   private:
     session_cache_t() = default;
 
@@ -779,6 +789,7 @@ namespace portal {
     std::vector<pipewire_screenstream_t> pipewire_streams_;
     bool valid_ = false;
     bool maxframerate_failed_ = false;
+    bool no_target_node_ = false;
   };
 
   session_cache_t &session_cache_t::instance() {
@@ -1111,6 +1122,10 @@ namespace portal {
           }
           break;
         case PW_STREAM_STATE_ERROR:
+          if (std::string(err_msg).contains("no target node available") && !session_cache_t::instance().has_no_target_node()) {
+            BOOST_LOG(warning) << "[portalgrab] Pipewire node unavailable"sv;
+            session_cache_t::instance().set_no_target_node();
+          }else
           if (old != PW_STREAM_STATE_STREAMING && !session_cache_t::instance().is_maxframerate_failed()) {
             BOOST_LOG(warning) << "[portalgrab] Negotiation failed, will retry without maxFramerate"sv;
             session_cache_t::instance().set_maxframerate_failed();
@@ -1294,7 +1309,6 @@ namespace portal {
       if (session_cache_t::instance().get_or_create_session(pipewire_fd, pipewire_streams) < 0) {
         return -1;
       }
-
       // Match display_name to a stream from the pipewire_streams vector
       pipewire_screenstream_t stream = match_display_name_to_stream(pipewire_streams, display_name);
       if (!display_name.empty() && (stream.width < 0 || stream.height < 0)) {
@@ -1320,6 +1334,12 @@ namespace portal {
 
       framerate = config.framerate;
 
+      // Fail if the session cache indicates that there is no target node available (e.g. after user cancel)
+      if (session_cache_t::instance().has_no_target_node()) {
+        BOOST_LOG(warning) << "[portalgrab] Display init failed as PipeWire stream was stopped by user."sv;
+        return -1;
+      }
+
       if (!shared_state) {
         shared_state = std::make_shared<shared_state_t>();
       } else {
@@ -1331,7 +1351,6 @@ namespace portal {
 
       // Start PipeWire now so format negotiation can proceed before capture start
       pipewire.ensure_stream(mem_type, width, height, framerate, dmabuf_infos.data(), n_dmabuf_infos, display_is_nvidia);
-
       int timeout_ms = 1500;
       int negotiated_w = 0;
       int negotiated_h = 0;
@@ -1346,23 +1365,18 @@ namespace portal {
         timeout_ms -= 10;
       }
 
-      // Check previous logical dimensions
-      // FIXME: Handle switch_display_events that go to the same display without disconnecting the stream
-      // if (previous_width.load() == width && previous_height.load() == height && previous_pos_x.load() == pos_x && previous_pos_y.load() == pos_y) {
-      //   if (capture_running.load()) {
-      //     {
-      //       std::scoped_lock lock(pipewire.frame_mutex());
-      //       stream_stopped.store(true);
-      //     }
-      //     pipewire.frame_cv().notify_all();
-      //   }
-      // } else {
-        previous_width.store(width);
-        previous_height.store(height);
-        previous_pos_x.store(pos_x);
-        previous_pos_y.store(pos_y);
-      // }
+      // Stop running capture if the pipewire stream is not connected for any reason or the use ended the portal session
+      if ((timeout_ms <= 0 && !shared_state->stream_connected.load()) || session_cache_t::instance().has_no_target_node()) {
+         if (capture_running.load()) {
+           {
+             std::scoped_lock lock(pipewire.frame_mutex());
+             stream_stopped.store(true);
+           }
+           pipewire.frame_cv().notify_all();
+         }
+      }
 
+      // Set width and height to the values negotiated by pipewire
       if (negotiated_w > 0 && negotiated_h > 0 && (negotiated_w != width || negotiated_h != height)) {
         BOOST_LOG(info) << "[portalgrab] Using negotiated resolution "sv
                         << negotiated_w << "x" << negotiated_h;
@@ -1441,8 +1455,6 @@ namespace portal {
           BOOST_LOG(warning) << "[portalgrab] PipeWire stream stopped by user."sv;
           capture_running.store(false);
           stream_stopped.store(false);
-          previous_height.store(0);
-          previous_width.store(0);
           pipewire.frame_cv().notify_all();
           return platf::capture_e::error;
         }
@@ -1471,8 +1483,6 @@ namespace portal {
           case platf::capture_e::interrupted:
             capture_running.store(false);
             stream_stopped.store(false);
-            previous_height.store(0);
-            previous_width.store(0);
             pipewire.frame_cv().notify_all();
             return status;
           case platf::capture_e::timeout:
@@ -1481,8 +1491,6 @@ namespace portal {
               BOOST_LOG(info) << "[portalgrab] PipeWire: timeout -> interrupt nudge";
               capture_running.store(false);
               stream_stopped.store(false);
-              previous_height.store(0);
-              previous_width.store(0);
               pipewire.frame_cv().notify_all();
               return platf::capture_e::interrupted;
             }
@@ -1724,10 +1732,6 @@ namespace portal {
     std::optional<std::uint64_t> last_seq {};
     std::uint64_t sequence {};
     uint32_t framerate;
-    static inline std::atomic<uint32_t> previous_height {0};
-    static inline std::atomic<uint32_t> previous_width {0};
-    static inline std::atomic<uint32_t> previous_pos_x {0};
-    static inline std::atomic<uint32_t> previous_pos_y {0};
     static inline std::atomic<bool> stream_stopped {false};
     static inline std::atomic<bool> capture_running {false};
     std::shared_ptr<shared_state_t> shared_state;