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

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

Issue 480023002: Mac Video Capture: Change an ErrorMessage to LogMessage (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tommi@s comments Created 6 years, 4 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 | « no previous file | media/video/capture/mac/video_capture_device_qtkit_mac.mm » ('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 // MacOSX implementation of generic VideoCaptureDevice, using either QTKit or 5 // MacOSX implementation of generic VideoCaptureDevice, using either QTKit or
6 // AVFoundation as native capture API. QTKit is available in all OSX versions, 6 // AVFoundation as native capture API. QTKit is available in all OSX versions,
7 // although namely deprecated in 10.9, and AVFoundation is available in versions 7 // although namely deprecated in 10.9, and AVFoundation is available in versions
8 // 10.7 (Lion) and later. 8 // 10.7 (Lion) and later.
9 9
10 #ifndef MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_ 10 #ifndef MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 66
67 bool Init(VideoCaptureDevice::Name::CaptureApiType capture_api_type); 67 bool Init(VideoCaptureDevice::Name::CaptureApiType capture_api_type);
68 68
69 // Called to deliver captured video frames. 69 // Called to deliver captured video frames.
70 void ReceiveFrame(const uint8* video_frame, 70 void ReceiveFrame(const uint8* video_frame,
71 int video_frame_length, 71 int video_frame_length,
72 const VideoCaptureFormat& frame_format, 72 const VideoCaptureFormat& frame_format,
73 int aspect_numerator, 73 int aspect_numerator,
74 int aspect_denominator); 74 int aspect_denominator);
75 75
76 // Forwarder to VideoCaptureDevice::OnError().
76 void ReceiveError(const std::string& reason); 77 void ReceiveError(const std::string& reason);
78 // Forwarder to VideoCaptureDevice::OnLog().
tommi (sloooow) - chröme 2014/08/18 10:54:45 actually, this forwards to the client, not the cap
mcasas 2014/08/18 11:52:59 Done.
79 void LogMessage(const std::string& message);
77 80
78 private: 81 private:
79 void SetErrorState(const std::string& reason); 82 void SetErrorState(const std::string& reason);
80 void LogMessage(const std::string& message);
81 bool UpdateCaptureResolution(); 83 bool UpdateCaptureResolution();
82 84
83 // Flag indicating the internal state. 85 // Flag indicating the internal state.
84 enum InternalState { 86 enum InternalState {
85 kNotInitialized, 87 kNotInitialized,
86 kIdle, 88 kIdle,
87 kCapturing, 89 kCapturing,
88 kError 90 kError
89 }; 91 };
90 92
(...skipping 18 matching lines...) Expand all
109 // VideoCaptureDeviceMac is destroyed. 111 // VideoCaptureDeviceMac is destroyed.
110 // NOTE: Weak pointers must be invalidated before all other member variables. 112 // NOTE: Weak pointers must be invalidated before all other member variables.
111 base::WeakPtrFactory<VideoCaptureDeviceMac> weak_factory_; 113 base::WeakPtrFactory<VideoCaptureDeviceMac> weak_factory_;
112 114
113 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceMac); 115 DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceMac);
114 }; 116 };
115 117
116 } // namespace media 118 } // namespace media
117 119
118 #endif // MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_ 120 #endif // MEDIA_VIDEO_CAPTURE_MAC_VIDEO_CAPTURE_DEVICE_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | media/video/capture/mac/video_capture_device_qtkit_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698