Cleaned up EME examples

imagecapture/js/main.js

@@ -32,15 +32,26 @@ takePhotoButton.onclick = takePhoto;
 videoSelect.onchange = getStream;
 zoomInput.oninput = setZoom;
 
-// Get a list of available media input (and output) devices.
+// Get a list of available media input (and output) devices
+// then get a MediaStream for the currently selected input device
 navigator.mediaDevices.enumerateDevices()
-  .then(blah)
   .then(gotDevices)
   .catch(error => {console.log('enumerateDevices() error: ', error);})
   .then(getStream);
 
-function blah(){
-  console.log('blah');
+// From the list of media devices available, set up the camera source <select>,
+// then get a video stream from the default camera source.
+function gotDevices(deviceInfos) {
+  for (var i = 0; i !== deviceInfos.length; ++i) {
+    var deviceInfo = deviceInfos[i];
+    console.log('Found media input or output device: ', deviceInfo);
+    var option = document.createElement('option');
+    option.value = deviceInfo.deviceId;
+    if (deviceInfo.kind === 'videoinput') {
+      option.text = deviceInfo.label || 'Camera ' + (videoSelect.length + 1);
+      videoSelect.appendChild(option);
+    }
+  }
 }
 
 // Get a video stream from the currently selected camera source.
@@ -52,7 +63,6 @@ function getStream() {
   }
   var videoSource = videoSelect.value;
   constraints = {
-    audio: false,
     video: {deviceId: videoSource ? {exact: videoSource} : undefined}
   };
   navigator.mediaDevices.getUserMedia(constraints)
@@ -62,21 +72,6 @@ function getStream() {
   });
 }
 
-// From the list of media devices available, set up the camera source <select>,
-// then get a video stream from the default camera source.
-function gotDevices(deviceInfos) {
-  for (var i = 0; i !== deviceInfos.length; ++i) {
-    var deviceInfo = deviceInfos[i];
-    console.log('Found media input or output device: ', deviceInfo);
-    var option = document.createElement('option');
-    option.value = deviceInfo.deviceId;
-    if (deviceInfo.kind === 'videoinput') {
-      option.text = deviceInfo.label || 'Camera ' + (videoSelect.length + 1);
-      videoSelect.appendChild(option);
-    }
-  }
-}
-
 // Display the stream from the currently selected camera source, and then
 // create an ImageCapture object, using the video from the stream.
 function gotStream(stream) {

index.html

@@ -85,6 +85,7 @@ <h1>simpl.info</h1>
         <a href="details" title="Details/summary element example">&lt;details&gt; and &lt;summary&gt;</a>
         <a href="devicemotion" title="Device Motion example">Device Motion</a>
         <a href="deviceorientation" title="Device Orientation example">Device Orientation</a>
+        <a href="eme/clearkey" title="EME Clear Key example">Encrypted Media Extensions (EME) Clear Key</a>
         <a href="eventsource" title="EventSource (Server-Sent Events) example">EventSource (aka Server-Sent Events)</a>
         <a href="fetch" title="Fetch API example">Fetch</a>
         <a href="localstorage" title="Fieldset example">Fieldset (localStorage example)</a>