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

Remove unused functions in VCMTiming.

Browse Source 
Remove VCMTiming::EnoughTimeToDecode, VCMTiming::ResetDecodeTime.

Make VCMTiming::StopDecodeTimer void (always returning zero).

Update ReceiverTiming.WrapAround test to insert timestamp that wraps.

Bug: none
Change-Id: I85a8bfd6be18371810b638284b4af73a46894be7
Reviewed-on: https://webrtc-review.googlesource.com/36060
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21660}
This commit is contained in:
Åsa Persson
2018-01-05 12:44:45 +01:00
committed by Commit Bot
parent 39d93da776
commit 8368d1a031
3 changed files with 87 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
modules/video_coding/timing.cc
View File

@ -12,8 +12,6 @@
#include <algorithm>
#include "modules/video_coding/internal_defines.h"
#include "modules/video_coding/jitter_buffer_common.h"
#include "system_wrappers/include/clock.h"
#include "system_wrappers/include/metrics.h"
#include "system_wrappers/include/timestamp_extrapolator.h"
@ -86,11 +84,6 @@ void VCMTiming::Reset() {
prev_frame_timestamp_ = 0;
}
void VCMTiming::ResetDecodeTime() {
rtc::CritScope cs(&crit_sect_);
codec_timer_.reset(new VCMCodecTimer());
}
void VCMTiming::set_render_delay(int render_delay_ms) {
rtc::CritScope cs(&crit_sect_);
render_delay_ms_ = render_delay_ms;
@ -155,9 +148,8 @@ void VCMTiming::UpdateCurrentDelay(uint32_t frame_timestamp) {
}
if (max_change_ms <= 0) {
// Any changes less than 1 ms are truncated and
// will be postponed. Negative change will be due
// to reordering and should be ignored.
// Any changes less than 1 ms are truncated and will be postponed.
// Negative change will be due to reordering and should be ignored.
return;
}
delay_diff_ms = std::max(delay_diff_ms, -max_change_ms);
@ -185,10 +177,10 @@ void VCMTiming::UpdateCurrentDelay(int64_t render_time_ms,
}
}
int32_t VCMTiming::StopDecodeTimer(uint32_t time_stamp,
int32_t decode_time_ms,
int64_t now_ms,
int64_t render_time_ms) {
void VCMTiming::StopDecodeTimer(uint32_t time_stamp,
int32_t decode_time_ms,
int64_t now_ms,
int64_t render_time_ms) {
rtc::CritScope cs(&crit_sect_);
codec_timer_->AddTiming(decode_time_ms, now_ms);
assert(decode_time_ms >= 0);
@ -204,7 +196,6 @@ int32_t VCMTiming::StopDecodeTimer(uint32_t time_stamp,
sum_missed_render_deadline_ms_ += -time_until_rendering_ms;
++num_delayed_decoded_frames_;
}
return 0;
}
void VCMTiming::IncomingTimestamp(uint32_t time_stamp, int64_t now_ms) {
@ -228,7 +219,7 @@ int64_t VCMTiming::RenderTimeMsInternal(uint32_t frame_timestamp,
}
if (min_playout_delay_ms_ == 0 && max_playout_delay_ms_ == 0) {
// Render as soon as possible
// Render as soon as possible.
return now_ms;
}
@ -239,7 +230,6 @@ int64_t VCMTiming::RenderTimeMsInternal(uint32_t frame_timestamp,
return estimated_complete_time_ms + actual_delay;
}
// Must be called from inside a critical section.
int VCMTiming::RequiredDecodeTimeMs() const {
const int decode_time_ms = codec_timer_->RequiredDecodeTimeMs();
assert(decode_time_ms >= 0);
@ -259,24 +249,6 @@ uint32_t VCMTiming::MaxWaitingTime(int64_t render_time_ms,
return static_cast<uint32_t>(max_wait_time_ms);
}
bool VCMTiming::EnoughTimeToDecode(
uint32_t available_processing_time_ms) const {
rtc::CritScope cs(&crit_sect_);
int64_t required_decode_time_ms = RequiredDecodeTimeMs();
if (required_decode_time_ms < 0) {
// Haven't decoded any frames yet, try decoding one to get an estimate
// of the decode time.
return true;
} else if (required_decode_time_ms == 0) {
// Decode time is less than 1, set to 1 for now since
// we don't have any better precision. Count ticks later?
required_decode_time_ms = 1;
}
return static_cast<int64_t>(available_processing_time_ms) -
required_decode_time_ms >
0;
}
int VCMTiming::TargetVideoDelay() const {
rtc::CritScope cs(&crit_sect_);
return TargetDelayInternal();