Index: content/renderer/media/media_stream_constraints_util_video_source.cc |
diff --git a/content/renderer/media/media_stream_constraints_util_video_source.cc b/content/renderer/media/media_stream_constraints_util_video_source.cc |
index 48a105cd7c6581158eab322507a7d7fecfb883f4..f5239607aa8c2bf869af36dbecb9f19223c25d85 100644 |
--- a/content/renderer/media/media_stream_constraints_util_video_source.cc |
+++ b/content/renderer/media/media_stream_constraints_util_video_source.cc |
@@ -11,6 +11,7 @@ |
#include <vector> |
#include "content/renderer/media/media_stream_video_source.h" |
+#include "content/renderer/media/media_stream_video_track.h" |
#include "third_party/WebKit/public/platform/WebMediaConstraints.h" |
#include "third_party/WebKit/public/platform/WebString.h" |
@@ -307,7 +308,10 @@ double FormatSourceDistance( |
constraint_set.aspectRatio, failed_constraint_name) + |
FrameRateConstraintSourceDistance(format.frame_rate, |
constraint_set.frameRate, |
- failed_constraint_name); |
+ failed_constraint_name) + |
+ StringConstraintSourceDistance(GetVideoKindForFormat(format), |
+ constraint_set.videoKind, |
+ failed_constraint_name); |
} |
// Returns a custom distance between a set of candidate settings and a |
@@ -477,6 +481,8 @@ double CandidateFitnessDistance( |
constraint_set.facingMode); |
fitness += FrameRateConstraintFitnessDistance(candidate.GetFrameRate(), |
constraint_set.frameRate); |
+ fitness += StringConstraintFitnessDistance(candidate.GetVideoKind(), |
+ constraint_set.videoKind); |
fitness += PowerLineFrequencyConstraintFitnessDistance( |
candidate.GetPowerLineFrequency(), constraint_set.googPowerLineFrequency); |
fitness += ResolutionConstraintFitnessDistance(candidate.GetHeight(), |
@@ -609,6 +615,10 @@ blink::WebString VideoCaptureSourceSettings::GetDeviceId() const { |
return blink::WebString::fromASCII(device_id_.data()); |
} |
+blink::WebString VideoCaptureSourceSettings::GetVideoKind() const { |
+ return GetVideoKindForFormat(format_); |
+} |
+ |
const char kDefaultFailedConstraintName[] = ""; |
VideoCaptureSourceSelectionResult::VideoCaptureSourceSelectionResult() |