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

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

Issue 2516983004: Move ownership of PacketRouter from CongestionController to Call. (Closed)
Patch Set: Add back packet_router method and 4-argument constructor. Created 4 years 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/tools/event_log_visualizer/analyzer.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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 class VideoReceiveStream : public webrtc::VideoReceiveStream, 44 class VideoReceiveStream : public webrtc::VideoReceiveStream,
45 public rtc::VideoSinkInterface<VideoFrame>, 45 public rtc::VideoSinkInterface<VideoFrame>,
46 public EncodedImageCallback, 46 public EncodedImageCallback,
47 public NackSender, 47 public NackSender,
48 public KeyFrameRequestSender, 48 public KeyFrameRequestSender,
49 public video_coding::OnCompleteFrameCallback { 49 public video_coding::OnCompleteFrameCallback {
50 public: 50 public:
51 VideoReceiveStream(int num_cpu_cores, 51 VideoReceiveStream(int num_cpu_cores,
52 CongestionController* congestion_controller, 52 CongestionController* congestion_controller,
53 PacketRouter* packet_router,
53 VideoReceiveStream::Config config, 54 VideoReceiveStream::Config config,
54 webrtc::VoiceEngine* voice_engine, 55 webrtc::VoiceEngine* voice_engine,
55 ProcessThread* process_thread, 56 ProcessThread* process_thread,
56 CallStats* call_stats, 57 CallStats* call_stats,
57 VieRemb* remb); 58 VieRemb* remb);
58 ~VideoReceiveStream() override; 59 ~VideoReceiveStream() override;
59 60
60 void SignalNetworkState(NetworkState state); 61 void SignalNetworkState(NetworkState state);
61 bool DeliverRtcp(const uint8_t* packet, size_t length); 62 bool DeliverRtcp(const uint8_t* packet, size_t length);
62 bool DeliverRtp(const uint8_t* packet, 63 bool DeliverRtp(const uint8_t* packet,
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 131
131 // Members for the new jitter buffer experiment. 132 // Members for the new jitter buffer experiment.
132 const bool jitter_buffer_experiment_; 133 const bool jitter_buffer_experiment_;
133 std::unique_ptr<VCMJitterEstimator> jitter_estimator_; 134 std::unique_ptr<VCMJitterEstimator> jitter_estimator_;
134 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_; 135 std::unique_ptr<video_coding::FrameBuffer> frame_buffer_;
135 }; 136 };
136 } // namespace internal 137 } // namespace internal
137 } // namespace webrtc 138 } // namespace webrtc
138 139
139 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_ 140 #endif // WEBRTC_VIDEO_VIDEO_RECEIVE_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/tools/event_log_visualizer/analyzer.cc ('k') | webrtc/video/video_receive_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698