Move RtcRtpSendParameters into submodule in medea-flutter-webrtc-native crate (#225, #210)

Author: turtletongue

crates/native/src/api/mod.rs

@@ -4,6 +4,7 @@ pub mod capability;
 pub mod media_info;
 pub mod media_stream_track;
 pub mod rtc_rtp_encoding_parameters;
+pub mod rtc_rtp_send_parameters;
 pub mod stats;
 
 use std::{
@@ -35,6 +36,7 @@ pub use self::{
         track_state, track_width, update_audio_processing,
     },
     rtc_rtp_encoding_parameters::RtcRtpEncodingParameters,
+    rtc_rtp_send_parameters::RtcRtpSendParameters,
     stats::{
         CandidateType, IceCandidateStats, IceRole, Protocol,
         RtcIceCandidateStats, RtcInboundRtpStreamMediaType,
@@ -641,37 +643,6 @@ pub struct RtcRtpTransceiver {
     pub direction: RtpTransceiverDirection,
 }
 
-/// Representation of [RTCRtpSendParameters][0].
-///
-/// [0]: https://w3.org/TR/webrtc#dom-rtcrtpsendparameters
-pub struct RtcRtpSendParameters {
-    /// Sequence containing parameters for sending [RTP] encodings of media.
-    ///
-    /// [RTP]: https://en.wikipedia.org/wiki/Real-time_Transport_Protocol
-    pub encodings:
-        Vec<(RtcRtpEncodingParameters, RustOpaque<Arc<RtpEncodingParameters>>)>,
-
-    /// Reference to the Rust side [`RtpParameters`].
-    pub inner: RustOpaque<Arc<RtpParameters>>,
-}
-
-impl From<RtpParameters> for RtcRtpSendParameters {
-    fn from(v: RtpParameters) -> Self {
-        let encodings = v
-            .get_encodings()
-            .into_iter()
-            .map(|e| {
-                (
-                    RtcRtpEncodingParameters::from(&e),
-                    RustOpaque::new(Arc::new(RtpEncodingParameters::from(e))),
-                )
-            })
-            .collect();
-
-        Self { encodings, inner: RustOpaque::new(Arc::new(v)) }
-    }
-}
-
 /// Representation of a track event, sent when a new [`MediaStreamTrack`] is
 /// added to an [`RtcRtpTransceiver`] as part of a [`PeerConnection`].
 #[derive(Clone)]

crates/native/src/api/rtc_rtp_send_parameters.rs

@@ -0,0 +1,41 @@
+//! [RTCRtpSendParameters][0] definitions.
+//!
+//! [0]: https://w3.org/TR/webrtc#dom-rtcrtpsendparameters
+
+use std::sync::Arc;
+
+use crate::{
+    RtpEncodingParameters, RtpParameters, api::RtcRtpEncodingParameters,
+    frb_generated::RustOpaque,
+};
+
+/// Representation of [RTCRtpSendParameters][0].
+///
+/// [0]: https://w3.org/TR/webrtc#dom-rtcrtpsendparameters
+pub struct RtcRtpSendParameters {
+    /// Sequence containing parameters for sending [RTP] encodings of media.
+    ///
+    /// [RTP]: https://en.wikipedia.org/wiki/Real-time_Transport_Protocol
+    pub encodings:
+        Vec<(RtcRtpEncodingParameters, RustOpaque<Arc<RtpEncodingParameters>>)>,
+
+    /// Reference to the Rust side [`RtpParameters`].
+    pub inner: RustOpaque<Arc<RtpParameters>>,
+}
+
+impl From<RtpParameters> for RtcRtpSendParameters {
+    fn from(v: RtpParameters) -> Self {
+        let encodings = v
+            .get_encodings()
+            .into_iter()
+            .map(|e| {
+                (
+                    RtcRtpEncodingParameters::from(&e),
+                    RustOpaque::new(Arc::new(RtpEncodingParameters::from(e))),
+                )
+            })
+            .collect();
+
+        Self { encodings, inner: RustOpaque::new(Arc::new(v)) }
+    }
+}

crates/native/src/frb_generated.rs

@@ -521,7 +521,7 @@ fn wire__crate__api__sender_set_parameters_impl(
             let message = unsafe { flutter_rust_bridge::for_generated::Dart2RustMessageSse::from_wire(ptr_, rust_vec_len_, data_len_) };
             let mut deserializer = flutter_rust_bridge::for_generated::SseDeserializer::new(message);
             let api_transceiver = <RustOpaqueMoi<Arc < RtpTransceiver >>>::sse_decode(&mut deserializer);
-let api_params = <crate::api::RtcRtpSendParameters>::sse_decode(&mut deserializer);deserializer.end(); move |context|  {
+let api_params = <crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters>::sse_decode(&mut deserializer);deserializer.end(); move |context|  {
                     transform_result_sse::<_, flutter_rust_bridge::for_generated::anyhow::Error>((move ||  {
                          let output_ok = crate::api::sender_set_parameters(api_transceiver, api_params)?;   Ok(output_ok)
                     })())
@@ -2044,7 +2044,7 @@ impl SseDecode
     }
 }
 
-impl SseDecode for crate::api::RtcRtpSendParameters {
+impl SseDecode for crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_decode(
         deserializer: &mut flutter_rust_bridge::for_generated::SseDeserializer,
@@ -2055,7 +2055,7 @@ impl SseDecode for crate::api::RtcRtpSendParameters {
         )>>::sse_decode(deserializer);
         let mut var_inner =
             <RustOpaqueMoi<Arc<RtpParameters>>>::sse_decode(deserializer);
-        return crate::api::RtcRtpSendParameters {
+        return crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters {
             encodings: var_encodings,
             inner: var_inner,
         };
@@ -3491,7 +3491,9 @@ impl
     }
 }
 // Codec=Dco (DartCObject based), see doc to use other codecs
-impl flutter_rust_bridge::IntoDart for crate::api::RtcRtpSendParameters {
+impl flutter_rust_bridge::IntoDart
+    for crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters
+{
     fn into_dart(self) -> flutter_rust_bridge::for_generated::DartAbi {
         [
             self.encodings.into_into_dart().into_dart(),
@@ -3501,13 +3503,17 @@ impl flutter_rust_bridge::IntoDart for crate::api::RtcRtpSendParameters {
     }
 }
 impl flutter_rust_bridge::for_generated::IntoDartExceptPrimitive
-    for crate::api::RtcRtpSendParameters
+    for crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters
 {
 }
-impl flutter_rust_bridge::IntoIntoDart<crate::api::RtcRtpSendParameters>
-    for crate::api::RtcRtpSendParameters
+impl
+    flutter_rust_bridge::IntoIntoDart<
+        crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters,
+    > for crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters
 {
-    fn into_into_dart(self) -> crate::api::RtcRtpSendParameters {
+    fn into_into_dart(
+        self,
+    ) -> crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters {
         self
     }
 }
@@ -5290,7 +5296,7 @@ impl SseEncode
     }
 }
 
-impl SseEncode for crate::api::RtcRtpSendParameters {
+impl SseEncode for crate::api::rtc_rtp_send_parameters::RtcRtpSendParameters {
     // Codec=Sse (Serialization based), see doc to use other codecs
     fn sse_encode(
         self,

lib/src/api/bridge/api.dart

@@ -11,13 +11,14 @@ import 'api/media_stream_track.dart';
 import 'api/media_stream_track/audio_processing_config.dart';
 import 'api/media_stream_track/media_type.dart';
 import 'api/rtc_rtp_encoding_parameters.dart';
+import 'api/rtc_rtp_send_parameters.dart';
 import 'frb_generated.dart';
 import 'lib.dart';
 
 part 'api.freezed.dart';
 
 // These types are ignored because they are neither used by any `pub` functions nor (for structs and enums) marked `#[frb(unignore)]`: `TrackKind`
-// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`
+// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `assert_receiver_is_total_eq`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `clone`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `eq`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `fmt`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`, `from`
 
 /// Returns all [`VideoCodecInfo`]s of the supported video encoders.
 Future<List<VideoCodecInfo>> videoEncoders() =>
@@ -684,32 +685,6 @@ class RtcIceServer {
           credential == other.credential;
 }
 
-/// Representation of [RTCRtpSendParameters][0].
-///
-/// [0]: https://w3.org/TR/webrtc#dom-rtcrtpsendparameters
-class RtcRtpSendParameters {
-  /// Sequence containing parameters for sending [RTP] encodings of media.
-  ///
-  /// [RTP]: https://en.wikipedia.org/wiki/Real-time_Transport_Protocol
-  final List<(RtcRtpEncodingParameters, ArcRtpEncodingParameters)> encodings;
-
-  /// Reference to the Rust side [`RtpParameters`].
-  final ArcRtpParameters inner;
-
-  const RtcRtpSendParameters({required this.encodings, required this.inner});
-
-  @override
-  int get hashCode => encodings.hashCode ^ inner.hashCode;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is RtcRtpSendParameters &&
-          runtimeType == other.runtimeType &&
-          encodings == other.encodings &&
-          inner == other.inner;
-}
-
 /// Representation of a permanent pair of an [RTCRtpSender] and an
 /// [RTCRtpReceiver], along with some shared state.
 ///

lib/src/api/bridge/api/rtc_rtp_send_parameters.dart

@@ -0,0 +1,38 @@
+// This file is automatically generated, so please do not edit it.
+// @generated by `flutter_rust_bridge`@ 2.10.0.
+
+// ignore_for_file: invalid_use_of_internal_member, unused_import, unnecessary_import
+
+import 'package:flutter_rust_bridge/flutter_rust_bridge_for_generated.dart';
+
+import '../frb_generated.dart';
+import '../lib.dart';
+import 'rtc_rtp_encoding_parameters.dart';
+
+// These function are ignored because they are on traits that is not defined in current crate (put an empty `#[frb]` on it to unignore): `from`
+
+/// Representation of [RTCRtpSendParameters][0].
+///
+/// [0]: https://w3.org/TR/webrtc#dom-rtcrtpsendparameters
+class RtcRtpSendParameters {
+  /// Sequence containing parameters for sending [RTP] encodings of media.
+  ///
+  /// [RTP]: https://en.wikipedia.org/wiki/Real-time_Transport_Protocol
+  final List<(RtcRtpEncodingParameters, ArcRtpEncodingParameters)> encodings;
+
+  /// Reference to the Rust side [`RtpParameters`].
+  final ArcRtpParameters inner;
+
+  const RtcRtpSendParameters({required this.encodings, required this.inner});
+
+  @override
+  int get hashCode => encodings.hashCode ^ inner.hashCode;
+
+  @override
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is RtcRtpSendParameters &&
+          runtimeType == other.runtimeType &&
+          encodings == other.encodings &&
+          inner == other.inner;
+}

lib/src/api/bridge/frb_generated.dart

@@ -21,6 +21,7 @@ import 'api/media_stream_track/media_type.dart';
 import 'api/media_stream_track/track_event.dart';
 import 'api/media_stream_track/track_state.dart';
 import 'api/rtc_rtp_encoding_parameters.dart';
+import 'api/rtc_rtp_send_parameters.dart';
 import 'api/stats.dart';
 import 'api/stats/ice_role.dart';
 import 'api/stats/rtc_ice_candidate_stats.dart';

lib/src/api/bridge/frb_generated.io.dart

@@ -22,6 +22,7 @@ import 'api/media_stream_track/media_type.dart';
 import 'api/media_stream_track/track_event.dart';
 import 'api/media_stream_track/track_state.dart';
 import 'api/rtc_rtp_encoding_parameters.dart';
+import 'api/rtc_rtp_send_parameters.dart';
 import 'api/stats.dart';
 import 'api/stats/ice_role.dart';
 import 'api/stats/rtc_ice_candidate_stats.dart';

lib/src/api/parameters.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/services.dart';
 
-import 'bridge/api.dart' as ffi;
+import 'bridge/api/rtc_rtp_send_parameters.dart' as ffi;
 import 'bridge/lib.dart' as ffi_ty;
 import 'send_encoding_parameters.dart';