diff options
| author | mcasas <mcasas@chromium.org> | 2014-08-27 07:24:35 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 14:25:53 +0000 |
| commit | 38b5bea9b2ce6c9ef92956cf22135d241978be4f (patch) | |
| tree | 6c466fdd7605c0ac04c7ca5d178686de4abe6add /media | |
| parent | 00c08b4566cb136b70d61da95040406c87ac2c5d (diff) | |
| download | chromium_src-38b5bea9b2ce6c9ef92956cf22135d241978be4f.zip chromium_src-38b5bea9b2ce6c9ef92956cf22135d241978be4f.tar.gz chromium_src-38b5bea9b2ce6c9ef92956cf22135d241978be4f.tar.bz2 | |
VideoCaptureDeviceWin: correct some typos and docs.
BUG=
Review URL: https://codereview.chromium.org/512713002
Cr-Commit-Position: refs/heads/master@{#292144}
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/capture/win/video_capture_device_win.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/media/video/capture/win/video_capture_device_win.cc b/media/video/capture/win/video_capture_device_win.cc index a7d1f10..49748d8 100644 --- a/media/video/capture/win/video_capture_device_win.cc +++ b/media/video/capture/win/video_capture_device_win.cc @@ -53,7 +53,8 @@ HRESULT VideoCaptureDeviceWin::GetDeviceFilter( continue; } - // Find the description or friendly name. + // Find the device via DevicePath, Description or FriendlyName, whichever is + // available first. static const wchar_t* kPropertyNames[] = { L"DevicePath", L"Description", L"FriendlyName" }; @@ -101,20 +102,20 @@ bool VideoCaptureDeviceWin::PinMatchesCategory(IPin* pin, REFGUID category) { return found; } -// Finds a IPin on a IBaseFilter given the direction an category. +// Finds an IPin on an IBaseFilter given the direction and category. // static ScopedComPtr<IPin> VideoCaptureDeviceWin::GetPin(IBaseFilter* filter, PIN_DIRECTION pin_dir, REFGUID category) { ScopedComPtr<IPin> pin; - ScopedComPtr<IEnumPins> pin_emum; - HRESULT hr = filter->EnumPins(pin_emum.Receive()); - if (pin_emum == NULL) + ScopedComPtr<IEnumPins> pin_enum; + HRESULT hr = filter->EnumPins(pin_enum.Receive()); + if (pin_enum == NULL) return pin; // Get first unconnected pin. - hr = pin_emum->Reset(); // set to first pin - while ((hr = pin_emum->Next(1, pin.Receive(), NULL)) == S_OK) { + hr = pin_enum->Reset(); // set to first pin + while ((hr = pin_enum->Next(1, pin.Receive(), NULL)) == S_OK) { PIN_DIRECTION this_pin_dir = static_cast<PIN_DIRECTION>(-1); hr = pin->QueryDirection(&this_pin_dir); if (pin_dir == this_pin_dir) { |