| OLD | NEW | 
|    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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  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   std::unique_ptr<VCMJitterEstimator> jitter_estimator_; |  142   std::unique_ptr<VCMJitterEstimator> jitter_estimator_; | 
|  143   std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; |  143   std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; | 
|  144  |  144  | 
|  145   std::unique_ptr<RtpStreamReceiverInterface> media_receiver_; |  145   std::unique_ptr<RtpStreamReceiverInterface> media_receiver_; | 
|  146   std::unique_ptr<RtpStreamReceiverInterface> rtx_receiver_; |  146   std::unique_ptr<RtpStreamReceiverInterface> rtx_receiver_; | 
 |  147  | 
 |  148   // Whenever we are in an undecodable state (stream has just started or due to | 
 |  149   // a decoding error) we require a keyframe to restart the stream. | 
 |  150   bool keyframe_required_ = true; | 
|  147 }; |  151 }; | 
|  148 }  // namespace internal |  152 }  // namespace internal | 
|  149 }  // namespace webrtc |  153 }  // namespace webrtc | 
|  150  |  154  | 
|  151 #endif  // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ |  155 #endif  // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ | 
| OLD | NEW |