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 35ab3ef0fe6650ec6861e4802b8abaa385fc1437..e5ac97d0877d1773d1d0fa679b995d0d8e0a7104 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,6 +8,8 @@ |
#include "base/shared_memory.h" |
#include "base/time.h" |
#include "content/common/content_export.h" |
+#include "media/video/capture/video_capture_types.h" |
+#include "media/video/video_encode_types.h" |
namespace content { |
@@ -29,21 +31,30 @@ class CONTENT_EXPORT VideoCaptureControllerEventHandler { |
// An Error has occurred in the VideoCaptureDevice. |
virtual void OnError(const VideoCaptureControllerID& id) = 0; |
- // 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. |
+ // A buffer has been filled with video. |
virtual void OnBufferReady(const VideoCaptureControllerID& id, |
int buffer_id, |
- base::Time timestamp) = 0; |
+ size_t data_size, |
+ base::Time timestamp, |
+ bool key_frame) = 0; |
- // The frame resolution the VideoCaptureDevice capture video in. |
+ // The (unencoded) frame resolution the VideoCaptureDevice captures video in. |
virtual void OnFrameInfo(const VideoCaptureControllerID& id, |
- int width, |
- int height, |
- int frame_rate) = 0; |
+ const media::VideoCaptureParams& params, |
+ const std::vector<base::SharedMemoryHandle>& buffers, |
+ size_t buffer_size) = 0; |
+ |
+ // The (encoded) frame resolution the VideoCaptureDevice captures video in. |
Ami GONE FROM CHROMIUM
2013/06/18 18:35:55
this is more than just resolution.
|
+ virtual void OnEncodedFrameInfo( |
+ const VideoCaptureControllerID& id, |
+ const media::VideoEncodingParameters& params, |
+ const std::vector<base::SharedMemoryHandle>& buffers, |
+ size_t buffer_size) = 0; |
+ |
+ // The encoded bitstream configuration has changed. |
+ virtual void OnBitstreamConfigChanged( |
+ const VideoCaptureControllerID& id, |
+ const media::RuntimeVideoEncodingParameters& params) = 0; |
// The capture session has ended and no more frames will be sent. |
virtual void OnEnded(const VideoCaptureControllerID& id) = 0; |