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

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

Issue 1936503002: Removed SSRC knowledge from ViEEncoder. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@move_payload_router2
Patch Set: Rebased 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
« no previous file with comments | « webrtc/video/encoder_state_feedback_unittest.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 16 matching lines...) Expand all
27 #include "webrtc/video/video_capture_input.h" 27 #include "webrtc/video/video_capture_input.h"
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 ProcessThread; 38 class ProcessThread;
38 class RtpRtcp; 39 class RtpRtcp;
39 class ViEEncoder; 40 class ViEEncoder;
40 class VieRemb; 41 class VieRemb;
41 42
42 namespace vcm { 43 namespace vcm {
43 class VideoSender; 44 class VideoSender;
44 } // namespace vcm 45 } // namespace vcm
45 46
46 namespace internal { 47 namespace internal {
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 EncodedFrameCallbackAdapter encoded_frame_proxy_; 120 EncodedFrameCallbackAdapter encoded_frame_proxy_;
120 const VideoSendStream::Config config_; 121 const VideoSendStream::Config config_;
121 std::map<uint32_t, RtpState> suspended_ssrcs_; 122 std::map<uint32_t, RtpState> suspended_ssrcs_;
122 123
123 ProcessThread* const module_process_thread_; 124 ProcessThread* const module_process_thread_;
124 CallStats* const call_stats_; 125 CallStats* const call_stats_;
125 CongestionController* const congestion_controller_; 126 CongestionController* const congestion_controller_;
126 BitrateAllocator* const bitrate_allocator_; 127 BitrateAllocator* const bitrate_allocator_;
127 VieRemb* const remb_; 128 VieRemb* const remb_;
128 129
130 static const bool kEnableFrameRecording = false;
131 static const int kMaxLayers = 3;
132 std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers];
133
129 rtc::PlatformThread encoder_thread_; 134 rtc::PlatformThread encoder_thread_;
130 rtc::Event encoder_wakeup_event_; 135 rtc::Event encoder_wakeup_event_;
131 volatile int stop_encoder_thread_; 136 volatile int stop_encoder_thread_;
132 rtc::CriticalSection encoder_settings_crit_; 137 rtc::CriticalSection encoder_settings_crit_;
133 rtc::Optional<EncoderSettings> pending_encoder_settings_ 138 rtc::Optional<EncoderSettings> pending_encoder_settings_
134 GUARDED_BY(encoder_settings_crit_); 139 GUARDED_BY(encoder_settings_crit_);
135 140
136 OveruseFrameDetector overuse_detector_; 141 OveruseFrameDetector overuse_detector_;
142 ViEEncoder vie_encoder_;
137 EncoderStateFeedback encoder_feedback_; 143 EncoderStateFeedback encoder_feedback_;
138 ViEEncoder vie_encoder_;
139 vcm::VideoSender* const video_sender_; 144 vcm::VideoSender* const video_sender_;
140 145
141 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_; 146 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
142 // RtpRtcp modules, declared here as they use other members on construction. 147 // RtpRtcp modules, declared here as they use other members on construction.
143 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 148 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
144 PayloadRouter payload_router_; 149 PayloadRouter payload_router_;
145 VideoCaptureInput input_; 150 VideoCaptureInput input_;
146 }; 151 };
147 } // namespace internal 152 } // namespace internal
148 } // namespace webrtc 153 } // namespace webrtc
149 154
150 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 155 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « webrtc/video/encoder_state_feedback_unittest.cc ('k') | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698