diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:19:40 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-12-10 16:01:50 +0000 |
commit | 51f6c2793adab2d864b3d2b360000ef8db1d3e92 (patch) | |
tree | 835b3b4446b012c75e80177cef9fbe6972cc7dbe /chromium/third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc | |
parent | 6036726eb981b6c4b42047513b9d3f4ac865daac (diff) | |
download | qtwebengine-chromium-51f6c2793adab2d864b3d2b360000ef8db1d3e92.tar.gz |
BASELINE: Update Chromium to 71.0.3578.93
Change-Id: I6a32086c33670e1b033f8b10e6bf1fd4da1d105d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/chromium/third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc b/chromium/third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc index 068058a8acb..e34bb663e14 100644 --- a/chromium/third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc +++ b/chromium/third_party/blink/renderer/modules/mediastream/media_constraints_impl.cc @@ -64,12 +64,7 @@ struct NameValueStringConstraint { }; // Legal constraint names. -// Temporary Note: Comments about source are where they are copied from. -// Once the chrome parts use the new-style constraint values, they will -// be deleted from the files mentioned. -// TODO(hta): remove comments before https://crbug.com/543997 is closed. -// From content/renderer/media/stream/media_stream_video_source.cc const char kMinAspectRatio[] = "minAspectRatio"; const char kMaxAspectRatio[] = "maxAspectRatio"; const char kMaxWidth[] = "maxWidth"; @@ -78,17 +73,15 @@ const char kMaxHeight[] = "maxHeight"; const char kMinHeight[] = "minHeight"; const char kMaxFrameRate[] = "maxFrameRate"; const char kMinFrameRate[] = "minFrameRate"; -// From content/common/media/media_stream_options.cc const char kMediaStreamSource[] = "chromeMediaSource"; const char kMediaStreamSourceId[] = "chromeMediaSourceId"; // mapped to deviceId const char kMediaStreamSourceInfoId[] = "sourceId"; // mapped to deviceId const char kMediaStreamRenderToAssociatedSink[] = "chromeRenderToAssociatedSink"; -// RenderToAssociatedSink will be going away in M50-M60 some time. +// RenderToAssociatedSink will be going away some time. const char kMediaStreamAudioHotword[] = "googHotword"; // TODO(hta): googHotword should go away. https://crbug.com/577627 -// From content/renderer/media/stream/media_stream_audio_processor_options.cc const char kEchoCancellation[] = "echoCancellation"; const char kDisableLocalEcho[] = "disableLocalEcho"; const char kGoogEchoCancellation[] = "googEchoCancellation"; @@ -102,13 +95,8 @@ const char kGoogArrayGeometry[] = "googArrayGeometry"; const char kGoogHighpassFilter[] = "googHighpassFilter"; const char kGoogTypingNoiseDetection[] = "googTypingNoiseDetection"; const char kGoogAudioMirroring[] = "googAudioMirroring"; - -// From -// third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.cc - // Audio constraints. const char kDAEchoCancellation[] = "googDAEchoCancellation"; - // Google-specific constraint keys for a local video source (getUserMedia). const char kNoiseReduction[] = "googNoiseReduction"; @@ -139,11 +127,8 @@ const char kCpuOveruseEncodeRsdThreshold[] = "googCpuOveruseEncodeRsdThreshold"; const char kCpuOveruseEncodeUsage[] = "googCpuOveruseEncodeUsage"; const char kHighStartBitrate[] = "googHighStartBitrate"; const char kPayloadPadding[] = "googPayloadPadding"; -// From webrtc_audio_capturer const char kAudioLatency[] = "latencyMs"; -// From media_stream_video_capturer_source -// End of names from libjingle // Names that have been used in the past, but should now be ignored. // Kept around for backwards compatibility. // https://crbug.com/579729 @@ -428,12 +413,10 @@ static void ParseOldStyleNames( result.goog_payload_padding.SetExact(ToBoolean(constraint.value_)); } else if (constraint.name_.Equals(kAudioLatency)) { result.goog_latency_ms.SetExact(atoi(constraint.value_.Utf8().c_str())); - } else if (constraint.name_.Equals(kPowerLineFrequency)) { - result.goog_power_line_frequency.SetExact( - atoi(constraint.value_.Utf8().c_str())); } else if (constraint.name_.Equals(kGoogLeakyBucket) || constraint.name_.Equals(kGoogBeamforming) || - constraint.name_.Equals(kGoogArrayGeometry)) { + constraint.name_.Equals(kGoogArrayGeometry) || + constraint.name_.Equals(kPowerLineFrequency)) { // TODO(crbug.com/856176): Remove the kGoogBeamforming and // kGoogArrayGeometry special cases. context->AddConsoleMessage(ConsoleMessage::Create( @@ -793,7 +776,7 @@ bool UseNakedNumeric(T input, NakedValueDisposition which) { } NOTREACHED(); return false; -}; +} template <class T> bool UseNakedNonNumeric(T input, NakedValueDisposition which) { @@ -807,7 +790,7 @@ bool UseNakedNonNumeric(T input, NakedValueDisposition which) { } NOTREACHED(); return false; -}; +} template <typename U, class T> U GetNakedValue(T input, NakedValueDisposition which) { @@ -821,7 +804,7 @@ U GetNakedValue(T input, NakedValueDisposition which) { } NOTREACHED(); return input.Exact(); -}; +} LongOrConstrainLongRange ConvertLong(const LongConstraint& input, NakedValueDisposition naked_treatment) { |