Changeset 332


Ignore:
Timestamp:
Jul 20, 2011, 9:54:22 PM (13 years ago)
Author:
Rick van der Zwet
Message:
  • Camera should not start automatically (iframe embedding issues).
File:
1 edited

Legend:

Unmodified
Added
Removed

  • py-tcpmultiplexer/htdocs/room1.html

    r330 r332  
    3636  }
    3737
    38   $(document).ready(function(){
    39  //   changeVideo('/cam7/video');
    40     changeAudio('/cam7/audio');
    41   });
     38  var runningPresentation = false;
     39  function changePresentation()
     40  {
     41    if (runningPresentation) {
     42      $("#player").attr("src", '/img/logo.png');
     43      $("#screen").attr("src", '/img/logo.png');
     44      changeAudio('');
     45      runningPresentation = false;
     46      $("#togglePresentation").attr('value',"Start Presentation");
     47    } else {
     48      $("#player").attr("src", '/cam6/video');
     49      $("#screen").attr("src", '/cam7/video');
     50      changeAudio('/cam7/audio');
     51      runningPresentation = true;
     52      $("#togglePresentation").attr('value',"Stop Presentation");
     53    }
     54  }
    4255
    4356</script>
    … …  
    4558</head>
    4659<body>
    47 
    48 <!--
    49 <h1>py-tcpmultiplexer webcam server - Room 1</h1>
    50 <div>
    51 <table>
    52 <tr><td>Select WebCam:</td><td>
    53 <input type="radio" name="cam" value="img/logo.png" checked="checked">None</input>
    54 <input type="radio" name="cam" value="/cam1/video">RepRap</input>
    55 <input type="radio" name="cam" value="/cam2/video">Room_A</input>
    56 <input type="radio" name="cam" value="/cam3/video">Kitchen</input>
    57 <input type="radio" name="cam" value="/cam4/video">Occ_telex</input>
    58 <input type="radio" name="cam" value="/cam5/video">Rick_cam</input>
    59 <input type="radio" name="cam" value="/cam6/video">Presentation</input>
    60 <input type="radio" name="cam" value="/cam7/video">Mobile</input>
    61 </td></tr>
    62 <tr><td>Select Audio:</td><td>
    63 <input type="radio" name="sound" value="none" checked="checked" >None</input>
    64 <input type="radio" name="sound" value="/cam1/audio">Cam1</input>
    65 <input type="radio" name="sound" value="/cam7/audio">Cam7</input>
    66 </td></tr>
    67 </table>
    68 
    69 <script type="text/javascript">
    70   $("input[name='cam']").change(function () {
    71       changeVideo($("input[name='cam']:checked").val());
    72   });
    73   $("input[name='sound']").change(function () {
    74       changeAudio($("input[name='sound']:checked").val());
    75   });
    76 </script>
    77 
    78 -->
    79 
    80 <table border="2" width="100%">
     60<table border="2" width="100%" height="100%">
    8161<tr>
    82   <td>
    83     <img id="logo" src="http://wifisoft.org/svn/logo/WifiSoft_logo.jpg" width="50px"/>
    84     <img id="player" width="200px" src="/cam7/video"  alt="Video feeds" border="1"/><br />
    85     <input type="button" OnClick="flipImages()" value="Switch view" />
     62  <td height="200px" width="450px" style="background: url(http://wifisoft.org/svn/logo/WifiSoft_logo.jpg);">
     63    <img id="player" width="200px" src="/img/logo.png"  alt="Video feeds" border="1"/><br />
     64    <input type="button" id="togglePresentation" OnClick="changePresentation()" value="Start Presentation" />
     65    <input type="button" id="toggleCamera" OnClick="flipImages()" value="Switch Camera's" />
    8666  </td>
    87   <td rowspan="2">
    88     <img id="screen" width="100%" src="/cam6/video" alt="Presentation" border="1"/>
     67  <td rowspan="2" style="background: url(http://wifisoft.org/svn/logo/WifiSoft_logo.jpg) no-repeat;">
     68    <img id="screen" height="100%" src="/img/logo.png" alt="Presentation" border="1"/>
    8969  </td>
    9070</tr>
    9171<tr>
    9272  <td>
    93   <iframe src="http://webchat.freenode.net?randomnick=1&channels=occ&uio=d4" width="100%" height="400"></iframe>
     73  <iframe src="http://webchat.freenode.net?&channels=occ&uio=d4" width="100%" height="100%"></iframe>
     74  </td>
     75</tr>
     76<tr>
     77  <td colspan="2">
     78<p>Tested browsers: <a href="http://www.firefox.com">Mozilla Firefox</a>, <a href="http://www.google.com/chrome">Google Chrome</a> (<em>If no video appear below, you are using unsupported browser</em>)<br />
     79<small>Source Code at: <a href="http://rickvanderzwet.nl/svn/personal/py-tcpmultiplexer/">http://rickvanderzwet.nl/svn/personal/py-tcpmultiplexer/</a> build @ <a href="http://opencommunitycamp.org">#occ2011</a> - feedback/comments at <a href="irc://irc.freenode.net/#occ">#occ</a></small>
    9480  </td>
    9581</tr>
    9682</table>
    97 </div>
    9883
    9984<div id="jplayer" />
    100 
    101 
    102 <!--
    103 
    104 <hr />
    105 <p>Tested browsers: <a href="http://www.firefox.com">Mozilla Firefox</a>, <a href="http://www.google.com/chrome">Google Chrome</a> (<em>If no video appear below, you are using unsupported browser</em>)<br />
    106 <small>Source Code at: <a href="http://rickvanderzwet.nl/svn/personal/py-tcpmultiplexer/">http://rickvanderzwet.nl/svn/personal/py-tcpmultiplexer/</a> build @ <a href="http://opencommunitycamp.org">#occ2011</a> - feedback/comments at <a href="irc://irc.freenode.net/#occ">#occ</a></small>
    107 
    108 <p />
    109 Example stream creation from Webcam or Buildin Camera:
    110 <table border="1">
    111 <tr><td>Linux</td><td>:</td><td><tt>vlc -I http v4l:///dev/video0 --sout='#transcode{vcodec=MJPG}:standard{access=http{mime=multipart/x-mixed-replace;boundary=--7b3cc56e5f51db803f790dad720ed50a},mux=mpjpeg,dst=0.0.0.0:9000/webcam}}'</tt>
    112 </td></tr>
    113 <tr><td>Mac</td><td>:</td><td><tt>/Applications/VLC.app/Contents/MacOS/VLC qtcapture://  --sout='#transcode{vcodec=MJPG,vfilter=canvas{width=640,height=480}}:standard{access=http{mime=multipart/x-mixed-replace;boundary=--7b3cc56e5f51db803f790dad720ed50a},mux=mpjpeg,dst=0.0.0.0:9000/webcam}}'</tt>
    114 </td></tr>
    115 <tr><td>Windows</td><td>:</td><td><tt>???</tt></td></tr>
    116 <tr><td>iPhone</td><td>:</td><td><tt>???</tt></td></tr>
    117 <tr><td>Android</td><td>:</td><td><tt><a href="https://market.android.com/details?id=com.pas.webcam">IP Webcam</a></tt></td></tr>
    118 </table>
    119 -->
    120 
    12185</body>
    12286</html>
Note: See TracChangeset for help on using the changeset viewer.