Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc |
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc |
index 54b9c303ead128c46b3816f09eb320e7dd4bcb2a..6441806606ad29811bd053ab01d75e59025a6ab6 100644 |
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc |
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc |
@@ -15,6 +15,7 @@ |
#include "content/browser/renderer_host/media/media_stream_provider.h" |
#include "content/browser/renderer_host/media/video_capture_manager.h" |
#include "content/common/media/media_stream_options.h" |
+#include "media/base/encoded_bitstream_buffer.h" |
#include "media/video/capture/video_capture_device.h" |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -44,21 +45,33 @@ class MockMediaStreamProviderListener : public MediaStreamProviderListener { |
// Needed as an input argument to Start(). |
class MockFrameObserver : public media::VideoCaptureDevice::EventHandler { |
public: |
- virtual scoped_refptr<media::VideoFrame> ReserveOutputBuffer() OVERRIDE { |
+ virtual scoped_refptr<media::VideoFrame> ReserveOutputVideoFrame() OVERRIDE { |
+ return NULL; |
+ } |
+ virtual scoped_refptr<media::EncodedBitstreamBuffer> |
+ ReserveOutputEncodedBitstreamBuffer() OVERRIDE { |
return NULL; |
} |
virtual void OnError() OVERRIDE {} |
virtual void OnFrameInfo( |
const media::VideoCaptureCapability& info) OVERRIDE {} |
+ virtual void OnEncodedFrameInfo( |
+ const media::VideoEncodingParameters& parameters) OVERRIDE {} |
virtual void OnIncomingCapturedFrame(const uint8* data, |
int length, |
base::Time timestamp, |
int rotation, |
bool flip_vert, |
bool flip_horiz) OVERRIDE {} |
+ virtual void OnBitstreamConfigChanged( |
+ const media::RuntimeVideoEncodingParameters& params) OVERRIDE {} |
virtual void OnIncomingCapturedVideoFrame( |
const scoped_refptr<media::VideoFrame>& frame, |
base::Time timestamp) OVERRIDE {} |
+ virtual void OnIncomingCapturedEncodedBitstreamBuffer( |
+ const scoped_refptr<media::EncodedBitstreamBuffer>& buffer, |
+ size_t data_size, |
+ base::Time timestamp) OVERRIDE {} |
}; |
// Test class |