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

Revert of Fix the video buffer size should take rtt into consideration (patchset #3 id:40001 of https://codereview.chromium.org/2980413002/ )

Browse Source 
Reason for revert:
We are not certain this is the behavior we want.

Original issue's description:
> Fix the video buffer size should take rtt into consideration
>
> BUG=webrtc:8010
>
> Review-Url: https://codereview.webrtc.org/2980413002
> Cr-Commit-Position: refs/heads/master@{#19285}
> Committed: f1e08d0b58

TBR=sprang@webrtc.org,gustavogb@gmail.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:8010

Review-Url: https://codereview.webrtc.org/3002033002
Cr-Commit-Position: refs/heads/master@{#19442}
This commit is contained in:
philipel
2017-08-22 02:08:51 -07:00
committed by Commit Bot
parent 3d95a53c96
commit bdbc8895f3
5 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/modules/video_coding/frame_buffer2.cc
View File

@ -147,8 +147,6 @@ FrameBuffer::ReturnReason FrameBuffer::NextFrame(
float rtt_mult = protection_mode_ == kProtectionNackFEC ? 0.0 : 1.0;
timing_->SetJitterDelay(jitter_estimator_->GetJitterEstimate(rtt_mult));
timing_->UpdateCurrentDelay(frame->RenderTime(), now_ms);
} else {
jitter_estimator_->FrameNacked();
}
// Gracefully handle bad RTP timestamps and render time issues.
@ -249,11 +247,6 @@ void FrameBuffer::Stop() {
new_continuous_frame_event_.Set();
}
void FrameBuffer::UpdateRtt(int64_t rtt_ms) {
rtc::CritScope lock(&crit_);
jitter_estimator_->UpdateRtt(rtt_ms);
}
bool FrameBuffer::ValidReferences(const FrameObject& frame) const {
for (size_t i = 0; i < frame.num_references; ++i) {
if (AheadOrAt(frame.references[i], frame.picture_id))

3
webrtc/modules/video_coding/frame_buffer2.h
View File

@ -74,9 +74,6 @@ class FrameBuffer {
// return immediately.
void Stop();
// Updates the RTT for jitter buffer estimation.
void UpdateRtt(int64_t rtt_ms);
private:
struct FrameKey {
FrameKey() : picture_id(0), spatial_layer(0) {}