X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=cubemap.config.sample;h=0d283ddbb748a49dca2ceb03b14046a9bf691567;hb=bd5882e9ab6c9c4f280a5eb5ca24da2d5275d756;hp=b03ea65eae5f3ab6b6d428997d99ae7df58d2829;hpb=4934a0983fee26765a3c1a5b6bf5834ba6e7e52c;p=cubemap diff --git a/cubemap.config.sample b/cubemap.config.sample index b03ea65..0d283dd 100644 --- a/cubemap.config.sample +++ b/cubemap.config.sample @@ -51,6 +51,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= overrides the backlog, which is normally 10 MB. @@ -93,11 +98,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=*