Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: content/browser/webrtc/webrtc_depth_capture_browsertest.cc

Issue 2606983002: Media Capture Depth Stream Extensions API: focal length and depth range. (Closed)
Patch Set: 80-char line fix in test html. Created 3 years, 10 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "content/browser/webrtc/webrtc_content_browsertest_base.h" 10 #include "content/browser/webrtc/webrtc_content_browsertest_base.h"
11 #include "content/public/common/content_switches.h" 11 #include "content/public/common/content_switches.h"
12 #include "content/public/test/content_browser_test_utils.h" 12 #include "content/public/test/content_browser_test_utils.h"
13 #include "media/base/media_switches.h" 13 #include "media/base/media_switches.h"
14 #include "net/test/embedded_test_server/embedded_test_server.h" 14 #include "net/test/embedded_test_server/embedded_test_server.h"
15 15
16 namespace { 16 namespace {
17 17
18 static const char kGetDepthStreamAndCallCreateImageBitmap[] = 18 static const char kGetDepthStreamAndCallCreateImageBitmap[] =
19 "getDepthStreamAndCallCreateImageBitmap"; 19 "getDepthStreamAndCallCreateImageBitmap";
20 static const char kGetDepthStreamAndCameraCalibration[] =
21 "getDepthStreamAndCameraCalibration";
22 static const char kGetBothStreamsAndCheckForFeaturesPresence[] =
23 "getBothStreamsAndCheckForFeaturesPresence";
20 24
21 void RemoveSwitchFromCommandLine(base::CommandLine* command_line, 25 void RemoveSwitchFromCommandLine(base::CommandLine* command_line,
22 const std::string& switch_value) { 26 const std::string& switch_value) {
23 base::CommandLine::StringVector argv = command_line->argv(); 27 base::CommandLine::StringVector argv = command_line->argv();
24 const base::CommandLine::StringType switch_string = 28 const base::CommandLine::StringType switch_string =
25 #if defined(OS_WIN) 29 #if defined(OS_WIN)
26 base::ASCIIToUTF16(switch_value); 30 base::ASCIIToUTF16(switch_value);
27 #else 31 #else
28 switch_value; 32 switch_value;
29 #endif 33 #endif
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 ASSERT_TRUE(embedded_test_server()->Start()); 71 ASSERT_TRUE(embedded_test_server()->Start());
68 72
69 GURL url( 73 GURL url(
70 embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html")); 74 embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html"));
71 NavigateToURL(shell(), url); 75 NavigateToURL(shell(), url);
72 76
73 ExecuteJavascriptAndWaitForOk(base::StringPrintf( 77 ExecuteJavascriptAndWaitForOk(base::StringPrintf(
74 "%s({video: true});", kGetDepthStreamAndCallCreateImageBitmap)); 78 "%s({video: true});", kGetDepthStreamAndCallCreateImageBitmap));
75 } 79 }
76 80
81 IN_PROC_BROWSER_TEST_F(WebRtcDepthCaptureBrowserTest,
82 GetDepthStreamAndCameraCalibration) {
83 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
84 command_line->AppendSwitchASCII("--enable-blink-features",
85 "MediaGetSettings,MediaCaptureDepth");
86
87 ASSERT_TRUE(embedded_test_server()->Start());
88
89 GURL url(
90 embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html"));
91 NavigateToURL(shell(), url);
92
93 ExecuteJavascriptAndWaitForOk(base::StringPrintf(
94 "%s({video: true});", kGetDepthStreamAndCameraCalibration));
95 }
96
97 IN_PROC_BROWSER_TEST_F(WebRtcDepthCaptureBrowserTest,
98 GetBothStreamsAndCheckForFeaturesPresence) {
99 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
100 command_line->AppendSwitchASCII("--enable-blink-features",
101 "MediaGetSettings,MediaCaptureDepth");
102
103 ASSERT_TRUE(embedded_test_server()->Start());
104
105 GURL url(
106 embedded_test_server()->GetURL("/media/getusermedia-depth-capture.html"));
107 NavigateToURL(shell(), url);
108
109 ExecuteJavascriptAndWaitForOk(base::StringPrintf(
110 "%s({video: true});", kGetBothStreamsAndCheckForFeaturesPresence));
111 }
112
77 } // namespace content 113 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | content/common/media/media_stream_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698