Merge SRS4, lots of features

trunk/conf/full.conf

@@ -494,8 +494,8 @@ rtc_server {
     # For RTP packet and its payload cache.
     rtp_cache {
         # Whether enable the RTP packet cache.
-        # default: off
-        enabled off;
+        # default: on
+        enabled on;
         # The cache size for rtp packet in MB, each object is about 300B..
         # default: 64
         pkt_size 64.0;
@@ -506,8 +506,8 @@ rtc_server {
     # For RTP shared message and the large buffer cache.
     rtp_msg_cache {
         #Whether enable the RTP message(a large buffer) cache.
-        # default: off
-        enabled off;
+        # default: on
+        enabled on;
         # The cache size for message object in MB, each object is about 40B.
         # default: 16
         msg_size 16.0;
@@ -579,8 +579,8 @@ vhost rtc.vhost.srs.com {
         # default: on
         enabled on;
         # Whether directly use the packet, avoid copy.
-        # default: off
-        no_copy off;
+        # default: on
+        no_copy on;
     }
     # For TWCC.
     twcc {

trunk/conf/regression-test.conf

@@ -0,0 +1,55 @@
+
+listen              1935;
+max_connections     1000;
+daemon              on;
+disable_daemon_for_docker off;
+srs_log_tank        file;
+
+http_server {
+    enabled         on;
+    listen          8080;
+    dir             ./objs/nginx/html;
+}
+
+http_api {
+    enabled         on;
+    listen          1985;
+}
+stats {
+    network         0;
+}
+rtc_server {
+    enabled         on;
+    # Listen at udp://8000
+    listen          8000;
+    #
+    # The $CANDIDATE means fetch from env, if not configed, use * as default.
+    #
+    # The * means retrieving server IP automatically, from all network interfaces,
+    # @see https://github.com/ossrs/srs/issues/307#issuecomment-599028124
+    candidate       $CANDIDATE;
+}
+
+vhost __defaultVhost__ {
+    rtc {
+        enabled     on;
+        bframe      discard;
+    }
+    http_remux {
+        enabled     on;
+        mount       [vhost]/[app]/[stream].flv;
+    }
+    ingest livestream {
+        enabled on;
+        input {
+            type    file;
+            url     ./doc/source.200kbps.768x320.flv;
+        }
+        ffmpeg      ./objs/ffmpeg/bin/ffmpeg;
+        engine {
+            enabled          off;
+            output          rtmp://127.0.0.1:[port]/live/livestream;
+        }
+    }
+}
+

trunk/conf/rtc.conf

@@ -34,5 +34,9 @@ vhost __defaultVhost__ {
         enabled     on;
         bframe      discard;
     }
+    http_remux {
+        enabled     on;
+        mount       [vhost]/[app]/[stream].flv;
+    }
 }