Merge branch '3.0release' into 4.0release

README.md

@@ -201,6 +201,7 @@ For previous versions, please read:
 
 ## V3 changes
 
+* v3.0, 2020-10-25, Add hls.realtime.conf for low-latency HLS. 3.0.149
 * v3.0, 2020-10-24, Refine script and startup logs. 3.0.148
 * v3.0, 2020-10-23, Allow FFmpeg if exists at /usr/local/bin/ffmpeg. 3.0.147
 * v3.0, 2020-10-23, Refine build script, use libssl in docker. 3.0.146

trunk/conf/hls.realtime.conf

@@ -0,0 +1,14 @@
+# the config for srs to delivery realtime RTMP stream
+# @see https://github.com/ossrs/srs/wiki/v2_CN_SampleRealtime
+# @see full.conf for detail config.
+
+listen              1935;
+max_connections     1000;
+vhost __defaultVhost__ {
+    hls {
+        enabled         on;
+        hls_fragment    0.2;
+        hls_window      2;
+        hls_wait_keyframe       off;
+    }
+}

trunk/src/core/srs_core_version3.hpp

@@ -24,6 +24,6 @@
 #ifndef SRS_CORE_VERSION3_HPP
 #define SRS_CORE_VERSION3_HPP
 
-#define SRS_VERSION3_REVISION 148
+#define SRS_VERSION3_REVISION 149
 
 #endif