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

Unified Diff: media/video/capture/fake_video_capture_device.h

Issue 15906019: Hook up EncodedVideoSource on the browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screencast_cl_6
Patch Set: 516738a8 IPC/struct changes, courtesy hshi@ Created 7 years, 6 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: media/video/capture/fake_video_capture_device.h
diff --git a/media/video/capture/fake_video_capture_device.h b/media/video/capture/fake_video_capture_device.h
index d674bc8b344ffbf68bfdc3e62428bb8a0f4370af..e3dfa6eea510689cd8afc37bc6dbdb55510b368c 100644
--- a/media/video/capture/fake_video_capture_device.h
+++ b/media/video/capture/fake_video_capture_device.h
@@ -18,15 +18,19 @@ namespace media {
class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {
public:
- static VideoCaptureDevice* Create(const Name& device_name);
+ static VideoCaptureDevice* Create(const Name& device_name,
+ bool encoded_capture);
Ami GONE FROM CHROMIUM 2013/06/18 18:35:55 indent is off here and elsewhere in the CL. Pleas
sheu 2013/08/22 22:40:31 Not sure what you mean here?
virtual ~FakeVideoCaptureDevice();
// Used for testing. This will make sure the next call to Create will
// return NULL;
static void SetFailNextCreate();
- static void GetDeviceNames(Names* device_names);
+ static void GetDeviceNames(Names* device_names, bool encoded_capture);
Ami GONE FROM CHROMIUM 2013/06/18 18:35:55 Why pass this in if not to inspect it in Create()
sheu 2013/08/22 22:40:31 Not quite following here. GetDeviceNames() constr
// VideoCaptureDevice implementation.
+ virtual VideoEncodingCapabilities GetEncodingCapabilities() OVERRIDE;
+ virtual void TryConfigureEncodedBitstream(
+ const RuntimeVideoEncodingParameters& params) OVERRIDE;
virtual void Allocate(int width,
int height,
int frame_rate,
@@ -44,17 +48,20 @@ class MEDIA_EXPORT FakeVideoCaptureDevice : public VideoCaptureDevice {
kCapturing,
kError
};
- explicit FakeVideoCaptureDevice(const Name& device_name);
+ explicit FakeVideoCaptureDevice(const Name& device_name,
+ bool encoded_capture);
// Called on the capture_thread_.
void OnCaptureTask();
Name device_name_;
+ bool encoded_capture_;
VideoCaptureDevice::EventHandler* observer_;
InternalState state_;
base::Thread capture_thread_;
int frame_size_;
scoped_ptr<uint8[]> fake_frame_;
+ scoped_refptr<media::EncodedBitstreamBuffer> fake_encoded_bitstream_buffer_;
Ami GONE FROM CHROMIUM 2013/06/18 18:35:55 unused
sheu 2013/08/22 22:40:31 Done.
int frame_count_;
int frame_width_;
int frame_height_;

Powered by Google App Engine
This is Rietveld 408576698