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

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

Issue 2354903003: Don't include the tracing in gpu_memory_buffer.h (Closed)
Patch Set: Fix linux build again Created 4 years, 3 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
« no previous file with comments | « media/capture/video/file_video_capture_device.cc ('k') | media/cast/test/utility/barcode.cc » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #import "media/capture/video/mac/video_capture_device_avfoundation_mac.h" 5 #import "media/capture/video/mac/video_capture_device_avfoundation_mac.h"
6 6
7 #import <CoreMedia/CoreMedia.h> 7 #import <CoreMedia/CoreMedia.h>
8 #import <CoreVideo/CoreVideo.h> 8 #import <CoreVideo/CoreVideo.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 #include <stdint.h> 10 #include <stdint.h>
11 11
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/mac/foundation_util.h" 14 #include "base/mac/foundation_util.h"
15 #include "base/mac/mac_util.h" 15 #include "base/mac/mac_util.h"
16 #include "base/metrics/histogram_macros.h" 16 #include "base/metrics/histogram_macros.h"
17 #include "base/strings/string_util.h"
17 #include "media/base/timestamp_constants.h" 18 #include "media/base/timestamp_constants.h"
18 #include "media/base/video_capture_types.h" 19 #include "media/base/video_capture_types.h"
19 #include "media/capture/video/mac/video_capture_device_mac.h" 20 #include "media/capture/video/mac/video_capture_device_mac.h"
20 #include "ui/gfx/geometry/size.h" 21 #include "ui/gfx/geometry/size.h"
21 22
22 // Prefer MJPEG if frame width or height is larger than this. 23 // Prefer MJPEG if frame width or height is larger than this.
23 static const int kMjpegWidthThreshold = 640; 24 static const int kMjpegWidthThreshold = 640;
24 static const int kMjpegHeightThreshold = 480; 25 static const int kMjpegHeightThreshold = 480;
25 26
26 namespace { 27 namespace {
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 } 504 }
504 505
505 - (void)sendErrorString:(NSString*)error { 506 - (void)sendErrorString:(NSString*)error {
506 DLOG(ERROR) << [error UTF8String]; 507 DLOG(ERROR) << [error UTF8String];
507 base::AutoLock lock(lock_); 508 base::AutoLock lock(lock_);
508 if (frameReceiver_) 509 if (frameReceiver_)
509 frameReceiver_->ReceiveError(FROM_HERE, [error UTF8String]); 510 frameReceiver_->ReceiveError(FROM_HERE, [error UTF8String]);
510 } 511 }
511 512
512 @end 513 @end
OLDNEW
« no previous file with comments | « media/capture/video/file_video_capture_device.cc ('k') | media/cast/test/utility/barcode.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698