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

Side by Side Diff: webrtc/video/video_receive_stream.h

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/rtp_stream_receiver_unittest.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_; 132 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_;
133 ReceiveStatisticsProxy stats_proxy_; 133 ReceiveStatisticsProxy stats_proxy_;
134 RtpStreamReceiver rtp_stream_receiver_; 134 RtpStreamReceiver rtp_stream_receiver_;
135 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_; 135 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_;
136 RtpStreamsSynchronizer rtp_stream_sync_; 136 RtpStreamsSynchronizer rtp_stream_sync_;
137 137
138 rtc::CriticalSection ivf_writer_lock_; 138 rtc::CriticalSection ivf_writer_lock_;
139 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 139 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
140 140
141 // Members for the new jitter buffer experiment. 141 // Members for the new jitter buffer experiment.
142 const bool jitter_buffer_experiment_;
143 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 142 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
144 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 143 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
145 }; 144 };
146 } // namespace internal 145 } // namespace internal
147 } // namespace webrtc 146 } // namespace webrtc
148 147
149 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 148 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/rtp_stream_receiver_unittest.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698