dap commit: Merge

changeset:   39:a8e255b904df
tag:         tip
parent:      38:883850c5d1f5
parent:      37:0610dfb8d612
user:        tleithea
date:        Fri Jan 13 14:30:57 2012 -0800
files:       media-stream-capture/scenarios.html
description:
Merge


diff -r 883850c5d1f5 -r a8e255b904df media-stream-capture/scenarios.html
--- a/media-stream-capture/scenarios.html	Fri Jan 13 14:22:49 2012 -0800
+++ b/media-stream-capture/scenarios.html	Fri Jan 13 14:30:57 2012 -0800
@@ -183,13 +183,13 @@
             the social networking site's server.
         </p>
         <ol>
-           <li>Browser requires webcam and microphone permissions before use</li>
-           <li>Local webcam video preview</li>
-           <li>Image capture from webcam</li>
-           <li>Image resizing after capture (scenario out of scope)</li>
-           <li>Local microphone preview via equalizer visualization</li>
-           <li>Local microphone stops capturing automatically after a period of silence</li>
-           <li>Upload captured image and audio to server</li>
+           <li>Browser requires webcam and microphone permissions before use</li>
+           <li>Local webcam video preview</li>
+           <li>Image capture from webcam</li>
+           <li>Image resizing after capture (scenario out of scope)</li>
+           <li>Local microphone preview via equalizer visualization</li>
+           <li>Local microphone stops capturing automatically after a period of silence</li>
+           <li>Upload captured image and audio to server</li>
         </ol>
 
         <section>
@@ -216,16 +216,16 @@
             audience, and clicks "end podcast". A few moments later that site reports that the podcast has been uploaded.
          </p>
          <ol>
-            <li>Browser requires webcam and microphone permissions before use</li>
-            <li>Local webcam video preview</li>
-            <li>Approval/authentication before sending/receiving real-time video between browsers</li>
-            <li>Remote connection video + audio preview</li>
-            <li>Video capture from local webcam + microphone</li>
-            <li>Capture combined audio from local microphone/remote connections</li>
-            <li>Disabling video on a video+audio remote connection</li>
-            <li>Switching a running video+audio capture between local/remote connection without interruption</li>
-            <li>Adding an video+audio remote connection to a running video capture</li>
-            <li>Upload of video/audio capture to server while capture is running</li>
+            <li>Browser requires webcam and microphone permissions before use</li>
+            <li>Local webcam video preview</li>
+            <li>Approval/authentication before sending/receiving real-time video between browsers</li>
+            <li>Remote connection video + audio preview</li>
+            <li>Video capture from local webcam + microphone</li>
+            <li>Capture combined audio from local microphone/remote connections</li>
+            <li>Disabling video on a video+audio remote connection</li>
+            <li>Switching a running video+audio capture between local/remote connection without interruption</li>
+            <li>Adding an video+audio remote connection to a running video capture</li>
+            <li>Upload of video/audio capture to server while capture is running</li>
          </ol>
 
          <section>
@@ -249,14 +249,14 @@
             upload page using her class account.
         </p>
         <ol>
-            <li>Browser requires webcam permissions before use</li>
-            <li>Image frames can be extracted from local webcam video</li>
-            <li>Modified image frames can be inserted/combined into a video capture</li>
-            <li>Assign (and check for) a specific video capture encoding format</li>
-            <li>Local webcam video preview</li>
-            <li>Enforce (or check for) video capture size constraints and recording time limits</li>
-            <li>Set the webcam into a low-resolution (640x480 or as supported by the hardware) capture mode</li>
-            <li>Captured video format is available for upload prerequisite inspection.</li>
+            <li>Browser requires webcam permissions before use</li>
+            <li>Image frames can be extracted from local webcam video</li>
+            <li>Modified image frames can be inserted/combined into a video capture</li>
+            <li>Assign (and check for) a specific video capture encoding format</li>
+            <li>Local webcam video preview</li>
+            <li>Enforce (or check for) video capture size constraints and recording time limits</li>
+            <li>Set the webcam into a low-resolution (640x480 or as supported by the hardware) capture mode</li>
+            <li>Captured video format is available for upload prerequisite inspection.</li>
         </ol>
 
          <section>
@@ -282,12 +282,12 @@
             recording from the Coliseum was saved.
          </p>
          <ol>
-            <li>Browser requires webcam(s) and microphone permissions before use</li>
-            <li>Local video previews from two separate webcams simultaneously</li>
-            <li>Image capture from webcam (high resolution)</li>
-            <li>Video capture from local webcam + microphone</li>
-            <li>Switching a running video+audio capture between two local webcams without interruption</li>
-            <li>Recording termination (error recovery) when camera(s) stop.</li>
+            <li>Browser requires webcam(s) and microphone permissions before use</li>
+            <li>Local video previews from two separate webcams simultaneously</li>
+            <li>Image capture from webcam (high resolution)</li>
+            <li>Video capture from local webcam + microphone</li>
+            <li>Switching a running video+audio capture between two local webcams without interruption</li>
+            <li>Recording termination (error recovery) when camera(s) stop.</li>
          </ol>
       
         <section>
@@ -315,19 +315,19 @@
            field agent leaves early and his call is terminated.
         </p>
         <ol>
-            <li>Approval/authentication before sending/receiving real-time video between browsers</li>
-            <li>Remote connection video + audio preview</li>
-            <li>Browser requires webcam(s) and microphone permissions before use</li>
-            <li>Local webcam video preview</li>
-            <li>Video capture from local webcam + microphone</li>
-            <li>Video capture from remote connections (audio + video)</li>
-            <li>Capture combined audio from local microphone/remote connections</li>
-            <li>Comparing audio input level from among various local/remote connections</li>
-            <li>Switching a running video+audio capture between local webcam/remote connections without interruption</li>
-            <li>Send an image through a remote [video] connection</li>
-            <li>Pause/resume video+audio capture</li>
-            <li>Rewind captured video and re-play</li>
-            <li>Remote connection termination and removal of video+audio preview</li>
+            <li>Approval/authentication before sending/receiving real-time video between browsers</li>
+            <li>Remote connection video + audio preview</li>
+            <li>Browser requires webcam(s) and microphone permissions before use</li>
+            <li>Local webcam video preview</li>
+            <li>Video capture from local webcam + microphone</li>
+            <li>Video capture from remote connections (audio + video)</li>
+            <li>Capture combined audio from local microphone/remote connections</li>
+            <li>Comparing audio input level from among various local/remote connections</li>
+            <li>Switching a running video+audio capture between local webcam/remote connections without interruption</li>
+            <li>Send an image through a remote [video] connection</li>
+            <li>Pause/resume video+audio capture</li>
+            <li>Rewind captured video and re-play</li>
+            <li>Remote connection termination and removal of video+audio preview</li>
         </ol>
 
          <section>

Received on Friday, 13 January 2012 22:35:10 UTC