1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent f809af927a59e945c76f51c25b1044fb42748c24 |
2 # Parent e7eb7e9e99204275532b04de030879c9548b88a3 |
3 |
3 |
4 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
4 diff --git a/gfx/skia/skia/include/codec/SkEncodedOrigin.h b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
5 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
5 --- a/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
6 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
6 +++ b/gfx/skia/skia/include/codec/SkEncodedOrigin.h |
7 @@ -36,16 +36,17 @@ static inline SkMatrix SkEncodedOriginTo |
7 @@ -36,16 +36,17 @@ static inline SkMatrix SkEncodedOriginTo |
385 bool directional = fOccluderType == OccluderType::kDirectional || |
385 bool directional = fOccluderType == OccluderType::kDirectional || |
386 fOccluderType == OccluderType::kDirectionalTransparent; |
386 fOccluderType == OccluderType::kDirectionalTransparent; |
387 diff --git a/intl/icu/source/i18n/number_rounding.cpp b/intl/icu/source/i18n/number_rounding.cpp |
387 diff --git a/intl/icu/source/i18n/number_rounding.cpp b/intl/icu/source/i18n/number_rounding.cpp |
388 --- a/intl/icu/source/i18n/number_rounding.cpp |
388 --- a/intl/icu/source/i18n/number_rounding.cpp |
389 +++ b/intl/icu/source/i18n/number_rounding.cpp |
389 +++ b/intl/icu/source/i18n/number_rounding.cpp |
390 @@ -278,27 +278,29 @@ Precision IncrementPrecision::withMinFra |
390 @@ -282,27 +282,29 @@ Precision IncrementPrecision::withMinFra |
391 } |
391 } |
392 |
392 |
393 FractionPrecision Precision::constructFraction(int32_t minFrac, int32_t maxFrac) { |
393 FractionPrecision Precision::constructFraction(int32_t minFrac, int32_t maxFrac) { |
394 FractionSignificantSettings settings; |
394 FractionSignificantSettings settings; |
395 settings.fMinFrac = static_cast<digits_t>(minFrac); |
395 settings.fMinFrac = static_cast<digits_t>(minFrac); |
679 |
679 |
680 VideoSendStream::StreamStats::StreamStats() = default; |
680 VideoSendStream::StreamStats::StreamStats() = default; |
681 VideoSendStream::StreamStats::~StreamStats() = default; |
681 VideoSendStream::StreamStats::~StreamStats() = default; |
682 |
682 |
683 std::string VideoSendStream::StreamStats::ToString() const { |
683 std::string VideoSendStream::StreamStats::ToString() const { |
|
684 diff --git a/third_party/libwebrtc/media/base/codec.cc b/third_party/libwebrtc/media/base/codec.cc |
|
685 --- a/third_party/libwebrtc/media/base/codec.cc |
|
686 +++ b/third_party/libwebrtc/media/base/codec.cc |
|
687 @@ -195,16 +195,17 @@ bool Codec::Matches(const Codec& codec, |
|
688 (codec.bitrate == 0 || bitrate <= 0 || |
|
689 bitrate == codec.bitrate) && |
|
690 ((codec.channels < 2 && channels < 2) || |
|
691 channels == codec.channels); |
|
692 |
|
693 case Type::kVideo: |
|
694 return IsSameCodecSpecific(name, params, codec.name, codec.params); |
|
695 } |
|
696 + return false; // unreached |
|
697 }; |
|
698 |
|
699 return matches_id && matches_type_specific(); |
|
700 } |
|
701 |
|
702 bool Codec::MatchesCapability( |
|
703 const webrtc::RtpCodecCapability& codec_capability) const { |
|
704 webrtc::RtpCodecParameters codec_parameters = ToCodecParameters(); |
684 diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc b/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc |
705 diff --git a/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc b/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc |
685 --- a/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc |
706 --- a/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc |
686 +++ b/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc |
707 +++ b/third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor.cc |
687 @@ -373,12 +373,12 @@ std::unique_ptr<ClippingPredictor> Creat |
708 @@ -373,12 +373,12 @@ std::unique_ptr<ClippingPredictor> Creat |
688 config.reference_window_delay, config.clipping_threshold, |
709 config.reference_window_delay, config.clipping_threshold, |
913 |
934 |
914 } // namespace webrtc |
935 } // namespace webrtc |
915 diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
936 diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
916 --- a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
937 --- a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
917 +++ b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
938 +++ b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender.cc |
918 @@ -135,16 +135,17 @@ bool IsNonVolatile(RTPExtensionType type |
939 @@ -133,16 +133,17 @@ bool IsNonVolatile(RTPExtensionType type |
919 #if defined(WEBRTC_MOZILLA_BUILD) |
940 #if defined(WEBRTC_MOZILLA_BUILD) |
920 case kRtpExtensionCsrcAudioLevel: |
941 case kRtpExtensionCsrcAudioLevel: |
921 // TODO: Mozilla implement for CsrcAudioLevel |
942 // TODO: Mozilla implement for CsrcAudioLevel |
922 RTC_CHECK(false); |
943 RTC_CHECK(false); |
923 return false; |
944 return false; |