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

Side by Side Diff: content/renderer/media/media_stream_video_capturer_source.h

Issue 2805903002: Fix races in MediaStream video constraints tests. (Closed)
Patch Set: Created 3 years, 8 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
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_capturer_source_unittest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 28 matching lines...) Expand all
39 MediaStreamVideoCapturerSource( 39 MediaStreamVideoCapturerSource(
40 const SourceStoppedCallback& stop_callback, 40 const SourceStoppedCallback& stop_callback,
41 const StreamDeviceInfo& device_info, 41 const StreamDeviceInfo& device_info,
42 const media::VideoCaptureParams& capture_params, 42 const media::VideoCaptureParams& capture_params,
43 RenderFrame* render_frame); 43 RenderFrame* render_frame);
44 ~MediaStreamVideoCapturerSource() override; 44 ~MediaStreamVideoCapturerSource() override;
45 45
46 private: 46 private:
47 friend class CanvasCaptureHandlerTest; 47 friend class CanvasCaptureHandlerTest;
48 friend class MediaStreamVideoCapturerSourceTest; 48 friend class MediaStreamVideoCapturerSourceTest;
49 friend class MediaStreamVideoCapturerSourceOldConstraintsTest;
49 50
50 // MediaStreamVideoSource overrides. 51 // MediaStreamVideoSource overrides.
51 void RequestRefreshFrame() override; 52 void RequestRefreshFrame() override;
52 void OnHasConsumers(bool has_consumers) override; 53 void OnHasConsumers(bool has_consumers) override;
53 void OnCapturingLinkSecured(bool is_secure) override; 54 void OnCapturingLinkSecured(bool is_secure) override;
54 void GetCurrentSupportedFormats( 55 void GetCurrentSupportedFormats(
55 int max_requested_width, 56 int max_requested_width,
56 int max_requested_height, 57 int max_requested_height,
57 double max_requested_frame_rate, 58 double max_requested_frame_rate,
58 const VideoCaptureDeviceFormatsCB& callback) override; 59 const VideoCaptureDeviceFormatsCB& callback) override;
(...skipping 22 matching lines...) Expand all
81 bool is_capture_starting_ = false; 82 bool is_capture_starting_ = false;
82 83
83 media::VideoCaptureParams capture_params_; 84 media::VideoCaptureParams capture_params_;
84 85
85 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoCapturerSource); 86 DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoCapturerSource);
86 }; 87 };
87 88
88 } // namespace content 89 } // namespace content
89 90
90 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_ 91 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_VIDEO_CAPTURER_SOURCE_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/media_stream_video_capturer_source_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698