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

Unified Diff: content/renderer/media/video_capture_impl.h

Issue 2400443006: VideoCapture: moar VideoCapture renderer-->host messages to mojo, part 3 (Closed)
Patch Set: minor rebase Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/video_capture.mojom ('k') | content/renderer/media/video_capture_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/video_capture_impl.h
diff --git a/content/renderer/media/video_capture_impl.h b/content/renderer/media/video_capture_impl.h
index 28d747739ed6d04b7e36bd65fcd7d7abbb176040..a78c901c09340862cce58e5fd7ba1aa6d3ffcc41 100644
--- a/content/renderer/media/video_capture_impl.h
+++ b/content/renderer/media/video_capture_impl.h
@@ -132,10 +132,6 @@ class CONTENT_EXPORT VideoCaptureImpl
const gfx::Size& coded_size,
const gfx::Rect& visible_rect) override;
void OnStateChanged(VideoCaptureState state) override;
- void OnDeviceSupportedFormatsEnumerated(
- const media::VideoCaptureFormats& supported_formats) override;
- void OnDeviceFormatsInUseReceived(
- const media::VideoCaptureFormats& formats_in_use) override;
void OnDelegateAdded(int32_t device_id) override;
// Sends an IPC message to browser process when all clients are done with the
@@ -153,6 +149,13 @@ class CONTENT_EXPORT VideoCaptureImpl
void RestartCapture();
void StartCaptureInternal();
+ void OnDeviceSupportedFormats(
+ const VideoCaptureDeviceFormatsCB& callback,
+ const media::VideoCaptureFormats& supported_formats);
+ void OnDeviceFormatsInUse(
+ const VideoCaptureDeviceFormatsCB& callback,
+ const media::VideoCaptureFormats& formats_in_use);
+
// Tries to remove |client_id| from |clients|, returning false if not found.
bool RemoveClient(int client_id, ClientInfoMap* clients);
@@ -174,13 +177,6 @@ class CONTENT_EXPORT VideoCaptureImpl
mojom::VideoCaptureHostAssociatedPtr video_capture_host_;
mojom::VideoCaptureHost* video_capture_host_for_testing_;
- // Vector of callbacks to be notified of device format enumerations, used only
- // on IO Thread.
- std::vector<VideoCaptureDeviceFormatsCB> device_formats_cb_queue_;
- // Vector of callbacks to be notified of a device's in use capture format(s),
- // used only on IO Thread.
- std::vector<VideoCaptureDeviceFormatsCB> device_formats_in_use_cb_queue_;
-
// Buffers available for sending to the client.
typedef std::map<int32_t, scoped_refptr<ClientBuffer>> ClientBufferMap;
ClientBufferMap client_buffers_;
« no previous file with comments | « content/common/video_capture.mojom ('k') | content/renderer/media/video_capture_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698