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

Side by Side Diff: media/video/capture/mac/video_capture_device_mac.mm

Issue 18052007: Use a direct include of time headers in media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « media/tools/shader_bench/shader_bench.cc ('k') | media/video/capture/video_capture.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/video/capture/mac/video_capture_device_mac.h" 5 #include "media/video/capture/mac/video_capture_device_mac.h"
6 6
7 #import <QTKit/QTKit.h> 7 #import <QTKit/QTKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/time.h" 10 #include "base/time/time.h"
11 #include "media/video/capture/mac/video_capture_device_qtkit_mac.h" 11 #include "media/video/capture/mac/video_capture_device_qtkit_mac.h"
12 12
13 namespace { 13 namespace {
14 14
15 const int kMinFrameRate = 1; 15 const int kMinFrameRate = 1;
16 const int kMaxFrameRate = 30; 16 const int kMaxFrameRate = 30;
17 17
18 struct Resolution { 18 struct Resolution {
19 int width; 19 int width;
20 int height; 20 int height;
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 video_frame, video_frame_length, base::Time::Now(), 0, false, false); 191 video_frame, video_frame_length, base::Time::Now(), 0, false, false);
192 } 192 }
193 193
194 void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) { 194 void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) {
195 DLOG(ERROR) << reason; 195 DLOG(ERROR) << reason;
196 state_ = kError; 196 state_ = kError;
197 observer_->OnError(); 197 observer_->OnError();
198 } 198 }
199 199
200 } // namespace media 200 } // namespace media
OLDNEW
« no previous file with comments | « media/tools/shader_bench/shader_bench.cc ('k') | media/video/capture/video_capture.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698