diff options
Diffstat (limited to 'web/streamlib')
| -rw-r--r-- | web/streamlib/stream/config.pm | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/web/streamlib/stream/config.pm b/web/streamlib/stream/config.pm index 19a1e4d..918e555 100644 --- a/web/streamlib/stream/config.pm +++ b/web/streamlib/stream/config.pm @@ -6,9 +6,9 @@ use NetAddr::IP; our $v4net = NetAddr::IP->new("151.216.128.0/17"); our $v6net = NetAddr::IP->new("2a02:ed02::/32"); our $multicast = "udp://\@233.191.12.1"; -our $vlc_base_host = "http://cubemap.tg14.gathering.org"; -our $tg = 14; -our $tg_full = 2014; +our $video_url = "http://wat.gathering.org:9094/southcam.flv"; +our $tg = 15; +our $tg_full = 2015; # priority = sorting order in streaming list @@ -24,6 +24,7 @@ our %streams = ( 'priority' => 20, 'port' => 80, 'url' => '/event.ts', + 'online' => 0, 'interlaced' => 0, 'has_multicast' => 0, 'multicast_ip' => 'udp://@[ff7e:a40:2a02:ed02:ffff::15]:2015', @@ -47,6 +48,7 @@ our %streams = ( 'quality' => 'sd', 'priority' => 24, 'port' => 80, + 'online' => 0, 'url' => '/event-sd.ts', 'interlaced' => 0, 'has_multicast' => 0, @@ -59,6 +61,7 @@ our %streams = ( 'quality' => 'sd', 'priority' => 25, 'port' => 80, + 'online' => 0, 'url' => '/event-superlow.ts', 'interlaced' => 0, 'has_multicast' => 0, @@ -83,10 +86,12 @@ our %streams = ( 'type' => 'camera', 'quality' => 'hd', 'priority' => 40, - 'url' => "/southcam.ts", - 'port' => 80, + 'url' => "http://wat.gathering.org:9094/southcam.flv", # <-- In use (Need to rebuild row 67 in index.pl) + 'port' => 80, 'interlaced' => 0, 'has_multicast' => 0, + 'external' => 1, # <-- In use (Need to rebuild row 67 in index.pl) + 'online' => 1, # 'multicast_ip' => "udp://@[ff7e:a40:2a02:ed02:ffff::16]", 'source' => 'Tech', 'title' => 'Webcam South (HD) (1920x1080 H.264) 10mbps', @@ -99,6 +104,7 @@ our %streams = ( 'url' => "/roofcam.ts", 'port' => 80, 'interlaced' => 1, + 'online' => 0, 'has_multicast' => 0, #'multicast_ip' => "udp://\@[ff7e:a40:2a02:ed02:ffff::15]", 'source' => 'Tech', @@ -109,16 +115,18 @@ our %streams = ( 'type' => 'camera', 'quality' => 'hd', 'priority' => 130, - 'url' => '/noccam.ts', - 'port' => 80, - 'has_multicast' => 0, - 'interlaced' => 0, - 'multicast_ip' => "udp://@[ff7e:a40:2a02:ed02:ffff::18]:2018", - 'source' => "Tech", + 'url' => 'http://wat.gathering.org:9094/noccam.flv', + 'port' => 80, # <-- Safe to remove + 'external' => 1, + 'has_multicast' => 0, # <-- Safe to remove + 'interlaced' => 0, # <-- Safe to remove + 'online' => 1, + 'multicast_ip' => "udp://@[ff7e:a40:2a02:ed02:ffff::18]:2018",# <-- Safe to remove + 'source' => "Tech", # <-- Safe to remove 'title' => "Webcam NOC (HD) (1280x720 H.264) 5mbps" }, - ); +); 1; |