X-Git-Url: https://git.decadent.org.uk/gitweb/?p=lca-dvswitch.git;a=blobdiff_plain;f=index.html;h=bcaa6b11719ebe9cc473187e4f9e656a54331cc7;hp=063ac2a4c584f624ec46f4a8bc9ef7196d7679ce;hb=1c803543843421560951db0e52f6cd762601e90c;hpb=a3cdcaf7a9001392987cc34ad8b052e8753fb662

diff --git a/index.html b/index.html
index 063ac2a..bcaa6b1 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 
 <head>
-<title>DVswitch - Ben Hutchings - LCA2011</title>
+<title>Making great conference videos on a budget - Ben Hutchings - LCA2011</title>
 <!-- metadata -->
 <meta name="generator" content="S5" />
 <meta name="version" content="S5 1.1" />
@@ -36,7 +36,7 @@
 </div>
 <div id="footer">
 <h1>LCA2011</h1>
-<h2>DVswitch</h2>
+<h2>Making great conference videos on a budget</h2>
 </div>
 
 </div>
@@ -45,7 +45,7 @@
 <div class="presentation">
 
 <div class="slide">
-<h1>DVswitch</h1>
+<h1>Making great conference videos on a budget</h1>
 <h3>Ben Hutchings</h3>
 </div>
 
@@ -180,10 +180,13 @@
 
 <div class="slide">
   <h1>Overview of the system</h1>
-  <p>
-    A simplified view of the typical components:
-  </p>
-  <object data="dvswitch-simple.dia.svg" width="60%" height="60%"></object>
+  <object data="dvswitch-simple.dia.svg" width="75%"></object>
+  <div class="handout">
+    <p>
+      This is a simplified view of the typical components.  The system
+      is completely flexible as to which sinks and sources are used.
+    </p>
+  </div>
 </div>
 
 <div class="slide">
@@ -284,5 +287,39 @@
   </div>
 </div>
 
+<div class="slide">
+  <h1>Icecast streaming server</h1>
+  <ul class="incremental">
+    <li>
+      Simple HTTP streaming server supporting MP3, Ogg Vorbis and
+      Ogg Theora streams
+    </li>
+    <li>
+      Each stream is provided by an authenticated source client or
+      relayed from another server
+    </li>
+    <li>
+      Relaying allows you to build a distribution network serving
+      viewers inside and outside the conference
+    </li>
+  </ul>
+</div>
+
+<div class="slide">
+  <h1>Icecast distribution network</h1>
+  <object data="streaming-network.dia.svg" width="50%"></object>
+  <ul>
+    <li>
+      Internal master serves internal viewers and external master
+    </li>
+    <li>
+      Public servers serve viewers anywhere
+    </li>
+    <li>
+      Relaying restricted by password and/or firewall
+    </li>
+  </ul>
+</div>
+
 </body>
 </html>
