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

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

Issue 2669463006: Move RemoteBitrateEstimator::RemoveStream calls from receive streams to Call. (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 14 matching lines...) Expand all
25 #include "webrtc/video/receive_statistics_proxy.h" 25 #include "webrtc/video/receive_statistics_proxy.h"
26 #include "webrtc/video/rtp_stream_receiver.h" 26 #include "webrtc/video/rtp_stream_receiver.h"
27 #include "webrtc/video/rtp_streams_synchronizer.h" 27 #include "webrtc/video/rtp_streams_synchronizer.h"
28 #include "webrtc/video/transport_adapter.h" 28 #include "webrtc/video/transport_adapter.h"
29 #include "webrtc/video/video_stream_decoder.h" 29 #include "webrtc/video/video_stream_decoder.h"
30 #include "webrtc/video_receive_stream.h" 30 #include "webrtc/video_receive_stream.h"
31 31
32 namespace webrtc { 32 namespace webrtc {
33 33
34 class CallStats; 34 class CallStats;
35 class CongestionController;
36 class IvfFileWriter; 35 class IvfFileWriter;
37 class ProcessThread; 36 class ProcessThread;
38 class RTPFragmentationHeader; 37 class RTPFragmentationHeader;
39 class VieRemb; 38 class VieRemb;
40 class VCMTiming; 39 class VCMTiming;
41 class VCMJitterEstimator; 40 class VCMJitterEstimator;
42 41
43 namespace internal { 42 namespace internal {
44 43
45 class VideoReceiveStream : public webrtc::VideoReceiveStream, 44 class VideoReceiveStream : public webrtc::VideoReceiveStream,
46 public rtc::VideoSinkInterface<VideoFrame>, 45 public rtc::VideoSinkInterface<VideoFrame>,
47 public EncodedImageCallback, 46 public EncodedImageCallback,
48 public NackSender, 47 public NackSender,
49 public KeyFrameRequestSender, 48 public KeyFrameRequestSender,
50 public video_coding::OnCompleteFrameCallback, 49 public video_coding::OnCompleteFrameCallback,
51 public Syncable { 50 public Syncable {
52 public: 51 public:
53 VideoReceiveStream(int num_cpu_cores, 52 VideoReceiveStream(int num_cpu_cores,
54 bool protected_by_flexfec, 53 bool protected_by_flexfec,
55 CongestionController* congestion_controller,
56 PacketRouter* packet_router, 54 PacketRouter* packet_router,
57 VideoReceiveStream::Config config, 55 VideoReceiveStream::Config config,
58 ProcessThread* process_thread, 56 ProcessThread* process_thread,
59 CallStats* call_stats, 57 CallStats* call_stats,
60 VieRemb* remb); 58 VieRemb* remb);
61 ~VideoReceiveStream() override; 59 ~VideoReceiveStream() override;
62 60
63 const Config& config() const { return config_; } 61 const Config& config() const { return config_; }
64 62
65 void SignalNetworkState(NetworkState state); 63 void SignalNetworkState(NetworkState state);
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 118
121 TransportAdapter transport_adapter_; 119 TransportAdapter transport_adapter_;
122 const VideoReceiveStream::Config config_; 120 const VideoReceiveStream::Config config_;
123 const int num_cpu_cores_; 121 const int num_cpu_cores_;
124 const bool protected_by_flexfec_; 122 const bool protected_by_flexfec_;
125 ProcessThread* const process_thread_; 123 ProcessThread* const process_thread_;
126 Clock* const clock_; 124 Clock* const clock_;
127 125
128 rtc::PlatformThread decode_thread_; 126 rtc::PlatformThread decode_thread_;
129 127
130 CongestionController* const congestion_controller_;
131 CallStats* const call_stats_; 128 CallStats* const call_stats_;
132 129
133 std::unique_ptr<VCMTiming> timing_; // Jitter buffer experiment. 130 std::unique_ptr<VCMTiming> timing_; // Jitter buffer experiment.
134 vcm::VideoReceiver video_receiver_; 131 vcm::VideoReceiver video_receiver_;
135 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_; 132 std::unique_ptr<rtc::VideoSinkInterface<VideoFrame>> incoming_video_stream_;
136 ReceiveStatisticsProxy stats_proxy_; 133 ReceiveStatisticsProxy stats_proxy_;
137 RtpStreamReceiver rtp_stream_receiver_; 134 RtpStreamReceiver rtp_stream_receiver_;
138 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_; 135 std::unique_ptr<VideoStreamDecoder> video_stream_decoder_;
139 RtpStreamsSynchronizer rtp_stream_sync_; 136 RtpStreamsSynchronizer rtp_stream_sync_;
140 137
141 rtc::CriticalSection ivf_writer_lock_; 138 rtc::CriticalSection ivf_writer_lock_;
142 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_); 139 std::unique_ptr<IvfFileWriter> ivf_writer_ GUARDED_BY(ivf_writer_lock_);
143 140
144 // Members for the new jitter buffer experiment. 141 // Members for the new jitter buffer experiment.
145 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 142 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
146 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 143 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
147 }; 144 };
148 } // namespace internal 145 } // namespace internal
149 } // namespace webrtc 146 } // namespace webrtc
150 147
151 #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