rename RTCRtpTransceiver to RTCRtpTransceiverInternal

Author: yngrtc

rtc/src/peer_connection/handler/endpoint.rs

@@ -12,7 +12,7 @@ use crate::peer_connection::configuration::media_engine::MediaEngine;
 use crate::peer_connection::event::track_event::{RTCTrackEvent, RTCTrackEventInit};
 use crate::rtp_transceiver::rtp_receiver::internal::RTCRtpReceiverInternal;
 use crate::rtp_transceiver::rtp_sender::{RTCRtpCodingParameters, RTCRtpHeaderExtensionCapability};
-use crate::rtp_transceiver::{RTCRtpReceiverId, RTCRtpTransceiver, SSRC};
+use crate::rtp_transceiver::{RTCRtpReceiverId, SSRC, internal::RTCRtpTransceiverInternal};
 use crate::statistics::accumulator::RTCStatsAccumulator;
 use interceptor::{Interceptor, Packet};
 use log::{debug, trace, warn};
@@ -36,7 +36,7 @@ where
     I: Interceptor,
 {
     ctx: &'a mut EndpointHandlerContext,
-    rtp_transceivers: &'a mut Vec<RTCRtpTransceiver<I>>,
+    rtp_transceivers: &'a mut Vec<RTCRtpTransceiverInternal<I>>,
     media_engine: &'a MediaEngine,
     interceptor: &'a mut I,
     stats: &'a mut RTCStatsAccumulator,
@@ -48,7 +48,7 @@ where
 {
     pub(crate) fn new(
         ctx: &'a mut EndpointHandlerContext,
-        rtp_transceivers: &'a mut Vec<RTCRtpTransceiver<I>>,
+        rtp_transceivers: &'a mut Vec<RTCRtpTransceiverInternal<I>>,
         media_engine: &'a MediaEngine,
         interceptor: &'a mut I,
         stats: &'a mut RTCStatsAccumulator,

rtc/src/peer_connection/internal.rs

@@ -582,7 +582,10 @@ where
     /// add_rtp_transceiver appends t into rtp_transceivers
     /// and fires onNegotiationNeeded;
     /// caller of this method should hold `self.mu` lock
-    pub(super) fn add_rtp_transceiver(&mut self, t: RTCRtpTransceiver<I>) -> RTCRtpTransceiverId {
+    pub(super) fn add_rtp_transceiver(
+        &mut self,
+        t: RTCRtpTransceiverInternal<I>,
+    ) -> RTCRtpTransceiverId {
         self.rtp_transceivers.push(t);
         self.trigger_negotiation_needed();
         self.rtp_transceivers.len() - 1
@@ -1001,14 +1004,18 @@ where
         &self,
         track: MediaStreamTrack,
         mut init: RTCRtpTransceiverInit,
-    ) -> Result<RTCRtpTransceiver<I>> {
+    ) -> Result<RTCRtpTransceiverInternal<I>> {
         if init.direction == RTCRtpTransceiverDirection::Unspecified {
             Err(Error::ErrPeerConnAddTransceiverFromTrackSupport)
         } else {
             if init.send_encodings.is_empty() {
                 init.send_encodings = self.send_encodings_from_track(&track);
             }
-            Ok(RTCRtpTransceiver::new(track.kind(), Some(track), init))
+            Ok(RTCRtpTransceiverInternal::new(
+                track.kind(),
+                Some(track),
+                init,
+            ))
         }
     }
 

rtc/src/peer_connection/mod.rs

@@ -295,7 +295,8 @@ use crate::rtp_transceiver::rtp_sender::{
     RTCRtpCodingParameters, RTCRtpEncodingParameters, RTCRtpSender,
 };
 use crate::rtp_transceiver::{
-    RTCRtpReceiverId, RTCRtpSenderId, RTCRtpTransceiver, RTCRtpTransceiverId, RTCRtpTransceiverInit,
+    RTCRtpReceiverId, RTCRtpSenderId, RTCRtpTransceiverId, RTCRtpTransceiverInit,
+    internal::RTCRtpTransceiverInternal,
 };
 use crate::statistics::StatsSelector;
 use crate::statistics::accumulator::RTCStatsAccumulator;
@@ -656,7 +657,7 @@ where
     //////////////////////////////////////////////////
     pub(crate) pipeline_context: PipelineContext,
     pub(crate) data_channels: HashMap<RTCDataChannelId, RTCDataChannelInternal>,
-    pub(super) rtp_transceivers: Vec<RTCRtpTransceiver<I>>,
+    pub(super) rtp_transceivers: Vec<RTCRtpTransceiverInternal<I>>,
 
     greater_mid: isize,
     sdp_origin: Origin,
@@ -1382,7 +1383,7 @@ where
                                     RTCRtpTransceiverDirection::Recvonly
                                 };
 
-                            let mut transceiver = RTCRtpTransceiver::new(
+                            let mut transceiver = RTCRtpTransceiverInternal::new(
                                 kind,
                                 None,
                                 RTCRtpTransceiverInit {
@@ -2094,7 +2095,7 @@ where
                     return Err(Error::ErrRTPSenderNoBaseEncoding);
                 }
             }
-            RTCRtpTransceiverDirection::Recvonly => RTCRtpTransceiver::new(
+            RTCRtpTransceiverDirection::Recvonly => RTCRtpTransceiverInternal::new(
                 kind,
                 None,
                 RTCRtpTransceiverInit {

rtc/src/peer_connection/sdp/mod.rs

@@ -165,7 +165,8 @@ use crate::rtp_transceiver::direction::RTCRtpTransceiverDirection;
 use crate::rtp_transceiver::rtp_sender::rtp_codec::{RTCRtpCodec, RtpCodecKind};
 use crate::rtp_transceiver::rtp_sender::rtp_codec_parameters::RTCRtpCodecParameters;
 use crate::rtp_transceiver::{
-    PayloadType, RTCRtpTransceiver, RtpStreamId, SSRC, rtp_sender::rtcp_parameters::RTCPFeedback,
+    PayloadType, RtpStreamId, SSRC, internal::RTCRtpTransceiverInternal,
+    rtp_sender::rtcp_parameters::RTCPFeedback,
 };
 use ice::candidate::{Candidate, unmarshal_candidate};
 use interceptor::Interceptor;
@@ -616,7 +617,7 @@ where
         mut d: SessionDescription,
         dtls_fingerprints: &[RTCDtlsFingerprint],
         media_engine: &MediaEngine,
-        transceivers: &mut [RTCRtpTransceiver<I>],
+        transceivers: &mut [RTCRtpTransceiverInternal<I>],
         ice_params: &RTCIceParameters,
         candidates: &[RTCIceCandidate],
         media_section: &MediaSection,
@@ -820,7 +821,7 @@ where
     fn add_sender_sdp(
         mut media: MediaDescription,
         media_engine: &MediaEngine,
-        transceiver: &mut RTCRtpTransceiver<I>,
+        transceiver: &mut RTCRtpTransceiverInternal<I>,
         write_ssrc_attributes_for_simulcast: bool,
     ) -> (MediaDescription, Vec<RtpStreamId>) {
         let mut send_rids = vec![];
@@ -986,13 +987,59 @@ impl<I> RTCPeerConnection<I>
 where
     I: Interceptor,
 {
+    pub(crate) fn find_by_mid(
+        mid: &String,
+        local_transceivers: &[RTCRtpTransceiverInternal<I>],
+    ) -> Option<usize> {
+        local_transceivers
+            .iter()
+            .enumerate()
+            .find(|(_i, t)| t.mid().as_ref() == Some(mid))
+            .map(|(i, _v)| i)
+    }
+
+    /// Given a direction+type pluck a transceiver from the passed list
+    /// if no entry satisfies the requested type+direction return a inactive Transceiver
+    pub(crate) fn satisfy_type_and_direction(
+        remote_kind: RtpCodecKind,
+        remote_direction: RTCRtpTransceiverDirection,
+        local_transceivers: &mut [RTCRtpTransceiverInternal<I>],
+    ) -> Option<&mut RTCRtpTransceiverInternal<I>> {
+        // Get direction order from most preferred to least
+        let get_preferred_directions = || -> Vec<RTCRtpTransceiverDirection> {
+            match remote_direction {
+                RTCRtpTransceiverDirection::Sendrecv => vec![
+                    RTCRtpTransceiverDirection::Recvonly,
+                    RTCRtpTransceiverDirection::Sendrecv,
+                ],
+                RTCRtpTransceiverDirection::Sendonly => vec![RTCRtpTransceiverDirection::Recvonly],
+                RTCRtpTransceiverDirection::Recvonly => vec![
+                    RTCRtpTransceiverDirection::Sendonly,
+                    RTCRtpTransceiverDirection::Sendrecv,
+                ],
+                _ => vec![],
+            }
+        };
+
+        for possible_direction in get_preferred_directions() {
+            // Find the index first to avoid multiple mutable borrows
+            if let Some(index) = local_transceivers.iter().position(|t| {
+                t.mid().is_none() && t.kind() == remote_kind && possible_direction == t.direction()
+            }) {
+                return Some(&mut local_transceivers[index]);
+            }
+        }
+
+        None
+    }
+
     /// populate_sdp serializes a PeerConnections state into an SDP
     #[allow(clippy::too_many_arguments)]
     pub(crate) fn populate_sdp(
         mut d: SessionDescription,
         dtls_fingerprints: &[RTCDtlsFingerprint],
         media_engine: &MediaEngine,
-        transceivers: &mut [RTCRtpTransceiver<I>],
+        transceivers: &mut [RTCRtpTransceiverInternal<I>],
         candidates: &[RTCIceCandidate],
         ice_params: &RTCIceParameters,
         media_sections: &[MediaSection],