Reason for revert: Create reland CL to add fix to. Original issue's description: > Revert of Add a flags field to video timing extension. (patchset #15 id:280001 of https://codereview.webrtc.org/3000753002/ ) > > Reason for revert: > Speculative revet for breaking remoting_unittests in fyi bots. > https://build.chromium.org/p/chromium.webrtc.fyi/waterfall?builder=Win7%20Tester > > Original issue's description: > > Add a flags field to video timing extension. > > > > The rtp header extension for video timing shuold have an additional > > field for signaling metadata, such as what triggered the extension for > > this particular frame. This will allow separating frames select because > > of outlier sizes from regular frames, for more accurate stats. > > > > This implementation is backwards compatible in that it can read video > > timing extensions without the new flag field, but it always sends with > > it included. > > > > BUG=webrtc:7594 > > > > Review-Url: https://codereview.webrtc.org/3000753002 > > Cr-Commit-Position: refs/heads/master@{#19353} > > Committed:cf5d485e14> > TBR=danilchap@webrtc.org,kthelgason@webrtc.org,stefan@webrtc.org,sprang@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > BUG=webrtc:7594 > > Review-Url: https://codereview.webrtc.org/2995953002 > Cr-Commit-Position: refs/heads/master@{#19360} > Committed:f0f7378b05TBR=danilchap@webrtc.org,kthelgason@webrtc.org,stefan@webrtc.org,emircan@google.com # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=webrtc:7594 Review-Url: https://codereview.webrtc.org/2996153002 Cr-Commit-Position: refs/heads/master@{#19405}
71 lines
2.2 KiB
C++
71 lines
2.2 KiB
C++
/*
|
|
* Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/api/video/video_timing.h"
|
|
|
|
#include <sstream>
|
|
|
|
namespace webrtc {
|
|
|
|
TimingFrameInfo::TimingFrameInfo()
|
|
: rtp_timestamp(0),
|
|
capture_time_ms(-1),
|
|
encode_start_ms(-1),
|
|
encode_finish_ms(-1),
|
|
packetization_finish_ms(-1),
|
|
pacer_exit_ms(-1),
|
|
network_timestamp_ms(-1),
|
|
network2_timestamp_ms(-1),
|
|
receive_start_ms(-1),
|
|
receive_finish_ms(-1),
|
|
decode_start_ms(-1),
|
|
decode_finish_ms(-1),
|
|
render_time_ms(-1),
|
|
flags(TimingFrameFlags::kDefault) {}
|
|
|
|
int64_t TimingFrameInfo::EndToEndDelay() const {
|
|
return capture_time_ms >= 0 ? decode_finish_ms - capture_time_ms : -1;
|
|
}
|
|
|
|
bool TimingFrameInfo::IsLongerThan(const TimingFrameInfo& other) const {
|
|
int64_t other_delay = other.EndToEndDelay();
|
|
return other_delay == -1 || EndToEndDelay() > other_delay;
|
|
}
|
|
|
|
bool TimingFrameInfo::IsOutlier() const {
|
|
return !IsInvalid() && (flags & TimingFrameFlags::kTriggeredBySize);
|
|
}
|
|
|
|
bool TimingFrameInfo::IsTimerTriggered() const {
|
|
return !IsInvalid() && (flags & TimingFrameFlags::kTriggeredByTimer);
|
|
}
|
|
|
|
bool TimingFrameInfo::IsInvalid() const {
|
|
return flags == TimingFrameFlags::kInvalid;
|
|
}
|
|
|
|
std::string TimingFrameInfo::ToString() const {
|
|
std::stringstream out;
|
|
if (IsInvalid()) {
|
|
out << "[Invalid]";
|
|
} else {
|
|
out << rtp_timestamp << ',' << capture_time_ms << ',' << encode_start_ms
|
|
<< ',' << encode_finish_ms << ',' << packetization_finish_ms << ','
|
|
<< pacer_exit_ms << ',' << network_timestamp_ms << ','
|
|
<< network2_timestamp_ms << ',' << receive_start_ms << ','
|
|
<< receive_finish_ms << ',' << decode_start_ms << ','
|
|
<< decode_finish_ms << ',' << render_time_ms << ", outlier_triggered "
|
|
<< IsOutlier() << ", timer_triggered " << IsTimerTriggered();
|
|
}
|
|
return out.str();
|
|
}
|
|
|
|
} // namespace webrtc
|