Merge branch 'whip-sdp-munging' into 'main'

webrtc: whip_signaller: Add a mechanism for SDP munging

Closes #516

See merge request gstreamer/gst-plugins-rs!1525

audio/audiofx/src/hrtfrender/imp.rs

@@ -649,7 +649,7 @@ impl BaseTransformImpl for HrtfRender {
 
                 if direction == gst::PadDirection::Sink {
                     s.set("channels", 2);
-                    s.set("channel-mask", 0x3);
+                    s.set("channel-mask", gst::Bitmask(0x3));
                 } else {
                     let settings = self.settings.lock().unwrap();
                     if let Some(objs) = &settings.spatial_objects {

net/webrtc/src/whip_signaller/imp.rs

@@ -187,7 +187,11 @@ impl WhipClient {
         let client = build_reqwest_client(pol);
 
         let sdp = offer.sdp();
-        let body = sdp.as_text().unwrap();
+        let body_orig = sdp.as_text().unwrap();
+
+        let body = self
+            .obj()
+            .emit_by_name::<String>("munge-sdp", &[&body_orig]);
 
         gst::debug!(CAT, imp: self, "Using endpoint {}", endpoint.as_str());
         let mut headermap = HeaderMap::new();
@@ -611,6 +615,28 @@ impl ObjectImpl for WhipClient {
             _ => unimplemented!(),
         }
     }
+
+    fn signals() -> &'static [glib::subclass::Signal] {
+        static SIGNALS: Lazy<Vec<glib::subclass::Signal>> = Lazy::new(|| {
+            vec![
+                /**
+                 * WhipClient::munge-sdp:
+                 * @sdp: the computed SDP body that
+                 *
+                 * This signal can be used to tweak the SDP before sending it out for servers that
+                 * are finicky about the SDP they expect.
+                 *
+                 * Returns: the SDP that should be sent to the server.
+                 */
+                glib::subclass::Signal::builder("munge-sdp")
+                    .param_types([String::static_type()])
+                    .return_type::<String>()
+                    .build(),
+            ]
+        });
+
+        SIGNALS.as_ref()
+    }
 }
 
 // WHIP server implementation

video/dav1d/src/dav1ddec/imp.rs

@@ -134,7 +134,7 @@ impl Dav1dDec {
         let matrix = match pic.matrix_coefficients() {
             pixel::MatrixCoefficients::Identity => gst_video::VideoColorMatrix::Rgb,
             pixel::MatrixCoefficients::BT709 => gst_video::VideoColorMatrix::Bt709,
-            pixel::MatrixCoefficients::Unspecified => gst_video::VideoColorMatrix::Unknown,
+            pixel::MatrixCoefficients::Unspecified => gst_video::VideoColorMatrix::Bt709,
             pixel::MatrixCoefficients::BT470M => gst_video::VideoColorMatrix::Fcc,
             pixel::MatrixCoefficients::BT470BG => gst_video::VideoColorMatrix::Bt601,
             pixel::MatrixCoefficients::ST240M => gst_video::VideoColorMatrix::Smpte240m,
@@ -149,7 +149,7 @@ impl Dav1dDec {
 
         let transfer = match pic.transfer_characteristic() {
             pixel::TransferCharacteristic::BT1886 => gst_video::VideoTransferFunction::Bt709,
-            pixel::TransferCharacteristic::Unspecified => gst_video::VideoTransferFunction::Unknown,
+            pixel::TransferCharacteristic::Unspecified => gst_video::VideoTransferFunction::Bt709,
             pixel::TransferCharacteristic::BT470M => gst_video::VideoTransferFunction::Bt709,
             pixel::TransferCharacteristic::BT470BG => gst_video::VideoTransferFunction::Gamma28,
             pixel::TransferCharacteristic::ST170M => gst_video::VideoTransferFunction::Bt601,
@@ -180,7 +180,7 @@ impl Dav1dDec {
 
         let primaries = match pic.color_primaries() {
             pixel::ColorPrimaries::BT709 => gst_video::VideoColorPrimaries::Bt709,
-            pixel::ColorPrimaries::Unspecified => gst_video::VideoColorPrimaries::Unknown,
+            pixel::ColorPrimaries::Unspecified => gst_video::VideoColorPrimaries::Bt709,
             pixel::ColorPrimaries::BT470M => gst_video::VideoColorPrimaries::Bt470m,
             pixel::ColorPrimaries::BT470BG => gst_video::VideoColorPrimaries::Bt470bg,
             pixel::ColorPrimaries::ST240M => gst_video::VideoColorPrimaries::Smpte240m,