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

Unified Diff: media/video/capture/win/video_capture_device_win.h

Issue 11419200: Video capture implementation using the Media Foundation API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: actually delete the #include line instead of just commenting it out Created 8 years, 1 month 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/win/video_capture_device_win.h
diff --git a/media/video/capture/win/video_capture_device_win.h b/media/video/capture/win/video_capture_device_win.h
index 8a4f305180735784fbf23f1997da0e5bf8d7de34..9e1f005e7788d19890b9241c542f330d1a75f765 100644
--- a/media/video/capture/win/video_capture_device_win.h
+++ b/media/video/capture/win/video_capture_device_win.h
@@ -21,6 +21,7 @@
#include "base/win/scoped_comptr.h"
#include "media/video/capture/video_capture_device.h"
#include "media/video/capture/video_capture_types.h"
+#include "media/video/capture/win/capability_list_win.h"
#include "media/video/capture/win/sink_filter_win.h"
#include "media/video/capture/win/sink_input_pin_win.h"
@@ -48,6 +49,8 @@ class VideoCaptureDeviceWin
virtual void DeAllocate() OVERRIDE;
virtual const Name& device_name() OVERRIDE;
+ static void GetDeviceNames(Names* device_names);
+
private:
enum InternalState {
kIdle, // The device driver is opened but camera is not in use.
@@ -56,13 +59,11 @@ class VideoCaptureDeviceWin
kError // Error accessing HW functions.
// User needs to recover by destroying the object.
};
- typedef std::map<int, VideoCaptureCapability> CapabilityMap;
// Implements SinkFilterObserver.
virtual void FrameReceived(const uint8* buffer, int length);
bool CreateCapabilityMap();
- int GetBestMatchedCapability(int width, int height, int frame_rate);
void SetErrorState(const char* reason);
Name device_name_;
@@ -82,7 +83,7 @@ class VideoCaptureDeviceWin
scoped_refptr<SinkFilter> sink_filter_;
// Map of all capabilities this device support.
- CapabilityMap capabilities_;
+ CapabilityList capabilities_;
DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceWin);
};

Powered by Google App Engine
This is Rietveld 408576698