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

Side by Side Diff: media/video/capture/win/video_capture_device_win.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/win/video_capture_device_win.h" 5 #include "media/video/capture/win/video_capture_device_win.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <list> 8 #include <list>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 } 583 }
584 capabilities_.Add(capability); 584 capabilities_.Add(capability);
585 } 585 }
586 DeleteMediaType(media_type); 586 DeleteMediaType(media_type);
587 media_type = NULL; 587 media_type = NULL;
588 } 588 }
589 589
590 return !capabilities_.empty(); 590 return !capabilities_.empty();
591 } 591 }
592 592
593 void VideoCaptureDeviceWin::SetErrorState(const char* reason) { 593 void VideoCaptureDeviceWin::SetErrorState(const std::string& reason) {
594 DCHECK(CalledOnValidThread()); 594 DCHECK(CalledOnValidThread());
595 DVLOG(1) << reason; 595 DVLOG(1) << reason;
596 state_ = kError; 596 state_ = kError;
597 client_->OnError(); 597 client_->OnError(reason);
598 } 598 }
599 } // namespace media 599 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698