Use C++11 range-based for loops and auto wherever it makes sense.

[cubemap] / cubemap.config.sample

diff --git a/cubemap.config.sample b/cubemap.config.sample
index b03ea65eae5f3ab6b6d428997d99ae7df58d2829..3e836739a6a2525805e4586836a7f3ac6ec28aa8 100644 (file)
--- a/cubemap.config.sample
+++ b/cubemap.config.sample
@@ -9,11 +9,15 @@
 num_servers 1
 
 #
-# All input ports are treated exactly the same, but you may use multiple ones nevertheless.
+# You may specify multiple input ports; save for TLS settings (TLS is automatically
+# enabled for a port if you give a key pair), they are treated exactly the same.
+# “port N” is equivalent to “listen [::]:N”. TLS requires kTLS support (Linux >= 4.13,
+# CONFIG_TLS enabled).
 #
 port 9094
 # listen 127.0.0.1:9095
 # listen [::1]:9095
+# listen [::]:443 tls_cert=/etc/letsencrypt/live/example.org/fullchain.pem tls_key=/etc/letsencrypt/live/example.org/privkey.pem
 
 stats_file cubemap.stats
 stats_interval 60
@@ -51,6 +55,11 @@ stream /test-jwplayer.flv src=http://gruessi.zrh.sesse.net:4013/test.flv force_p
 # for sending on to another Cubemap instance.
 stream /test.flv.metacube src=http://gruessi.zrh.sesse.net:4013/test.flv encoding=metacube
 
+# A stream where the input is _not_ Metacube framed. Note that the stream needs to
+# have no header and be self-synchronizing (like with UDP input below), and most formats
+# are not like this. A typical example, however, is MPEG-TS.
+stream /test.ts src=http://gruessi.zrh.sesse.net:4013/test.ts src_encoding=raw
+
 # UDP input. TS is the most common container to use over UDP (you cannot
 # take any arbitrary container and expect it to work).
 # backlog_size=<number of bytes> overrides the backlog, which is normally 10 MB.
@@ -93,11 +102,11 @@ udpstream 193.35.52.50:5001 src=http://pannekake.samfundet.no:9094/frikanalen.ts
 udpstream 233.252.0.1:5002 src=http://pannekake.samfundet.no:9094/frikanalen.ts.metacube ttl=32 multicast_output_interface=eth1
 
 # A type of HTTP resource that is not a stream, but rather just a very simple
-# document that contains “pong” and nothing else. allow_origin= is optional;
+# document that a HTTP 204 response and nothing else. allow_origin= is optional;
 # if it is set, the response will contain an Access-Control-Allow-Origin header
 # with the given value, allowing the ping response to be read (and
 # differentiated from an error) from a remote domain using XHR.
 #
-# If you have a stream and a ping endpoint with the same URL, the stream takes
+# If you have a stream and a gen204 endpoint with the same URL, the stream takes
 # precedence and the ping endpoint is silently ignored.
-ping /ping allow_origin=*
+gen204 /ping allow_origin=*