diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-15 03:35:49 +0000 |
commit | d8bbc7858622b6d9c278469aab701ca0b609cddf (patch) | |
tree | eff41dc61d9f714852212739e6b3738b82a2af87 /third_party/libwebrtc/moz-patch-stack/0068.patch | |
parent | Releasing progress-linux version 125.0.3-1~progress7.99u1. (diff) | |
download | firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip |
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | third_party/libwebrtc/moz-patch-stack/0068.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/third_party/libwebrtc/moz-patch-stack/0068.patch b/third_party/libwebrtc/moz-patch-stack/0068.patch index ab46127e4f..38bae4d1e8 100644 --- a/third_party/libwebrtc/moz-patch-stack/0068.patch +++ b/third_party/libwebrtc/moz-patch-stack/0068.patch @@ -215,7 +215,7 @@ index 8e4941f961..7bcfc7c057 100644 int current_delay_ms, int target_delay_ms, diff --git a/video/rtp_video_stream_receiver2.cc b/video/rtp_video_stream_receiver2.cc -index 47c31812f3..0954327f1c 100644 +index 029e7a7405..26bd60057d 100644 --- a/video/rtp_video_stream_receiver2.cc +++ b/video/rtp_video_stream_receiver2.cc @@ -244,6 +244,7 @@ RtpVideoStreamReceiver2::RtpVideoStreamReceiver2( @@ -234,7 +234,7 @@ index 47c31812f3..0954327f1c 100644 packet_buffer_(kPacketBufferStartSize, PacketBufferMaxSize(field_trials_)), reference_finder_(std::make_unique<RtpFrameReferenceFinder>()), -@@ -1219,7 +1221,8 @@ void RtpVideoStreamReceiver2::FrameDecoded(int64_t picture_id) { +@@ -1250,7 +1252,8 @@ void RtpVideoStreamReceiver2::FrameDecoded(int64_t picture_id) { int64_t unwrapped_rtp_seq_num = rtp_seq_num_unwrapper_.Unwrap(seq_num); packet_infos_.erase(packet_infos_.begin(), packet_infos_.upper_bound(unwrapped_rtp_seq_num)); @@ -245,7 +245,7 @@ index 47c31812f3..0954327f1c 100644 } } diff --git a/video/rtp_video_stream_receiver2.h b/video/rtp_video_stream_receiver2.h -index 0e96d7f2cd..10329005ba 100644 +index 00b17a77bd..b942cb97a6 100644 --- a/video/rtp_video_stream_receiver2.h +++ b/video/rtp_video_stream_receiver2.h @@ -49,6 +49,7 @@ @@ -264,7 +264,7 @@ index 0e96d7f2cd..10329005ba 100644 // The KeyFrameRequestSender is optional; if not provided, key frame // requests are sent via the internal RtpRtcp module. OnCompleteFrameCallback* complete_frame_callback, -@@ -362,6 +364,7 @@ class RtpVideoStreamReceiver2 : public LossNotificationSender, +@@ -365,6 +367,7 @@ class RtpVideoStreamReceiver2 : public LossNotificationSender, std::unique_ptr<LossNotificationController> loss_notification_controller_ RTC_GUARDED_BY(packet_sequence_checker_); @@ -273,10 +273,10 @@ index 0e96d7f2cd..10329005ba 100644 RTC_GUARDED_BY(packet_sequence_checker_); UniqueTimestampCounter frame_counter_ diff --git a/video/video_receive_stream2.cc b/video/video_receive_stream2.cc -index c04b43a1d1..33e2f39ced 100644 +index f135f42f3b..8675ab9979 100644 --- a/video/video_receive_stream2.cc +++ b/video/video_receive_stream2.cc -@@ -210,6 +210,7 @@ VideoReceiveStream2::VideoReceiveStream2( +@@ -209,6 +209,7 @@ VideoReceiveStream2::VideoReceiveStream2( &stats_proxy_, &stats_proxy_, nack_periodic_processor, |