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

Side by Side Diff: webrtc/modules/video_capture/test/video_capture_unittest.cc

Issue 1914153002: Remove calls to ScopedToUnique and UniqueToScoped (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@base-fix
Patch Set: Created 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 EXPECT_EQ(0, module2->StopCapture()); 427 EXPECT_EQ(0, module2->StopCapture());
428 EXPECT_EQ(0, module1->StopCapture()); 428 EXPECT_EQ(0, module1->StopCapture());
429 } 429 }
430 430
431 // Test class for testing external capture and capture feedback information 431 // Test class for testing external capture and capture feedback information
432 // such as frame rate and picture alarm. 432 // such as frame rate and picture alarm.
433 class VideoCaptureExternalTest : public testing::Test { 433 class VideoCaptureExternalTest : public testing::Test {
434 public: 434 public:
435 void SetUp() { 435 void SetUp() {
436 capture_module_ = VideoCaptureFactory::Create(0, capture_input_interface_); 436 capture_module_ = VideoCaptureFactory::Create(0, capture_input_interface_);
437 process_module_ = 437 process_module_ = webrtc::ProcessThread::Create("ProcessThread");
438 rtc::ScopedToUnique(webrtc::ProcessThread::Create("ProcessThread"));
439 process_module_->Start(); 438 process_module_->Start();
440 process_module_->RegisterModule(capture_module_); 439 process_module_->RegisterModule(capture_module_);
441 440
442 VideoCaptureCapability capability; 441 VideoCaptureCapability capability;
443 capability.width = kTestWidth; 442 capability.width = kTestWidth;
444 capability.height = kTestHeight; 443 capability.height = kTestHeight;
445 capability.rawType = webrtc::kVideoYV12; 444 capability.rawType = webrtc::kVideoYV12;
446 capability.maxFPS = kTestFramerate; 445 capability.maxFPS = kTestFramerate;
447 capture_callback_.SetExpectedCapability(capability); 446 capture_callback_.SetExpectedCapability(capability);
448 447
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 length, capture_callback_.capability(), 0)); 543 length, capture_callback_.capability(), 0));
545 EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_180)); 544 EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_180));
546 capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_180); 545 capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_180);
547 EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(), 546 EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
548 length, capture_callback_.capability(), 0)); 547 length, capture_callback_.capability(), 0));
549 EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_270)); 548 EXPECT_EQ(0, capture_module_->SetCaptureRotation(webrtc::kVideoRotation_270));
550 capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_270); 549 capture_callback_.SetExpectedCaptureRotation(webrtc::kVideoRotation_270);
551 EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(), 550 EXPECT_EQ(0, capture_input_interface_->IncomingFrame(test_buffer.get(),
552 length, capture_callback_.capability(), 0)); 551 length, capture_callback_.capability(), 0));
553 } 552 }
OLDNEW
« no previous file with comments | « webrtc/modules/utility/source/process_thread_impl_unittest.cc ('k') | webrtc/voice_engine/shared_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698