generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get avg_delay_ms from DecoderTiming callback.

Browse Source 
R=stefan@webrtc.org
BUG=1667

Review URL: https://webrtc-codereview.appspot.com/28339004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7949 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2014-12-18 13:12:52 +00:00
parent 9b79197c80
commit 98c04b38a8
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
webrtc/video/receive_statistics_proxy.cc
View File

@@ -41,11 +41,13 @@ VideoReceiveStream::Stats ReceiveStatisticsProxy::GetStats() const {
stats = stats_; stats = stats_;
} }
stats.c_name = GetCName(); stats.c_name = GetCName();
codec_->GetReceiveSideDelay(channel_, &stats.avg_delay_ms);
stats.discarded_packets = codec_->GetNumDiscardedPackets(channel_); stats.discarded_packets = codec_->GetNumDiscardedPackets(channel_);
codec_->GetReceiveCodecStastistics( codec_->GetReceiveCodecStastistics(
channel_, stats.key_frames, stats.delta_frames); channel_, stats.key_frames, stats.delta_frames);
codec_->GetReceiveCodecStastistics(channel_, stats.key_frames,
stats.delta_frames);
return stats; return stats;
} }
@@ -64,6 +66,17 @@ void ReceiveStatisticsProxy::IncomingRate(const int video_channel,
stats_.total_bitrate_bps = bitrate_bps; stats_.total_bitrate_bps = bitrate_bps;
} }
void ReceiveStatisticsProxy::DecoderTiming(int decode_ms,
int max_decode_ms,
int current_delay_ms,
int target_delay_ms,
int jitter_buffer_ms,
int min_playout_delay_ms,
int render_delay_ms) {
CriticalSectionScoped lock(crit_.get());
stats_.avg_delay_ms = target_delay_ms;
}
void ReceiveStatisticsProxy::StatisticsUpdated( void ReceiveStatisticsProxy::StatisticsUpdated(
const webrtc::RtcpStatistics& statistics, const webrtc::RtcpStatistics& statistics,
uint32_t ssrc) { uint32_t ssrc) {

2
webrtc/video/receive_statistics_proxy.h
View File

@@ -59,7 +59,7 @@ class ReceiveStatisticsProxy : public ViEDecoderObserver,
int target_delay_ms, int target_delay_ms,
int jitter_buffer_ms, int jitter_buffer_ms,
int min_playout_delay_ms, int min_playout_delay_ms,
int render_delay_ms) OVERRIDE {} int render_delay_ms) OVERRIDE;
virtual void RequestNewKeyFrame(const int video_channel) OVERRIDE {} virtual void RequestNewKeyFrame(const int video_channel) OVERRIDE {}
// Overrides RtcpStatisticsBallback. // Overrides RtcpStatisticsBallback.