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

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: 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;
35 class IvfFileWriter;
36 class ProcessThread; 36 class ProcessThread;
37 class RtpRtcp; 37 class RtpRtcp;
38 class ViEChannel;
39 class ViEEncoder; 38 class ViEEncoder;
40 class VieRemb; 39 class VieRemb;
41 40
42 namespace vcm { 41 namespace vcm {
43 class VideoSender; 42 class VideoSender;
44 } // namespace vcm 43 } // namespace vcm
45 44
46 namespace internal { 45 namespace internal {
47 46
48 class VideoSendStream : public webrtc::VideoSendStream, 47 class VideoSendStream : public webrtc::VideoSendStream,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 EncodedFrameCallbackAdapter encoded_frame_proxy_; 118 EncodedFrameCallbackAdapter encoded_frame_proxy_;
120 const VideoSendStream::Config config_; 119 const VideoSendStream::Config config_;
121 std::map<uint32_t, RtpState> suspended_ssrcs_; 120 std::map<uint32_t, RtpState> suspended_ssrcs_;
122 121
123 ProcessThread* const module_process_thread_; 122 ProcessThread* const module_process_thread_;
124 CallStats* const call_stats_; 123 CallStats* const call_stats_;
125 CongestionController* const congestion_controller_; 124 CongestionController* const congestion_controller_;
126 BitrateAllocator* const bitrate_allocator_; 125 BitrateAllocator* const bitrate_allocator_;
127 VieRemb* const remb_; 126 VieRemb* const remb_;
128 127
128 static const bool kEnableFrameRecording = false;
129 static const int kMaxLayers = 3;
130 std::unique_ptr<IvfFileWriter> file_writers_[kMaxLayers];
131
129 rtc::PlatformThread encoder_thread_; 132 rtc::PlatformThread encoder_thread_;
130 rtc::Event encoder_wakeup_event_; 133 rtc::Event encoder_wakeup_event_;
131 volatile int stop_encoder_thread_; 134 volatile int stop_encoder_thread_;
132 rtc::CriticalSection encoder_settings_crit_; 135 rtc::CriticalSection encoder_settings_crit_;
133 rtc::Optional<EncoderSettings> pending_encoder_settings_ 136 rtc::Optional<EncoderSettings> pending_encoder_settings_
134 GUARDED_BY(encoder_settings_crit_); 137 GUARDED_BY(encoder_settings_crit_);
135 138
136 OveruseFrameDetector overuse_detector_; 139 OveruseFrameDetector overuse_detector_;
137 EncoderStateFeedback encoder_feedback_; 140 EncoderStateFeedback encoder_feedback_;
138 ViEEncoder vie_encoder_; 141 ViEEncoder vie_encoder_;
139 vcm::VideoSender* const video_sender_; 142 vcm::VideoSender* const video_sender_;
140 143
141 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_; 144 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
142 // RtpRtcp modules, declared here as they use other members on construction. 145 // RtpRtcp modules, declared here as they use other members on construction.
143 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 146 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
144 PayloadRouter payload_router_; 147 PayloadRouter payload_router_;
145 VideoCaptureInput input_; 148 VideoCaptureInput input_;
146 }; 149 };
147 } // namespace internal 150 } // namespace internal
148 } // namespace webrtc 151 } // namespace webrtc
149 152
150 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 153 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698