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

Side by Side Diff: media/video/capture/win/video_capture_device_win.h

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 // Windows specific implementation of VideoCaptureDevice. 5 // Windows specific implementation of VideoCaptureDevice.
6 // DirectShow is used for capturing. DirectShow provide its own threads 6 // DirectShow is used for capturing. DirectShow provide its own threads
7 // for capturing. 7 // for capturing.
8 8
9 #ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 9 #ifndef MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
10 #define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 10 #define MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 kIdle, // The device driver is opened but camera is not in use. 52 kIdle, // The device driver is opened but camera is not in use.
53 kCapturing, // Video is being captured. 53 kCapturing, // Video is being captured.
54 kError // Error accessing HW functions. 54 kError // Error accessing HW functions.
55 // User needs to recover by destroying the object. 55 // User needs to recover by destroying the object.
56 }; 56 };
57 57
58 // Implements SinkFilterObserver. 58 // Implements SinkFilterObserver.
59 virtual void FrameReceived(const uint8* buffer, int length); 59 virtual void FrameReceived(const uint8* buffer, int length);
60 60
61 bool CreateCapabilityMap(); 61 bool CreateCapabilityMap();
62 void SetErrorState(const char* reason); 62 void SetErrorState(const std::string& reason);
63 63
64 Name device_name_; 64 Name device_name_;
65 InternalState state_; 65 InternalState state_;
66 scoped_ptr<VideoCaptureDevice::Client> client_; 66 scoped_ptr<VideoCaptureDevice::Client> client_;
67 67
68 base::win::ScopedComPtr<IBaseFilter> capture_filter_; 68 base::win::ScopedComPtr<IBaseFilter> capture_filter_;
69 base::win::ScopedComPtr<IGraphBuilder> graph_builder_; 69 base::win::ScopedComPtr<IGraphBuilder> graph_builder_;
70 base::win::ScopedComPtr<IMediaControl> media_control_; 70 base::win::ScopedComPtr<IMediaControl> media_control_;
71 base::win::ScopedComPtr<IPin> input_sink_pin_; 71 base::win::ScopedComPtr<IPin> input_sink_pin_;
72 base::win::ScopedComPtr<IPin> output_capture_pin_; 72 base::win::ScopedComPtr<IPin> output_capture_pin_;
73 // Used when using a MJPEG decoder. 73 // Used when using a MJPEG decoder.
74 base::win::ScopedComPtr<IBaseFilter> mjpg_filter_; 74 base::win::ScopedComPtr<IBaseFilter> mjpg_filter_;
75 base::win::ScopedComPtr<IPin> input_mjpg_pin_; 75 base::win::ScopedComPtr<IPin> input_mjpg_pin_;
76 base::win::ScopedComPtr<IPin> output_mjpg_pin_; 76 base::win::ScopedComPtr<IPin> output_mjpg_pin_;
77 77
78 scoped_refptr<SinkFilter> sink_filter_; 78 scoped_refptr<SinkFilter> sink_filter_;
79 79
80 // Map of all capabilities this device support. 80 // Map of all capabilities this device support.
81 CapabilityList capabilities_; 81 CapabilityList capabilities_;
82 VideoCaptureFormat capture_format_; 82 VideoCaptureFormat capture_format_;
83 83
84 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin); 84 DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
85 }; 85 };
86 86
87 } // namespace media 87 } // namespace media
88 88
89 #endif // MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_ 89 #endif // MEDIA_VIDEO_CAPTURE_WIN_VIDEO_CAPTURE_DEVICE_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698