Attachment 348289 Details for Bug 189046 – Patch

[patch] Patch

bug-189046-20180828055152.patch (text/plain), 3.26 KB, created by Eric Carlson on 2018-08-28 05:51:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2018-08-28 05:51:52 PDT

Size: 3.26 KB

patch

obsolete

>Subversion Revision: 235421
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index aa16036e28323e8cada1c6e2c851d3d1ef69788b..cb43c3f906324c52999625d12227807b782a148e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2018-08-28  Eric Carlson  <eric.carlson@apple.com>
>+
>+        Revert changes to RealtimeMediaSource.cpp made in r235086
>+        https://bugs.webkit.org/show_bug.cgi?id=189046
>+        <rdar://problem/43794875>
>+
>+        Unreviewed, reverting an accidental change.
>+
>+        * platform/mediastream/RealtimeMediaSource.cpp:
>+        (WebCore::RealtimeMediaSource::supportsSizeAndFrameRate): 
>+
> 2018-08-28  Alejandro G. Castro  <alex@igalia.com>
> 
>         Fix gcc compilation warnings after r235230
>diff --git a/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp b/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp
>index bfe4d6de1c8340682a1f7ee29e8c94585fe0bce8..cadaf75e2a946b1556ceddf2ee17e3436eea1164 100644
>--- a/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp
>+++ b/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp
>@@ -246,8 +246,10 @@ bool RealtimeMediaSource::supportsSizeAndFrameRate(std::optional<IntConstraint>
>         }
> 
>         distance = std::min(distance, constraintDistance);
>-        auto range = capabilities.width();
>-        width = widthConstraint->valueForCapabilityRange(size().width(), range.rangeMin().asInt, range.rangeMax().asInt);
>+        if (widthConstraint->isMandatory()) {
>+            auto range = capabilities.width();
>+            width = widthConstraint->valueForCapabilityRange(size().width(), range.rangeMin().asInt, range.rangeMax().asInt);
>+        }
>     }
> 
>     std::optional<int> height;
>@@ -259,8 +261,10 @@ bool RealtimeMediaSource::supportsSizeAndFrameRate(std::optional<IntConstraint>
>         }
> 
>         distance = std::min(distance, constraintDistance);
>-        auto range = capabilities.height();
>-        height = heightConstraint->valueForCapabilityRange(size().height(), range.rangeMin().asInt, range.rangeMax().asInt);
>+        if (heightConstraint->isMandatory()) {
>+            auto range = capabilities.height();
>+            height = heightConstraint->valueForCapabilityRange(size().height(), range.rangeMin().asInt, range.rangeMax().asInt);
>+        }
>     }
> 
>     std::optional<double> frameRate;
>@@ -272,8 +276,10 @@ bool RealtimeMediaSource::supportsSizeAndFrameRate(std::optional<IntConstraint>
>         }
> 
>         distance = std::min(distance, constraintDistance);
>-        auto range = capabilities.frameRate();
>-        frameRate = frameRateConstraint->valueForCapabilityRange(this->frameRate(), range.rangeMin().asDouble, range.rangeMax().asDouble);
>+        if (frameRateConstraint->isMandatory()) {
>+            auto range = capabilities.frameRate();
>+            frameRate = frameRateConstraint->valueForCapabilityRange(this->frameRate(), range.rangeMin().asDouble, range.rangeMax().asDouble);
>+        }
>     }
> 
>     // Each of the non-null values is supported individually, see if they all can be applied at the same time.
>@@ -286,7 +292,7 @@ bool RealtimeMediaSource::supportsSizeAndFrameRate(std::optional<IntConstraint>
>             badConstraint = frameRateConstraint->name();
>         return false;
>     }
>-    
>+
>     return true;
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 189046: 348288 | 348289