| OLD | NEW | 
|---|
| 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 14 matching lines...) Expand all  Loading... | 
| 25 #include "webrtc/video/payload_router.h" | 25 #include "webrtc/video/payload_router.h" | 
| 26 #include "webrtc/video/receive_statistics_proxy.h" | 26 #include "webrtc/video/receive_statistics_proxy.h" | 
| 27 | 27 | 
| 28 namespace webrtc { | 28 namespace webrtc { | 
| 29 | 29 | 
| 30 VideoStreamDecoder::VideoStreamDecoder( | 30 VideoStreamDecoder::VideoStreamDecoder( | 
| 31     vcm::VideoReceiver* video_receiver, | 31     vcm::VideoReceiver* video_receiver, | 
| 32     VCMFrameTypeCallback* vcm_frame_type_callback, | 32     VCMFrameTypeCallback* vcm_frame_type_callback, | 
| 33     VCMPacketRequestCallback* vcm_packet_request_callback, | 33     VCMPacketRequestCallback* vcm_packet_request_callback, | 
| 34     bool enable_nack, | 34     bool enable_nack, | 
|  | 35     bool enable_fec,  // TODO(philipel): Actually use this. | 
| 35     ReceiveStatisticsProxy* receive_statistics_proxy, | 36     ReceiveStatisticsProxy* receive_statistics_proxy, | 
| 36     IncomingVideoStream* incoming_video_stream, | 37     IncomingVideoStream* incoming_video_stream, | 
| 37     I420FrameCallback* pre_render_callback) | 38     I420FrameCallback* pre_render_callback) | 
| 38     : video_receiver_(video_receiver), | 39     : video_receiver_(video_receiver), | 
| 39       receive_stats_callback_(receive_statistics_proxy), | 40       receive_stats_callback_(receive_statistics_proxy), | 
| 40       incoming_video_stream_(incoming_video_stream), | 41       incoming_video_stream_(incoming_video_stream), | 
| 41       pre_render_callback_(pre_render_callback), | 42       pre_render_callback_(pre_render_callback), | 
| 42       last_rtt_ms_(0) { | 43       last_rtt_ms_(0) { | 
| 43   RTC_DCHECK(video_receiver_); | 44   RTC_DCHECK(video_receiver_); | 
| 44 | 45 | 
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 123       jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt); | 124       jitter_buffer_ms, min_playout_delay_ms, render_delay_ms, last_rtt); | 
| 124 } | 125 } | 
| 125 | 126 | 
| 126 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | 127 void VideoStreamDecoder::OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) { | 
| 127   video_receiver_->SetReceiveChannelParameters(max_rtt_ms); | 128   video_receiver_->SetReceiveChannelParameters(max_rtt_ms); | 
| 128 | 129 | 
| 129   rtc::CritScope lock(&crit_); | 130   rtc::CritScope lock(&crit_); | 
| 130   last_rtt_ms_ = avg_rtt_ms; | 131   last_rtt_ms_ = avg_rtt_ms; | 
| 131 } | 132 } | 
| 132 }  // namespace webrtc | 133 }  // namespace webrtc | 
| OLD | NEW | 
|---|