Merge pull request #97 from harlanc/webrtc2rtmp

Webrtc2rtmp

Author: harlanc

Cargo.lock

@@ -158,14 +158,22 @@ impl Service {
     }
 
     async fn start_rtmp_remuxer(&mut self, stream_hub: &mut StreamsHub) -> Result<()> {
-        //The remuxer now is used for rtsp2rtmp, so both rtsp/rtmp cfg need to be enabled.
+        //The remuxer now is used for rtsp2rtmp/whip2rtmp, so both rtsp(or whip)/rtmp cfg need to be enabled.
         let mut rtsp_enabled = false;
         if let Some(rtsp_cfg_value) = &self.cfg.rtsp {
             if rtsp_cfg_value.enabled {
                 rtsp_enabled = true;
             }
         }
-        if !rtsp_enabled {
+
+        let mut whip_enabled = false;
+        if let Some(whip_cfg_value) = &self.cfg.webrtc {
+            if whip_cfg_value.enabled {
+                whip_enabled = true;
+            }
+        }
+
+        if !rtsp_enabled && !whip_enabled {
             return Ok(());
         }
 

application/xiu/src/service.rs

@@ -163,6 +163,8 @@ pub enum MpegErrorValue {
     ShouldNotComeHere,
     #[fail(display = "the sps nal unit type is not correct")]
     SPSNalunitTypeNotCorrect,
+    #[fail(display = "not supported sampling frequency")]
+    NotSupportedSamplingFrequency,
 }
 #[derive(Debug)]
 pub struct Mpeg4AvcHevcError {