OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "media/capture/video/win/video_capture_device_win.h" | 5 #include "media/capture/video/win/video_capture_device_win.h" |
6 | 6 |
7 #include <ks.h> | 7 #include <ks.h> |
8 #include <ksmedia.h> | 8 #include <ksmedia.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
11 #include <list> | 11 #include <list> |
12 | 12 |
| 13 #include "base/macros.h" |
13 #include "base/strings/sys_string_conversions.h" | 14 #include "base/strings/sys_string_conversions.h" |
14 #include "base/win/scoped_co_mem.h" | 15 #include "base/win/scoped_co_mem.h" |
15 #include "base/win/scoped_variant.h" | 16 #include "base/win/scoped_variant.h" |
16 | 17 |
17 using base::win::ScopedCoMem; | 18 using base::win::ScopedCoMem; |
18 using base::win::ScopedComPtr; | 19 using base::win::ScopedComPtr; |
19 using base::win::ScopedVariant; | 20 using base::win::ScopedVariant; |
20 | 21 |
21 namespace media { | 22 namespace media { |
22 | 23 |
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
573 } | 574 } |
574 | 575 |
575 void VideoCaptureDeviceWin::SetErrorState( | 576 void VideoCaptureDeviceWin::SetErrorState( |
576 const tracked_objects::Location& from_here, | 577 const tracked_objects::Location& from_here, |
577 const std::string& reason) { | 578 const std::string& reason) { |
578 DCHECK(thread_checker_.CalledOnValidThread()); | 579 DCHECK(thread_checker_.CalledOnValidThread()); |
579 state_ = kError; | 580 state_ = kError; |
580 client_->OnError(from_here, reason); | 581 client_->OnError(from_here, reason); |
581 } | 582 } |
582 } // namespace media | 583 } // namespace media |
OLD | NEW |