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: Update Created 6 years, 9 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') | native_client_sdk/src/examples/api/media_stream_video/media_stream_video.cc » ('J')
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>

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

21 or with PNaCL.<br>	22 or with PNaCL.<br>

22 <!-- 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".

23 See common.js.-->	24 See common.js.-->

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

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

	27 <button onclick="changeFormat('YV12')" >YV12</button>

	28 <button onclick="changeFormat('I420')" >I420</button>
	Sam Clegg 2014/03/28 18:24:56 Doesn't CSP make inline JavaScript illegal? I thi Doesn't CSP make inline JavaScript illegal? I think we need all our example to be CSP compliant so that we can build them into a packaged app. binji 2014/04/01 00:00:52 Yes, this is correct. We typically do this sort of Show quoted text On 2014/03/28 18:24:56, Sam Clegg wrote: > Doesn't CSP make inline JavaScript illegal? I think we need all our example to > be CSP compliant so that we can build them into a packaged app. Yes, this is correct. We typically do this sort of behavior in an "attachListeners" function. It will be automatically called by common.js. See core/example.js, for example. Peng 2014/04/01 15:36:37 Done. Show quoted text On 2014/04/01 00:00:52, binji wrote: > On 2014/03/28 18:24:56, Sam Clegg wrote: > > Doesn't CSP make inline JavaScript illegal? I think we need all our example > to > > be CSP compliant so that we can build them into a packaged app. > > Yes, this is correct. We typically do this sort of behavior in an > "attachListeners" function. It will be automatically called by common.js. See > core/example.js, for example. Done.
	29 <button onclick="changeFormat('BGRA')" >BGRA</button>

	30 <button onclick="changeFormat('DEFAULT')" >DEFAULT</button>

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

	32 <button onclick="changeSize(72, 72)" >72 x 72</button>

	33 <button onclick="changeSize(640, 360)" >640 x 360</button>

	34 <button onclick="changeSize(1280, 720)" >1280 x 720</button>

	35 <button onclick="changeSize(0, 0)" >DEFAULT</button>

25 </body>	36 </body>

26 </html>	37 </html>

OLD	NEW