media/video/capture/win/video_capture_device_mf_win.cc - Issue 12185022: Fix how we handle an empty capabilities list when enumerating video streams.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12185022: Fix how we handle an empty capabilities list when enumerating video streams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 10 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 96bfdb284c566fdb5c427140903bbf64a5935a8f..e984bb11488f5f6f83f4955b1429e04e94cf5903 100644

--- a/media/video/capture/win/video_capture_device_mf_win.cc

+++ b/media/video/capture/win/video_capture_device_mf_win.cc

@@ -138,7 +138,7 @@ HRESULT FillCapabilities(IMFSourceReader* source,

type.Release();

}

- if (SUCCEEDED(hr) && capabilities->empty())

+ if (capabilities->empty() && (SUCCEEDED(hr) || hr == MF_E_NO_MORE_TYPES))

hr = HRESULT_FROM_WIN32(ERROR_EMPTY);

return (hr == MF_E_NO_MORE_TYPES) ? S_OK : hr;

« no previous file with comments | « no previous file | no next file » | no next file with comments »