| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "content/browser/browser_main_loop.h" | 8 #include "content/browser/browser_main_loop.h" |
| 9 #include "content/browser/renderer_host/media/media_stream_manager.h" | 9 #include "content/browser/renderer_host/media/media_stream_manager.h" |
| 10 #include "content/browser/renderer_host/media/video_capture_controller.h" | 10 #include "content/browser/renderer_host/media/video_capture_controller.h" |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 std::move(quit_run_loop_on_current_thread_cb), true); | 187 std::move(quit_run_loop_on_current_thread_cb), true); |
| 188 BrowserThread::PostTask( | 188 BrowserThread::PostTask( |
| 189 content::BrowserThread::IO, FROM_HERE, | 189 content::BrowserThread::IO, FROM_HERE, |
| 190 base::Bind(&VideoCaptureBrowserTest::SetUpAndStartCaptureDeviceOnIOThread, | 190 base::Bind(&VideoCaptureBrowserTest::SetUpAndStartCaptureDeviceOnIOThread, |
| 191 base::Unretained(this), std::move(after_start_continuation))); | 191 base::Unretained(this), std::move(after_start_continuation))); |
| 192 run_loop.Run(); | 192 run_loop.Run(); |
| 193 } | 193 } |
| 194 | 194 |
| 195 IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, | 195 IN_PROC_BROWSER_TEST_P(VideoCaptureBrowserTest, |
| 196 ReceiveFramesFromFakeCaptureDevice) { | 196 ReceiveFramesFromFakeCaptureDevice) { |
| 197 // TODO(chfremer): This test case is flaky on Android. Find out cause of |
| 198 // flakiness and then re-enable. See crbug.com/709039. |
| 199 #if defined(OS_ANDROID) |
| 200 if (GetParam().exercise_accelerated_jpeg_decoding) |
| 201 return; |
| 202 #endif |
| 203 |
| 197 SetUpRequiringBrowserMainLoopOnMainThread(); | 204 SetUpRequiringBrowserMainLoopOnMainThread(); |
| 198 | 205 |
| 199 std::vector<FrameInfo> received_frame_infos; | 206 std::vector<FrameInfo> received_frame_infos; |
| 200 static const size_t kMinFramesToReceive = 5; | 207 static const size_t kMinFramesToReceive = 5; |
| 201 static const size_t kMaxFramesToReceive = 300; | 208 static const size_t kMaxFramesToReceive = 300; |
| 202 base::RunLoop run_loop; | 209 base::RunLoop run_loop; |
| 203 | 210 |
| 204 auto quit_run_loop_on_current_thread_cb = | 211 auto quit_run_loop_on_current_thread_cb = |
| 205 media::BindToCurrentLoop(run_loop.QuitClosure()); | 212 media::BindToCurrentLoop(run_loop.QuitClosure()); |
| 206 auto finish_test_cb = | 213 auto finish_test_cb = |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 280 gfx::Size(1280, 720), 25.0f, false}, | 287 gfx::Size(1280, 720), 25.0f, false}, |
| 281 TestParams{"fps=15,device-count=2", 1, media::PIXEL_FORMAT_Y16, | 288 TestParams{"fps=15,device-count=2", 1, media::PIXEL_FORMAT_Y16, |
| 282 gfx::Size(640, 480), 15.0f, false}, | 289 gfx::Size(640, 480), 15.0f, false}, |
| 283 // The 3rd device outputs MJPEG, which is converted to I420. | 290 // The 3rd device outputs MJPEG, which is converted to I420. |
| 284 TestParams{"fps=15,device-count=3", 2, media::PIXEL_FORMAT_I420, | 291 TestParams{"fps=15,device-count=3", 2, media::PIXEL_FORMAT_I420, |
| 285 gfx::Size(640, 480), 25.0f, false}, | 292 gfx::Size(640, 480), 25.0f, false}, |
| 286 TestParams{"fps=6,device-count=3", 2, media::PIXEL_FORMAT_I420, | 293 TestParams{"fps=6,device-count=3", 2, media::PIXEL_FORMAT_I420, |
| 287 gfx::Size(640, 480), 6.0f, true})); | 294 gfx::Size(640, 480), 6.0f, true})); |
| 288 | 295 |
| 289 } // namespace content | 296 } // namespace content |
| OLD | NEW |