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

Unified Diff: content/renderer/media/media_stream_video_source.cc

Issue 973373002: fix for builds with webrtc disabled (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: convert int constants to enum values 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 | « content/renderer/media/media_stream_video_source.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_video_source.cc
diff --git a/content/renderer/media/media_stream_video_source.cc b/content/renderer/media/media_stream_video_source.cc
index e23794511ee5e07236fce83c5fd6b24f3b1fda5a..987de9d81912321222c01327a2525a1c03743d47 100644
--- a/content/renderer/media/media_stream_video_source.cc
+++ b/content/renderer/media/media_stream_video_source.cc
@@ -39,11 +39,6 @@ const char* kSupportedConstraints[] = {
MediaStreamVideoSource::kMinFrameRate,
};
-const int MediaStreamVideoSource::kDefaultWidth = 640;
-const int MediaStreamVideoSource::kDefaultHeight = 480;
-const int MediaStreamVideoSource::kDefaultFrameRate = 30;
-const int MediaStreamVideoSource::kUnknownFrameRate = 0;
-
namespace {
// Google-specific key prefix. Constraints with this prefix are ignored if they
@@ -334,8 +329,10 @@ void GetBestCaptureFormat(
*capture_format = GetBestFormatBasedOnArea(
formats,
- std::min(max_width, MediaStreamVideoSource::kDefaultWidth) *
- std::min(max_height, MediaStreamVideoSource::kDefaultHeight));
+ std::min(max_width,
+ static_cast<int>(MediaStreamVideoSource::kDefaultWidth)) *
+ std::min(max_height,
+ static_cast<int>(MediaStreamVideoSource::kDefaultHeight)));
}
} // anonymous namespace
« no previous file with comments | « content/renderer/media/media_stream_video_source.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698