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

Unified 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, 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 side-by-side diff with in-line comments

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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: native_client_sdk/src/examples/api/media_stream_video/index.html

diff --git a/native_client_sdk/src/examples/api/media_stream_video/index.html b/native_client_sdk/src/examples/api/media_stream_video/index.html

index b03fc5099ed92bf3266e18e8ca8418f82fc51690..3f8692a692bf5f2a795c02806541135b209f8a3c 100644

--- a/native_client_sdk/src/examples/api/media_stream_video/index.html

+++ b/native_client_sdk/src/examples/api/media_stream_video/index.html

@@ -12,13 +12,26 @@ found in the LICENSE file.

</head>

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

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

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

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

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

a webcam.</p>

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

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

+ or with PNaCL.<br>

Sam Clegg 2014/04/03 18:24:17 Why wont it work on the store? Is it just a tempo

dmichael (off chromium) 2014/04/03 18:26:28 Oops, that's probably a merge mistake. This line w

Peng 2014/04/03 18:32:40 Done

<!-- The NaCl plugin will be embedded inside the element with id "listener".

See common.js.-->

+ <h2>Format:</h2><br>

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

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

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

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

+ <h2>Size:</h2><br>

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

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

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

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

</body>

</html>