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

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

Issue 1929313002: Removed all RTP dependencies from ViEChannel and renamed class. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed pbos' comments in ps#1 Created 4 years, 7 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
11 #ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 11 #ifndef WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
12 #define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 12 #define WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
13 13
14 #include <map> 14 #include <map>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/call/bitrate_allocator.h" 17 #include "webrtc/call/bitrate_allocator.h"
18 #include "webrtc/base/criticalsection.h" 18 #include "webrtc/base/criticalsection.h"
19 #include "webrtc/call.h" 19 #include "webrtc/call.h"
20 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 20 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
21 #include "webrtc/video/encoded_frame_callback_adapter.h" 21 #include "webrtc/video/encoded_frame_callback_adapter.h"
22 #include "webrtc/video/encoder_state_feedback.h" 22 #include "webrtc/video/encoder_state_feedback.h"
23 #include "webrtc/video/payload_router.h" 23 #include "webrtc/video/payload_router.h"
24 #include "webrtc/video/send_statistics_proxy.h" 24 #include "webrtc/video/send_statistics_proxy.h"
25 #include "webrtc/video/video_capture_input.h" 25 #include "webrtc/video/video_capture_input.h"
26 #include "webrtc/video/vie_channel.h"
27 #include "webrtc/video/vie_encoder.h" 26 #include "webrtc/video/vie_encoder.h"
28 #include "webrtc/video_receive_stream.h" 27 #include "webrtc/video_receive_stream.h"
29 #include "webrtc/video_send_stream.h" 28 #include "webrtc/video_send_stream.h"
30 29
31 namespace webrtc { 30 namespace webrtc {
32 31
33 class BitrateAllocator; 32 class BitrateAllocator;
34 class CallStats; 33 class CallStats;
35 class CongestionController; 34 class CongestionController;
36 class ProcessThread; 35 class ProcessThread;
37 class RtpRtcp; 36 class RtpRtcp;
38 class ViEChannel;
39 class ViEEncoder; 37 class ViEEncoder;
40 class VieRemb; 38 class VieRemb;
41 39
42 namespace vcm { 40 namespace vcm {
43 class VideoSender; 41 class VideoSender;
44 } // namespace vcm 42 } // namespace vcm
45 43
46 namespace internal { 44 namespace internal {
47 45
48 class VideoSendStream : public webrtc::VideoSendStream, 46 class VideoSendStream : public webrtc::VideoSendStream,
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_; 129 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
132 // RtpRtcp modules, declared here as they use other members on construction. 130 // RtpRtcp modules, declared here as they use other members on construction.
133 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 131 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
134 PayloadRouter payload_router_; 132 PayloadRouter payload_router_;
135 VideoCaptureInput input_; 133 VideoCaptureInput input_;
136 }; 134 };
137 } // namespace internal 135 } // namespace internal
138 } // namespace webrtc 136 } // namespace webrtc
139 137
140 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 138 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698