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

Side by Side Diff: content/browser/renderer_host/media/in_process_video_capture_provider.h

Issue 2885653002: [Mojo Video Capture] Do not instantiate in-process VideoCaptureSystem when using service (Closed)
Patch Set: Use SEQUENCE_CHECKER macros and Rebase to May 19th Created 3 years, 7 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_BROWSER_RENDERER_HOST_MEDIA_IN_PROCESS_VIDEO_CAPTURE_SYSTEM_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_IN_PROCESS_VIDEO_CAPTURE_SYSTEM_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_IN_PROCESS_VIDEO_CAPTURE_SYSTEM_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_IN_PROCESS_VIDEO_CAPTURE_SYSTEM_H_
7 7
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "content/browser/renderer_host/media/video_capture_provider.h" 11 #include "content/browser/renderer_host/media/video_capture_provider.h"
12 #include "media/capture/video/video_capture_system.h" 12 #include "media/capture/video/video_capture_system.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 class CONTENT_EXPORT InProcessVideoCaptureProvider 16 class CONTENT_EXPORT InProcessVideoCaptureProvider
17 : public VideoCaptureProvider { 17 : public VideoCaptureProvider {
18 public: 18 public:
19 InProcessVideoCaptureProvider( 19 InProcessVideoCaptureProvider(
20 std::unique_ptr<media::VideoCaptureSystem> video_capture_system, 20 std::unique_ptr<media::VideoCaptureSystem> video_capture_system,
21 scoped_refptr<base::SingleThreadTaskRunner> device_task_runner); 21 scoped_refptr<base::SingleThreadTaskRunner> device_task_runner);
22
22 ~InProcessVideoCaptureProvider() override; 23 ~InProcessVideoCaptureProvider() override;
23 24
25 static std::unique_ptr<VideoCaptureProvider>
26 CreateInstanceForNonDeviceCapture(
27 scoped_refptr<base::SingleThreadTaskRunner> device_task_runner);
28
29 static std::unique_ptr<VideoCaptureProvider> CreateInstance(
30 std::unique_ptr<media::VideoCaptureSystem> video_capture_system,
31 scoped_refptr<base::SingleThreadTaskRunner> device_task_runner);
32
24 void Uninitialize() override; 33 void Uninitialize() override;
25 34
26 void GetDeviceInfosAsync( 35 void GetDeviceInfosAsync(
27 const base::Callback<void( 36 const GetDeviceInfosCallback& result_callback) override;
28 const std::vector<media::VideoCaptureDeviceInfo>&)>& result_callback)
29 override;
30 37
31 std::unique_ptr<VideoCaptureDeviceLauncher> CreateDeviceLauncher() override; 38 std::unique_ptr<VideoCaptureDeviceLauncher> CreateDeviceLauncher() override;
32 39
33 private: 40 private:
41 // Can be nullptr.
34 const std::unique_ptr<media::VideoCaptureSystem> video_capture_system_; 42 const std::unique_ptr<media::VideoCaptureSystem> video_capture_system_;
35 // The message loop of media stream device thread, where VCD's live. 43 // The message loop of media stream device thread, where VCD's live.
36 scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_; 44 const scoped_refptr<base::SingleThreadTaskRunner> device_task_runner_;
45
46 SEQUENCE_CHECKER(sequence_checker_);
37 }; 47 };
38 48
39 } // namespace content 49 } // namespace content
40 50
41 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_IN_PROCESS_VIDEO_CAPTURE_SYSTEM_H _ 51 #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_IN_PROCESS_VIDEO_CAPTURE_SYSTEM_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698