zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "SeqNumUnwrapper::Unwrap now returns int64_t instead of uint64_t."

Browse Source 
This reverts commit b0f968a761b715da4cf81e4b9c3cab0ccd322cf2.

Reason for revert: Need to update DecodedFramesHistory to manage negative picture IDs.

Original change's description:
> SeqNumUnwrapper::Unwrap now returns int64_t instead of uint64_t.
> 
> Bug: webrtc:10263
> Change-Id: Idaeae6be01bd4eba0691226c958d70e114161ffd
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127295
> Commit-Queue: Philip Eliasson <philipel@webrtc.org>
> Reviewed-by: Johannes Kron <kron@webrtc.org>
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27129}

TBR=kwiberg@webrtc.org,eladalon@webrtc.org,terelius@webrtc.org,philipel@webrtc.org,kron@webrtc.org

Change-Id: I529bb0475bd21a80fa244278aff1fd912a85c169
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10263
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127885
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27135}
This commit is contained in:
Philip Eliasson
2019-03-14 18:14:14 +00:00
committed by Commit Bot
parent 38e6c66f4a
commit b5207b488b
9 changed files with 448 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
logging/rtc_event_log/rtc_event_log_parser.cc
View File

@ -57,10 +57,18 @@ constexpr size_t kStunOverhead = 4;
constexpr uint16_t kDefaultOverhead =
kUdpOverhead + kSrtpOverhead + kIpv4Overhead;
// Starting at a multiple of common audio sample rate (48000) and video tick
// rate (90000) to make a tick count of 0 to correspond to something without
// decimals in base 10. Starting at 0 is not safe as it would cause negative
// wraparound if the first timestamps are out of order.
constexpr uint64_t kStartingCaptureTimeTicks = 90 * 48 * 1000;
struct MediaStreamInfo {
MediaStreamInfo() = default;
MediaStreamInfo() : unwrap_capture_ticks(kStartingCaptureTimeTicks) {}
MediaStreamInfo(LoggedMediaType media_type, bool rtx)
: media_type(media_type), rtx(rtx) {}
: media_type(media_type),
rtx(rtx),
unwrap_capture_ticks(kStartingCaptureTimeTicks) {}
LoggedMediaType media_type = LoggedMediaType::kUnknown;
bool rtx = false;
SeqNumUnwrapper<uint32_t> unwrap_capture_ticks;
@ -1945,12 +1953,7 @@ std::vector<LoggedPacketInfo> ParsedRtcEventLog::GetPacketInfos(
// RTX copy the timestamp of the retransmitted packets. This means that
// RTX streams don't have a unique clock offset and frequency, so
// the RTP timstamps can't be unwrapped.
// Add an offset to avoid |capture_ticks| to become negative in the case
// of reordering.
constexpr int64_t kStartingCaptureTimeTicks = 90 * 48 * 1000;
int64_t capture_ticks =
kStartingCaptureTimeTicks +
uint64_t capture_ticks =
stream->unwrap_capture_ticks.Unwrap(rtp.header.timestamp);
// TODO(srte): Use logged sample rate when it is added to the format.
capture_time = Timestamp::seconds(