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

Side by Side Diff: media/capture/video/win/video_capture_device_win.cc

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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
« no previous file with comments | « media/capture/video/win/video_capture_device_win.h ('k') | media/capture/webm_muxer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
OLDNEW
« no previous file with comments | « media/capture/video/win/video_capture_device_win.h ('k') | media/capture/webm_muxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698