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

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

Issue 913183006: Use BITMAPINFOHEADER from capture capability enumeration when using MJPG (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed a nit. Created 5 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
« no previous file with comments | « media/video/capture/win/capability_list_win.h ('k') | media/video/capture/win/sink_filter_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/video/capture/win/capability_list_win.cc
diff --git a/media/video/capture/win/capability_list_win.cc b/media/video/capture/win/capability_list_win.cc
index cefda435379923d706c75a09cd6a8710fb85a2f8..2de2786e752f5880a62fee45c90e41c6473e2f87 100644
--- a/media/video/capture/win/capability_list_win.cc
+++ b/media/video/capture/win/capability_list_win.cc
@@ -39,15 +39,16 @@ static bool CompareCapability(const VideoCaptureFormat& requested,
return lhs.pixel_format < rhs.pixel_format;
}
-CapabilityWin GetBestMatchedCapability(const VideoCaptureFormat& requested,
- const CapabilityList& capabilities) {
+const CapabilityWin& GetBestMatchedCapability(
+ const VideoCaptureFormat& requested,
+ const CapabilityList& capabilities) {
DCHECK(!capabilities.empty());
- CapabilityWin best_match = capabilities.front();
+ const CapabilityWin* best_match = &(*capabilities.begin());
for (const CapabilityWin& capability : capabilities) {
- if (CompareCapability(requested, capability, best_match))
- best_match = capability;
+ if (CompareCapability(requested, capability, *best_match))
+ best_match = &capability;
}
- return best_match;
+ return *best_match;
}
} // namespace media
« no previous file with comments | « media/video/capture/win/capability_list_win.h ('k') | media/video/capture/win/sink_filter_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698