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

Side by Side Diff: media/video/capture/linux/video_capture_device_linux.cc

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/linux/video_capture_device_linux.h" 5 #include "media/video/capture/linux/video_capture_device_linux.h"
6 6
7 #include <errno.h> 7 #include <errno.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #if defined(OS_OPENBSD) 9 #if defined(OS_OPENBSD)
10 #include <sys/videoio.h> 10 #include <sys/videoio.h>
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 delete [] buffer_pool_; 600 delete [] buffer_pool_;
601 buffer_pool_ = NULL; 601 buffer_pool_ = NULL;
602 buffer_pool_size_ = 0; 602 buffer_pool_size_ = 0;
603 } 603 }
604 604
605 void VideoCaptureDeviceLinux::SetErrorState(const std::string& reason) { 605 void VideoCaptureDeviceLinux::SetErrorState(const std::string& reason) {
606 DCHECK(!v4l2_thread_.IsRunning() || 606 DCHECK(!v4l2_thread_.IsRunning() ||
607 v4l2_thread_.message_loop() == base::MessageLoop::current()); 607 v4l2_thread_.message_loop() == base::MessageLoop::current());
608 DVLOG(1) << reason; 608 DVLOG(1) << reason;
609 state_ = kError; 609 state_ = kError;
610 client_->OnError(); 610 client_->OnError(reason);
611 } 611 }
612 612
613 } // namespace media 613 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698