fix: concurrent transfer

binbat · Dec 22, 2023 · 4143531 · 4143531
1 parent 3b172dc
commit 4143531
Showing 1 changed file with 29 additions and 19 deletions.
diff --git a/src/forward/forward_internal.rs b/src/forward/forward_internal.rs
@@ -3,7 +3,7 @@ use std::hash::{Hash, Hasher};
 use std::sync::{Arc, Weak};
 
 use anyhow::Result;
-use log::{debug, info};
+use log::{debug, info, warn};
 use tokio::sync::mpsc::{channel, unbounded_channel, Receiver, Sender, UnboundedSender};
 use tokio::sync::RwLock;
 use webrtc::api::interceptor_registry::register_default_interceptors;
@@ -255,24 +255,34 @@ impl PeerForwardInternal {
                             drop(subscription_group);
                             let mut subscription_group =
                                 track_forward_original.subscription_group.write().await;
-                            let sender = subscription_group.remove(&peer).unwrap();
-                            drop(subscription_group);
-                            track_forward
-                                .subscription_group
-                                .write()
-                                .await
-                                .insert(peer.clone(), sender);
-                            let _ = track_forward
-                                .rtcp_send
-                                .try_send(RtcpMessage::PictureLossIndication);
-                            info!(
-                                "[{}] [subscribe] [{}] select layer {} to {} ",
-                                self.id,
-                                peer.get_key(),
-                                track_remote_original.0.rid(),
-                                rid
-                            );
-                            return Ok(());
+                            if let Some(sender) = subscription_group.remove(&peer) {
+                                drop(subscription_group);
+                                track_forward
+                                    .subscription_group
+                                    .write()
+                                    .await
+                                    .insert(peer.clone(), sender);
+                                let _ = track_forward
+                                    .rtcp_send
+                                    .try_send(RtcpMessage::PictureLossIndication);
+                                info!(
+                                    "[{}] [subscribe] [{}] select layer {} to {} success",
+                                    self.id,
+                                    peer.get_key(),
+                                    track_remote_original.0.rid(),
+                                    rid
+                                );
+                                return Ok(());
+                            } else {
+                                warn!(
+                                    "[{}] [subscribe] [{}] select layer {} to {} fail,concurrent transfer",
+                                    self.id,
+                                    peer.get_key(),
+                                    track_remote_original.0.rid(),
+                                    rid
+                                );
+                                return Err(anyhow::anyhow!("concurrent transfer"));
+                            }
                         }
                     }
                 }