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

Side by Side Diff: webrtc/video/video_send_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/video/video_receive_stream.cc ('k') | webrtc/video/video_send_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 17 matching lines...) Expand all
28 #include "webrtc/video/vie_encoder.h" 28 #include "webrtc/video/vie_encoder.h"
29 #include "webrtc/video_receive_stream.h" 29 #include "webrtc/video_receive_stream.h"
30 #include "webrtc/video_send_stream.h" 30 #include "webrtc/video_send_stream.h"
31 31
32 namespace webrtc { 32 namespace webrtc {
33 33
34 class BitrateAllocator; 34 class BitrateAllocator;
35 class CallStats; 35 class CallStats;
36 class CongestionController; 36 class CongestionController;
37 class IvfFileWriter; 37 class IvfFileWriter;
38 class PacketRouter;
38 class ProcessThread; 39 class ProcessThread;
39 class RtpRtcp; 40 class RtpRtcp;
40 class VieRemb; 41 class VieRemb;
41 class RtcEventLog; 42 class RtcEventLog;
42 43
43 namespace internal { 44 namespace internal {
44 45
45 class VideoSendStreamImpl; 46 class VideoSendStreamImpl;
46 47
47 // VideoSendStream implements webrtc::VideoSendStream. 48 // VideoSendStream implements webrtc::VideoSendStream.
48 // Internally, it delegates all public methods to VideoSendStreamImpl and / or 49 // Internally, it delegates all public methods to VideoSendStreamImpl and / or
49 // VieEncoder. VideoSendStreamInternal is created and deleted on |worker_queue|. 50 // VieEncoder. VideoSendStreamInternal is created and deleted on |worker_queue|.
50 class VideoSendStream : public webrtc::VideoSendStream { 51 class VideoSendStream : public webrtc::VideoSendStream {
51 public: 52 public:
52 VideoSendStream(int num_cpu_cores, 53 VideoSendStream(int num_cpu_cores,
53 ProcessThread* module_process_thread, 54 ProcessThread* module_process_thread,
54 rtc::TaskQueue* worker_queue, 55 rtc::TaskQueue* worker_queue,
55 CallStats* call_stats, 56 CallStats* call_stats,
56 CongestionController* congestion_controller, 57 CongestionController* congestion_controller,
58 PacketRouter* packet_router,
57 BitrateAllocator* bitrate_allocator, 59 BitrateAllocator* bitrate_allocator,
58 SendDelayStats* send_delay_stats, 60 SendDelayStats* send_delay_stats,
59 VieRemb* remb, 61 VieRemb* remb,
60 RtcEventLog* event_log, 62 RtcEventLog* event_log,
61 VideoSendStream::Config config, 63 VideoSendStream::Config config,
62 VideoEncoderConfig encoder_config, 64 VideoEncoderConfig encoder_config,
63 const std::map<uint32_t, RtpState>& suspended_ssrcs); 65 const std::map<uint32_t, RtpState>& suspended_ssrcs);
64 66
65 ~VideoSendStream() override; 67 ~VideoSendStream() override;
66 68
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 SendStatisticsProxy stats_proxy_; 105 SendStatisticsProxy stats_proxy_;
104 const VideoSendStream::Config config_; 106 const VideoSendStream::Config config_;
105 std::unique_ptr<VideoSendStreamImpl> send_stream_; 107 std::unique_ptr<VideoSendStreamImpl> send_stream_;
106 std::unique_ptr<ViEEncoder> vie_encoder_; 108 std::unique_ptr<ViEEncoder> vie_encoder_;
107 }; 109 };
108 110
109 } // namespace internal 111 } // namespace internal
110 } // namespace webrtc 112 } // namespace webrtc
111 113
112 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 114 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/video_receive_stream.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698