Commit 590899c0 authored by Michael Froman's avatar Michael Froman
Browse files

Bug 1828517 - Vendor libwebrtc from 9337ac8650 

Upstream commit: https://webrtc.googlesource.com/src/+/9337ac8650f95e4ac7a66c4ac5ade84e05276bf6
    [Unwrap] Migrate RtcEventLog parser to use RtpSequenceNumberUnwrapper

    Bug: webrtc:13982
    Change-Id: I974aafd810ee3b266689a76fc3ed3b7a62440df5
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/288963


    Reviewed-by: default avatarBjörn Terelius <terelius@webrtc.org>
    Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
    Commit-Queue: Björn Terelius <terelius@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#39080}
parent 58328435

third_party/libwebrtc/README.moz-ff-commit

+3 −0
Original line number Diff line number Diff line
@@ -20856,3 +20856,6 @@ b40657773f 
# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

# base of lastest vendoring

d22dc86211

# MOZ_LIBWEBRTC_SRC=/home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc MOZ_LIBWEBRTC_BRANCH=mozpatches bash dom/media/webrtc/third_party_build/fast-forward-libwebrtc.sh

# base of lastest vendoring

9337ac8650

third_party/libwebrtc/README.mozilla

+2 −0
Original line number Diff line number Diff line
@@ -13926,3 +13926,5 @@ libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-l 
libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T03:43:55.845035.

# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc

libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T03:44:52.392574.

# ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc

libwebrtc updated from /home/mfroman/mozilla/moz-central/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2023-04-21T03:45:46.779652.

third_party/libwebrtc/logging/rtc_event_log/rtc_event_log_parser.cc

+2 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "logging/rtc_event_log/events/logged_rtp_rtcp.h"

#include "logging/rtc_event_log/rtc_event_processor.h"

#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"

#include "modules/include/module_common_types_public.h"

#include "modules/rtp_rtcp/include/rtp_cvo.h"

#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"

#include "modules/rtp_rtcp/source/byte_io.h"
@@ -2289,7 +2288,7 @@ std::vector<LoggedPacketInfo> ParsedRtcEventLog::GetPacketInfos( 
  std::map<int64_t, size_t> indices;

  uint16_t current_overhead = kDefaultOverhead;

  Timestamp last_log_time = Timestamp::Zero();

  SequenceNumberUnwrapper seq_num_unwrapper;

  RtpSequenceNumberUnwrapper seq_num_unwrapper;



  auto advance_time = [&](Timestamp new_log_time) {

    if (overhead_iter != overheads.end() &&
@@ -2301,7 +2300,7 @@ std::vector<LoggedPacketInfo> ParsedRtcEventLog::GetPacketInfos( 
    // therefore we don't want to match up sequence numbers as we might have had

    // a wraparound.

    if (new_log_time - last_log_time > TimeDelta::Seconds(30)) {

      seq_num_unwrapper = SequenceNumberUnwrapper();

      seq_num_unwrapper.Reset();

      indices.clear();

    }

    RTC_DCHECK_GE(new_log_time, last_log_time);