1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent d1908d68e16e148fcc012caac881a03417eccc7e |
2 # Parent 831d03cde86aa6b8803d5ac431e2d28bf85c9289 |
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 |
873 |
873 |
874 TransientSuppressorImpl::TransientSuppressorImpl(VadMode vad_mode, |
874 TransientSuppressorImpl::TransientSuppressorImpl(VadMode vad_mode, |
875 int sample_rate_hz, |
875 int sample_rate_hz, |
876 int detector_rate_hz, |
876 int detector_rate_hz, |
877 int num_channels) |
877 int num_channels) |
|
878 diff --git a/third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.cc b/third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.cc |
|
879 --- a/third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.cc |
|
880 +++ b/third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_network_control.cc |
|
881 @@ -90,16 +90,18 @@ BandwidthLimitedCause GetBandwidthLimite |
|
882 // Probes may not be sent in this state. |
|
883 return BandwidthLimitedCause::kLossLimitedBwe; |
|
884 case LossBasedState::kIncreasing: |
|
885 // Probes may be sent in this state. |
|
886 return BandwidthLimitedCause::kLossLimitedBweIncreasing; |
|
887 case LossBasedState::kDelayBasedEstimate: |
|
888 return BandwidthLimitedCause::kDelayBasedLimited; |
|
889 } |
|
890 + // just return something by default |
|
891 + return BandwidthLimitedCause::kLossLimitedBwe; |
|
892 } |
|
893 |
|
894 } // namespace |
|
895 |
|
896 GoogCcNetworkController::GoogCcNetworkController(NetworkControllerConfig config, |
|
897 GoogCcConfig goog_cc_config) |
|
898 : key_value_config_(config.key_value_config ? config.key_value_config |
|
899 : &trial_based_config_), |
878 diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc |
900 diff --git a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc |
879 --- a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc |
901 --- a/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc |
880 +++ b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc |
902 +++ b/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc |
881 @@ -39,16 +39,17 @@ ScreenCastPortal::CaptureSourceType Scre |
903 @@ -39,16 +39,17 @@ ScreenCastPortal::CaptureSourceType Scre |
882 switch (type) { |
904 switch (type) { |
955 extensions_map.IsRegistered(kRtpExtensionTransmissionTimeOffset); |
977 extensions_map.IsRegistered(kRtpExtensionTransmissionTimeOffset); |
956 } |
978 } |
957 diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
979 diff --git a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
958 --- a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
980 --- a/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
959 +++ b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
981 +++ b/third_party/libwebrtc/modules/rtp_rtcp/source/rtp_sender_audio.cc |
960 @@ -41,16 +41,17 @@ namespace { |
982 @@ -42,16 +42,17 @@ namespace { |
961 case AudioFrameType::kEmptyFrame: |
983 case AudioFrameType::kEmptyFrame: |
962 return "empty"; |
984 return "empty"; |
963 case AudioFrameType::kAudioFrameSpeech: |
985 case AudioFrameType::kAudioFrameSpeech: |
964 return "audio_speech"; |
986 return "audio_speech"; |
965 case AudioFrameType::kAudioFrameCN: |
987 case AudioFrameType::kAudioFrameCN: |
1018 last_tl0_sequence_number_(0) {} |
1040 last_tl0_sequence_number_(0) {} |
1019 |
1041 |
1020 diff --git a/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc b/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
1042 diff --git a/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc b/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
1021 --- a/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
1043 --- a/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
1022 +++ b/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
1044 +++ b/third_party/libwebrtc/video/adaptation/video_stream_encoder_resource_manager.cc |
1023 @@ -58,16 +58,17 @@ bool IsFramerateScalingEnabled(Degradati |
1045 @@ -59,16 +59,17 @@ bool IsFramerateScalingEnabled(Degradati |
1024 std::string ToString(VideoAdaptationReason reason) { |
1046 std::string ToString(VideoAdaptationReason reason) { |
1025 switch (reason) { |
1047 switch (reason) { |
1026 case VideoAdaptationReason::kQuality: |
1048 case VideoAdaptationReason::kQuality: |
1027 return "quality"; |
1049 return "quality"; |
1028 case VideoAdaptationReason::kCpu: |
1050 case VideoAdaptationReason::kCpu: |