Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: webrtc/video/video_stream_decoder.cc

Issue 2704183002: Revert of Revert Make the new jitter buffer the default jitter buffer. (Closed)
Patch Set: Rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/video/video_stream_decoder.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 void VideoStreamDecoder::OnFrameCountsUpdated(const FrameCounts& frame_counts) { 108 void VideoStreamDecoder::OnFrameCountsUpdated(const FrameCounts& frame_counts) {
109 receive_stats_callback_->OnFrameCountsUpdated(frame_counts); 109 receive_stats_callback_->OnFrameCountsUpdated(frame_counts);
110 } 110 }
111 111
112 void VideoStreamDecoder::OnDecoderTiming(int decode_ms, 112 void VideoStreamDecoder::OnDecoderTiming(int decode_ms,
113 int max_decode_ms, 113 int max_decode_ms,
114 int current_delay_ms, 114 int current_delay_ms,
115 int target_delay_ms, 115 int target_delay_ms,
116 int jitter_buffer_ms, 116 int jitter_buffer_ms,
117 int min_playout_delay_ms, 117 int min_playout_delay_ms,
118 int render_delay_ms) { 118 int render_delay_ms) {}
119 int last_rtt = -1;
120 {
121 rtc::CritScope lock(&crit_);
122 last_rtt = last_rtt_ms_;
123 }
124 119
125 receive_stats_callback_->OnDecoderTiming( 120 void VideoStreamDecoder::OnFrameBufferTimingsUpdated(int decode_ms,
126 decode_ms, max_decode_ms, current_delay_ms, target_delay_ms, 121 int max_decode_ms,
127 jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt); 122 int current_delay_ms,
128 } 123 int target_delay_ms,
124 int jitter_buffer_ms,
125 int min_playout_delay_ms,
126 int render_delay_ms) {}
127
128 void VideoStreamDecoder::OnCompleteFrame(bool is_keyframe, size_t size_bytes) {}
129 129
130 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { 130 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) {
131 video_receiver_->SetReceiveChannelParameters(max_rtt_ms); 131 video_receiver_->SetReceiveChannelParameters(max_rtt_ms);
132 132
133 rtc::CritScope lock(&crit_); 133 rtc::CritScope lock(&crit_);
134 last_rtt_ms_ = avg_rtt_ms; 134 last_rtt_ms_ = avg_rtt_ms;
135 } 135 }
136 } // namespace webrtc 136 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/video_stream_decoder.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698