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

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

Issue 140633004: Reland CL to implement browser-side logging to WebRtc log. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: These are the changes that should fix crbug.com/338848 Created 6 years, 10 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
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 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop_proxy.h" 10 #include "base/message_loop/message_loop_proxy.h"
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 void VideoCaptureDeviceMac::ReceiveError(const std::string& reason) { 315 void VideoCaptureDeviceMac::ReceiveError(const std::string& reason) {
316 task_runner_->PostTask(FROM_HERE, 316 task_runner_->PostTask(FROM_HERE,
317 base::Bind(&VideoCaptureDeviceMac::SetErrorState, weak_this_, 317 base::Bind(&VideoCaptureDeviceMac::SetErrorState, weak_this_,
318 reason)); 318 reason));
319 } 319 }
320 320
321 void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) { 321 void VideoCaptureDeviceMac::SetErrorState(const std::string& reason) {
322 DCHECK(task_runner_->BelongsToCurrentThread()); 322 DCHECK(task_runner_->BelongsToCurrentThread());
323 DLOG(ERROR) << reason; 323 DLOG(ERROR) << reason;
324 state_ = kError; 324 state_ = kError;
325 client_->OnError(); 325 client_->OnError(reason);
326 } 326 }
327 327
328 bool VideoCaptureDeviceMac::UpdateCaptureResolution() { 328 bool VideoCaptureDeviceMac::UpdateCaptureResolution() {
329 if (![capture_device_ setCaptureHeight:capture_format_.frame_size.height() 329 if (![capture_device_ setCaptureHeight:capture_format_.frame_size.height()
330 width:capture_format_.frame_size.width() 330 width:capture_format_.frame_size.width()
331 frameRate:capture_format_.frame_rate]) { 331 frameRate:capture_format_.frame_rate]) {
332 ReceiveError("Could not configure capture device."); 332 ReceiveError("Could not configure capture device.");
333 return false; 333 return false;
334 } 334 }
335 return true; 335 return true;
336 } 336 }
337 337
338 } // namespace media 338 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698