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

Unified Diff: media/video/capture/win/video_capture_device_mf_win.cc

Issue 276383002: VideoCaptureDeviceWin: Extract class-static method into a Factory (both MF/DS) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased factory win. Created 6 years, 7 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/win/video_capture_device_mf_win.cc
diff --git a/media/video/capture/win/video_capture_device_mf_win.cc b/media/video/capture/win/video_capture_device_mf_win.cc
index cb10a86515bc826fda7855638c2023a7d08951c4..47184d97e152de478702e6fe6f62b4c9a66806df 100644
--- a/media/video/capture/win/video_capture_device_mf_win.cc
+++ b/media/video/capture/win/video_capture_device_mf_win.cc
@@ -7,7 +7,6 @@
#include <mfapi.h>
#include <mferror.h>
-#include "base/lazy_instance.h"
#include "base/memory/ref_counted.h"
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
@@ -20,7 +19,6 @@ using base::win::ScopedCoMem;
using base::win::ScopedComPtr;
namespace media {
-namespace {
// In Windows device identifiers, the USB VID and PID are preceded by the string
// "vid_" or "pid_". The identifiers are each 4 bytes long.
@@ -28,74 +26,7 @@ const char kVidPrefix[] = "vid_"; // Also contains '\0'.
const char kPidPrefix[] = "pid_"; // Also contains '\0'.
const size_t kVidPidSize = 4;
-class MFInitializerSingleton {
- public:
- MFInitializerSingleton() { MFStartup(MF_VERSION, MFSTARTUP_LITE); }
- ~MFInitializerSingleton() { MFShutdown(); }
-};
-
-static base::LazyInstance<MFInitializerSingleton> g_mf_initialize =
- LAZY_INSTANCE_INITIALIZER;
-
-void EnsureMFInit() {
- g_mf_initialize.Get();
-}
-
-bool PrepareVideoCaptureAttributes(IMFAttributes** attributes, int count) {
- EnsureMFInit();
-
- if (FAILED(MFCreateAttributes(attributes, count)))
- return false;
-
- return SUCCEEDED((*attributes)->SetGUID(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE,
- MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_GUID));
-}
-
-bool EnumerateVideoDevices(IMFActivate*** devices,
- UINT32* count) {
- ScopedComPtr<IMFAttributes> attributes;
- if (!PrepareVideoCaptureAttributes(attributes.Receive(), 1))
- return false;
-
- return SUCCEEDED(MFEnumDeviceSources(attributes, devices, count));
-}
-
-bool CreateVideoCaptureDevice(const char* sym_link, IMFMediaSource** source) {
- ScopedComPtr<IMFAttributes> attributes;
- if (!PrepareVideoCaptureAttributes(attributes.Receive(), 2))
- return false;
-
- attributes->SetString(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK,
- base::SysUTF8ToWide(sym_link).c_str());
-
- return SUCCEEDED(MFCreateDeviceSource(attributes, source));
-}
-
-bool FormatFromGuid(const GUID& guid, VideoPixelFormat* format) {
- struct {
- const GUID& guid;
- const VideoPixelFormat format;
- } static const kFormatMap[] = {
- { MFVideoFormat_I420, PIXEL_FORMAT_I420 },
- { MFVideoFormat_YUY2, PIXEL_FORMAT_YUY2 },
- { MFVideoFormat_UYVY, PIXEL_FORMAT_UYVY },
- { MFVideoFormat_RGB24, PIXEL_FORMAT_RGB24 },
- { MFVideoFormat_ARGB32, PIXEL_FORMAT_ARGB },
- { MFVideoFormat_MJPG, PIXEL_FORMAT_MJPEG },
- { MFVideoFormat_YV12, PIXEL_FORMAT_YV12 },
- };
-
- for (int i = 0; i < arraysize(kFormatMap); ++i) {
- if (kFormatMap[i].guid == guid) {
- *format = kFormatMap[i].format;
- return true;
- }
- }
-
- return false;
-}
-
-bool GetFrameSize(IMFMediaType* type, gfx::Size* frame_size) {
+static bool GetFrameSize(IMFMediaType* type, gfx::Size* frame_size) {
UINT32 width32, height32;
if (FAILED(MFGetAttributeSize(type, MF_MT_FRAME_SIZE, &width32, &height32)))
return false;
@@ -103,9 +34,9 @@ bool GetFrameSize(IMFMediaType* type, gfx::Size* frame_size) {
return true;
}
-bool GetFrameRate(IMFMediaType* type,
- int* frame_rate_numerator,
- int* frame_rate_denominator) {
+static bool GetFrameRate(IMFMediaType* type,
+ int* frame_rate_numerator,
+ int* frame_rate_denominator) {
UINT32 numerator, denominator;
if (FAILED(MFGetAttributeRatio(type, MF_MT_FRAME_RATE, &numerator,
&denominator))||
@@ -117,15 +48,16 @@ bool GetFrameRate(IMFMediaType* type,
return true;
}
-bool FillCapabilitiesFromType(IMFMediaType* type,
- VideoCaptureCapabilityWin* capability) {
+static bool FillCapabilitiesFromType(IMFMediaType* type,
+ VideoCaptureCapabilityWin* capability) {
GUID type_guid;
if (FAILED(type->GetGUID(MF_MT_SUBTYPE, &type_guid)) ||
!GetFrameSize(type, &capability->supported_format.frame_size) ||
!GetFrameRate(type,
&capability->frame_rate_numerator,
&capability->frame_rate_denominator) ||
- !FormatFromGuid(type_guid, &capability->supported_format.pixel_format)) {
+ !VideoCaptureDeviceMFWin::FormatFromGuid(type_guid,
+ &capability->supported_format.pixel_format)) {
return false;
}
// Keep the integer version of the frame_rate for (potential) returns.
@@ -154,24 +86,6 @@ HRESULT FillCapabilities(IMFSourceReader* source,
return (hr == MF_E_NO_MORE_TYPES) ? S_OK : hr;
}
-bool LoadMediaFoundationDlls() {
- static const wchar_t* const kMfDLLs[] = {
- L"%WINDIR%\\system32\\mf.dll",
- L"%WINDIR%\\system32\\mfplat.dll",
- L"%WINDIR%\\system32\\mfreadwrite.dll",
- };
-
- for (int i = 0; i < arraysize(kMfDLLs); ++i) {
- wchar_t path[MAX_PATH] = {0};
- ExpandEnvironmentStringsW(kMfDLLs[i], path, arraysize(path));
- if (!LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH))
- return false;
- }
-
- return true;
-}
-
-} // namespace
class MFReaderCallback FINAL
: public base::RefCountedThreadSafe<MFReaderCallback>,
@@ -250,95 +164,29 @@ class MFReaderCallback FINAL
};
// static
-bool VideoCaptureDeviceMFWin::PlatformSupported() {
- // Even though the DLLs might be available on Vista, we get crashes
- // when running our tests on the build bots.
- if (base::win::GetVersion() < base::win::VERSION_WIN7)
- return false;
-
- static bool g_dlls_available = LoadMediaFoundationDlls();
- return g_dlls_available;
-}
-
-// static
-void VideoCaptureDeviceMFWin::GetDeviceNames(Names* device_names) {
- ScopedCoMem<IMFActivate*> devices;
- UINT32 count;
- if (!EnumerateVideoDevices(&devices, &count))
- return;
+bool VideoCaptureDeviceMFWin::FormatFromGuid(const GUID& guid,
+ VideoPixelFormat* format) {
+ struct {
+ const GUID& guid;
+ const VideoPixelFormat format;
+ } static const kFormatMap[] = {
+ { MFVideoFormat_I420, PIXEL_FORMAT_I420 },
+ { MFVideoFormat_YUY2, PIXEL_FORMAT_YUY2 },
+ { MFVideoFormat_UYVY, PIXEL_FORMAT_UYVY },
+ { MFVideoFormat_RGB24, PIXEL_FORMAT_RGB24 },
+ { MFVideoFormat_ARGB32, PIXEL_FORMAT_ARGB },
+ { MFVideoFormat_MJPG, PIXEL_FORMAT_MJPEG },
+ { MFVideoFormat_YV12, PIXEL_FORMAT_YV12 },
+ };
- HRESULT hr;
- for (UINT32 i = 0; i < count; ++i) {
- UINT32 name_size, id_size;
- ScopedCoMem<wchar_t> name, id;
- if (SUCCEEDED(hr = devices[i]->GetAllocatedString(
- MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, &name, &name_size)) &&
- SUCCEEDED(hr = devices[i]->GetAllocatedString(
- MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, &id,
- &id_size))) {
- std::wstring name_w(name, name_size), id_w(id, id_size);
- Name device(base::SysWideToUTF8(name_w), base::SysWideToUTF8(id_w),
- Name::MEDIA_FOUNDATION);
- device_names->push_back(device);
- } else {
- DLOG(WARNING) << "GetAllocatedString failed: " << std::hex << hr;
+ for (int i = 0; i < arraysize(kFormatMap); ++i) {
+ if (kFormatMap[i].guid == guid) {
+ *format = kFormatMap[i].format;
+ return true;
}
- devices[i]->Release();
}
-}
-
-// static
-void VideoCaptureDeviceMFWin::GetDeviceSupportedFormats(const Name& device,
- VideoCaptureFormats* formats) {
- ScopedComPtr<IMFMediaSource> source;
- if (!CreateVideoCaptureDevice(device.id().c_str(), source.Receive()))
- return;
-
- HRESULT hr;
- base::win::ScopedComPtr<IMFSourceReader> reader;
- if (FAILED(hr = MFCreateSourceReaderFromMediaSource(source, NULL,
- reader.Receive()))) {
- DLOG(ERROR) << "MFCreateSourceReaderFromMediaSource: " << std::hex << hr;
- return;
- }
-
- DWORD stream_index = 0;
- ScopedComPtr<IMFMediaType> type;
- while (SUCCEEDED(hr = reader->GetNativeMediaType(
- MF_SOURCE_READER_FIRST_VIDEO_STREAM, stream_index, type.Receive()))) {
- UINT32 width, height;
- hr = MFGetAttributeSize(type, MF_MT_FRAME_SIZE, &width, &height);
- if (FAILED(hr)) {
- DLOG(ERROR) << "MFGetAttributeSize: " << std::hex << hr;
- return;
- }
- VideoCaptureFormat capture_format;
- capture_format.frame_size.SetSize(width, height);
-
- UINT32 numerator, denominator;
- hr = MFGetAttributeRatio(type, MF_MT_FRAME_RATE, &numerator, &denominator);
- if (FAILED(hr)) {
- DLOG(ERROR) << "MFGetAttributeSize: " << std::hex << hr;
- return;
- }
- capture_format.frame_rate = denominator ? numerator / denominator : 0;
-
- GUID type_guid;
- hr = type->GetGUID(MF_MT_SUBTYPE, &type_guid);
- if (FAILED(hr)) {
- DLOG(ERROR) << "GetGUID: " << std::hex << hr;
- return;
- }
- FormatFromGuid(type_guid, &capture_format.pixel_format);
- type.Release();
- formats->push_back(capture_format);
- ++stream_index;
- DVLOG(1) << device.name() << " resolution: "
- << capture_format.frame_size.ToString() << ", fps: "
- << capture_format.frame_rate << ", pixel format: "
- << capture_format.pixel_format;
- }
+ return false;
}
const std::string VideoCaptureDevice::Name::GetModel() const {
@@ -370,14 +218,11 @@ VideoCaptureDeviceMFWin::~VideoCaptureDeviceMFWin() {
DCHECK(CalledOnValidThread());
}
-bool VideoCaptureDeviceMFWin::Init() {
+bool VideoCaptureDeviceMFWin::Init(
+ const base::win::ScopedComPtr<IMFMediaSource>& source) {
DCHECK(CalledOnValidThread());
DCHECK(!reader_);
- ScopedComPtr<IMFMediaSource> source;
- if (!CreateVideoCaptureDevice(name_.id().c_str(), source.Receive()))
- return false;
-
ScopedComPtr<IMFAttributes> attributes;
MFCreateAttributes(attributes.Receive(), 1);
DCHECK(attributes);
« no previous file with comments | « media/video/capture/win/video_capture_device_mf_win.h ('k') | media/video/capture/win/video_capture_device_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698