native_client_sdk/src/examples/api/media_stream_video/index.html - Issue 212533007: Sync NaCl MediaStream Video example with ppapi/examples/media_stream_video

Side by Side Diff: native_client_sdk/src/examples/api/media_stream_video/index.html

Issue 212533007: Sync NaCl MediaStream Video example with ppapi/examples/media_stream_video (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « native_client_sdk/src/examples/api/media_stream_video/example.js ('k') | native_client_sdk/src/examples/api/media_stream_video/media_stream_video.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <html>

3 <!--	3 <!--

4 Copyright 2014 The Chromium Authors. All rights reserved.	4 Copyright 2014 The Chromium Authors. All rights reserved.

5 Use of this source code is governed by a BSD-style license that can be	5 Use of this source code is governed by a BSD-style license that can be

6 found in the LICENSE file.	6 found in the LICENSE file.

7 -->	7 -->

8 <head>	8 <head>

9 <meta http-equiv="Pragma" content="no-cache">	9 <meta http-equiv="Pragma" content="no-cache">

10 <meta http-equiv="Expires" content="-1">	10 <meta http-equiv="Expires" content="-1">

11 <title>{{title}}</title>	11 <title>{{title}}</title>

12 <script type="text/javascript" src="common.js"></script>	12 <script type="text/javascript" src="common.js"></script>

13 <script type="text/javascript" src="example.js"></script>	13 <script type="text/javascript" src="example.js"></script>

14 </head>	14 </head>

15 <body data-width="640" data-height="480" {{attrs}}>	15 <body data-width="640" data-height="240" {{attrs}}>

16 <h1>{{title}}</h1>	16 <h1>{{title}}</h1>

17 <h2>Status: <code id="statusField">NO-STATUS</code></h2>	17 <h2>Status: <code id="statusField">NO-STATUS</code></h2>

18 <p>The MediaStream Video example demonstrates how to capture video from	18 <p>The MediaStream Video example demonstrates how to capture video from

19 a webcam.</p>	19 a webcam.</p>

	20 Left side shows YUV frames. Right side shows BGRA frames.<br>

	21 This example uses dev interfaces. It will not work on the WebStore,

	22 or with PNaCL.<br>
	Sam Clegg 2014/04/03 18:24:17 Why wont it work on the store? Is it just a tempo Why wont it work on the store? Is it just a temporary thing? Perhaps mention the reason here. dmichael (off chromium) 2014/04/03 18:26:28 Oops, that's probably a merge mistake. This line w Show quoted text On 2014/04/03 18:24:17, Sam Clegg wrote: > Why wont it work on the store? Is it just a temporary thing? Perhaps mention > the reason here. Oops, that's probably a merge mistake. This line was there previously, but I removed it when I pulled the APIs to stable. (Unfortunately going to stable just missed 35 :( ) In any case, we should remove that line now. Good eye. Peng 2014/04/03 18:32:40 Done Show quoted text On 2014/04/03 18:26:28, dmichael wrote: > On 2014/04/03 18:24:17, Sam Clegg wrote: > > Why wont it work on the store? Is it just a temporary thing? Perhaps mention > > the reason here. > Oops, that's probably a merge mistake. This line was there previously, but I > removed it when I pulled the APIs to stable. (Unfortunately going to stable just > missed 35 :( ) > > In any case, we should remove that line now. Good eye. Done
20 <!-- The NaCl plugin will be embedded inside the element with id "listener".	23 <!-- The NaCl plugin will be embedded inside the element with id "listener".

21 See common.js.-->	24 See common.js.-->

22 <div id="listener"></div>	25 <div id="listener"></div>

	26 <h2>Format:</h2><br>

	27 <button id="YV12">YV12</button>

	28 <button id="I420" >I420</button>

	29 <button id="BGRA" >BGRA</button>

	30 <button id="DEFAULT" >DEFAULT</button>

	31 <h2>Size:</h2><br>

	32 <button id="S72X72" >72 x 72</button>

	33 <button id="S640X360" >640 x 360</button>

	34 <button id="S1280X720" >1280 x 720</button>

	35 <button id="SDEFAULT" >DEFAULT</button>

23 </body>	36 </body>

24 </html>	37 </html>

OLD	NEW