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

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

Issue 558503003: Windows video capture: Remove duplicated code from GetDeviceSupportedFormats* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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/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 9b4531b82820107c2908b61dd6fe0ddfdf366d4d..983896498ee60122eeaeae72f2b58b4eee4a79f3 100644
--- a/media/video/capture/win/capability_list_win.cc
+++ b/media/video/capture/win/capability_list_win.cc
@@ -71,9 +71,7 @@ const VideoCaptureCapabilityWin& CapabilityList::GetBestMatchedFormat(
it->supported_format.frame_size.height() - requested_height;
// The 1000 allows using integer arithmetic for f.i. 29.971 fps.
diff.diff_frame_rate =
- 1000 * ((static_cast<float>(it->frame_rate_numerator) /
- it->frame_rate_denominator) -
- requested_frame_rate);
+ 1000 * (it->supported_format.frame_rate - requested_frame_rate);
diff_list.push_back(diff);
}
@@ -117,4 +115,12 @@ const VideoCaptureCapabilityWin& CapabilityList::GetBestMatchedFormat(
return *diff_list.front().capability;
}
+void CapabilityList::CapabilitiesToVideoCaptureFormats(
+ VideoCaptureFormats* formats) const {
+ for (Capabilities::const_iterator it = capabilities_.begin();
+ it != capabilities_.end(); ++it) {
+ formats->push_back(it->supported_format);
+ }
+}
+
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698