diff options
Diffstat (limited to 'dom/media/webrtc/MediaTrackConstraints.cpp')
-rw-r--r-- | dom/media/webrtc/MediaTrackConstraints.cpp | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/dom/media/webrtc/MediaTrackConstraints.cpp b/dom/media/webrtc/MediaTrackConstraints.cpp index 42582e3c29..08bb513955 100644 --- a/dom/media/webrtc/MediaTrackConstraints.cpp +++ b/dom/media/webrtc/MediaTrackConstraints.cpp @@ -34,49 +34,6 @@ NormalizedConstraintSet::Range<ValueType>::SetFrom(const ConstrainRange& aOther) } } -// The Range code works surprisingly well for bool, except when averaging ideals. -template<> -bool -NormalizedConstraintSet::Range<bool>::Merge(const Range& aOther) { - if (!Intersects(aOther)) { - return false; - } - Intersect(aOther); - - // To avoid "unsafe use of type 'bool'", we keep counter in mMergeDenominator - uint32_t counter = mMergeDenominator >> 16; - uint32_t denominator = mMergeDenominator & 0xffff; - - if (aOther.mIdeal.isSome()) { - if (mIdeal.isNothing()) { - mIdeal.emplace(aOther.Get(false)); - counter = aOther.Get(false); - denominator = 1; - } else { - if (!denominator) { - counter = Get(false); - denominator = 1; - } - counter += aOther.Get(false); - denominator++; - } - } - mMergeDenominator = ((counter & 0xffff) << 16) + (denominator & 0xffff); - return true; -} - -template<> -void -NormalizedConstraintSet::Range<bool>::FinalizeMerge() -{ - if (mMergeDenominator) { - uint32_t counter = mMergeDenominator >> 16; - uint32_t denominator = mMergeDenominator & 0xffff; - - *mIdeal = !!(counter / denominator); - mMergeDenominator = 0; - } -} NormalizedConstraintSet::LongRange::LongRange( LongPtrType aMemberPtr, |