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

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

Issue 3008773002: Use RtxReceiveStream. (Closed)
Patch Set: Improve TODO comments. Created 3 years, 3 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
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 20 matching lines...) Expand all
31 #include "webrtc/video/video_stream_decoder.h" 31 #include "webrtc/video/video_stream_decoder.h"
32 32
33 namespace webrtc { 33 namespace webrtc {
34 34
35 class CallStats; 35 class CallStats;
36 class IvfFileWriter; 36 class IvfFileWriter;
37 class ProcessThread; 37 class ProcessThread;
38 class RTPFragmentationHeader; 38 class RTPFragmentationHeader;
39 class RtpStreamReceiverInterface; 39 class RtpStreamReceiverInterface;
40 class RtpStreamReceiverControllerInterface; 40 class RtpStreamReceiverControllerInterface;
41 class RtxReceiveStream;
41 class VCMTiming; 42 class VCMTiming;
42 class VCMJitterEstimator; 43 class VCMJitterEstimator;
43 44
44 namespace internal { 45 namespace internal {
45 46
46 class VideoReceiveStream : public webrtc::VideoReceiveStream, 47 class VideoReceiveStream : public webrtc::VideoReceiveStream,
47 public rtc::VideoSinkInterface<VideoFrame>, 48 public rtc::VideoSinkInterface<VideoFrame>,
48 public EncodedImageCallback, 49 public EncodedImageCallback,
49 public NackSender, 50 public NackSender,
50 public KeyFrameRequestSender, 51 public KeyFrameRequestSender,
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 RtpStreamsSynchronizer rtp_stream_sync_; 137 RtpStreamsSynchronizer rtp_stream_sync_;
137 138
138 rtc::CriticalSection ivf_writer_lock_; 139 rtc::CriticalSection ivf_writer_lock_;
139 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 140 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
140 141
141 // Members for the new jitter buffer experiment. 142 // Members for the new jitter buffer experiment.
142 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 143 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
143 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 144 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
144 145
145 std::unique_ptr<RtpStreamReceiverInterface> media_receiver_; 146 std::unique_ptr<RtpStreamReceiverInterface> media_receiver_;
147 std::unique_ptr<RtxReceiveStream> rtx_receive_stream_;
146 std::unique_ptr<RtpStreamReceiverInterface> rtx_receiver_; 148 std::unique_ptr<RtpStreamReceiverInterface> rtx_receiver_;
147 149
148 // Whenever we are in an undecodable state (stream has just started or due to 150 // 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. 151 // a decoding error) we require a keyframe to restart the stream.
150 bool keyframe_required_ = true; 152 bool keyframe_required_ = true;
151 153
152 // If we have successfully decoded any frame. 154 // If we have successfully decoded any frame.
153 bool frame_decoded_ = false; 155 bool frame_decoded_ = false;
154 }; 156 };
155 } // namespace internal 157 } // namespace internal
156 } // namespace webrtc 158 } // namespace webrtc
157 159
158 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 160 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698