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

Unified Diff: content/browser/renderer_host/media/video_capture_controller_event_handler.h

Issue 23551011: From Video Capture, abolish OnFrameInfo and enable resolution changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix constant declaration issue. Created 7 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
Index: content/browser/renderer_host/media/video_capture_controller_event_handler.h
diff --git a/content/browser/renderer_host/media/video_capture_controller_event_handler.h b/content/browser/renderer_host/media/video_capture_controller_event_handler.h
index 4a2c294b0baf4e006b172ef817dc65b117683103..6559a530b1d768feb198a0b5460f83c78e38c90c 100644
--- a/content/browser/renderer_host/media/video_capture_controller_event_handler.h
+++ b/content/browser/renderer_host/media/video_capture_controller_event_handler.h
@@ -8,10 +8,7 @@
#include "base/memory/shared_memory.h"
#include "base/time/time.h"
#include "content/common/content_export.h"
-
-namespace media {
-class VideoCaptureCapability;
-}
+#include "media/video/capture/video_capture_types.h"
namespace content {
@@ -36,22 +33,19 @@ class CONTENT_EXPORT VideoCaptureControllerEventHandler {
// A buffer has been newly created.
virtual void OnBufferCreated(const VideoCaptureControllerID& id,
base::SharedMemoryHandle handle,
- int length, int buffer_id) = 0;
-
- // A buffer has been filled with I420 video.
- virtual void OnBufferReady(const VideoCaptureControllerID& id,
- int buffer_id,
- base::Time timestamp) = 0;
+ int length,
+ int buffer_id) = 0;
- // The frame resolution the VideoCaptureDevice capture video in.
- virtual void OnFrameInfo(const VideoCaptureControllerID& id,
- const media::VideoCaptureCapability& format) = 0;
+ // A previously created buffer has been freed and will no longer be used.
+ virtual void OnBufferDestroyed(const VideoCaptureControllerID& id,
+ int buffer_id) = 0;
- // The frame resolution the VideoCaptureDevice capture video in.
- virtual void OnFrameInfoChanged(const VideoCaptureControllerID& id,
- int width,
- int height,
- int frame_rate) {};
+ // A buffer has been filled with I420 video.
+ virtual void OnBufferReady(
+ const VideoCaptureControllerID& id,
+ int buffer_id,
+ base::Time timestamp,
+ const media::VideoCaptureFormat& format) = 0;
// The capture session has ended and no more frames will be sent.
virtual void OnEnded(const VideoCaptureControllerID& id) = 0;

Powered by Google App Engine
This is Rietveld 408576698