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

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

Issue 2068463004: Remove EncodedFrameCallbackAdapter. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 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/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
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 <memory> 15 #include <memory>
16 #include <vector> 16 #include <vector>
17 17
18 #include "webrtc/call/bitrate_allocator.h" 18 #include "webrtc/call/bitrate_allocator.h"
19 #include "webrtc/base/criticalsection.h" 19 #include "webrtc/base/criticalsection.h"
20 #include "webrtc/call.h" 20 #include "webrtc/call.h"
21 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 21 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
22 #include "webrtc/modules/video_coding/protection_bitrate_calculator.h" 22 #include "webrtc/modules/video_coding/protection_bitrate_calculator.h"
23 #include "webrtc/video/encoded_frame_callback_adapter.h"
24 #include "webrtc/video/encoder_state_feedback.h" 23 #include "webrtc/video/encoder_state_feedback.h"
25 #include "webrtc/video/payload_router.h" 24 #include "webrtc/video/payload_router.h"
26 #include "webrtc/video/send_delay_stats.h" 25 #include "webrtc/video/send_delay_stats.h"
27 #include "webrtc/video/send_statistics_proxy.h" 26 #include "webrtc/video/send_statistics_proxy.h"
28 #include "webrtc/video/video_capture_input.h" 27 #include "webrtc/video/video_capture_input.h"
29 #include "webrtc/video/vie_encoder.h" 28 #include "webrtc/video/vie_encoder.h"
30 #include "webrtc/video_receive_stream.h" 29 #include "webrtc/video_receive_stream.h"
31 #include "webrtc/video_send_stream.h" 30 #include "webrtc/video_send_stream.h"
32 31
33 namespace webrtc { 32 namespace webrtc {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 const CodecSpecificInfo* codec_specific_info, 113 const CodecSpecificInfo* codec_specific_info,
115 const RTPFragmentationHeader* fragmentation) override; 114 const RTPFragmentationHeader* fragmentation) override;
116 115
117 static bool EncoderThreadFunction(void* obj); 116 static bool EncoderThreadFunction(void* obj);
118 void EncoderProcess(); 117 void EncoderProcess();
119 118
120 void ConfigureProtection(); 119 void ConfigureProtection();
121 void ConfigureSsrcs(); 120 void ConfigureSsrcs();
122 121
123 SendStatisticsProxy stats_proxy_; 122 SendStatisticsProxy stats_proxy_;
124 EncodedFrameCallbackAdapter encoded_frame_proxy_;
125 const VideoSendStream::Config config_; 123 const VideoSendStream::Config config_;
126 std::map<uint32_t, RtpState> suspended_ssrcs_; 124 std::map<uint32_t, RtpState> suspended_ssrcs_;
127 125
128 ProcessThread* const module_process_thread_; 126 ProcessThread* const module_process_thread_;
129 CallStats* const call_stats_; 127 CallStats* const call_stats_;
130 CongestionController* const congestion_controller_; 128 CongestionController* const congestion_controller_;
131 BitrateAllocator* const bitrate_allocator_; 129 BitrateAllocator* const bitrate_allocator_;
132 VieRemb* const remb_; 130 VieRemb* const remb_;
133 131
134 static const bool kEnableFrameRecording = false; 132 static const bool kEnableFrameRecording = false;
(...skipping 17 matching lines...) Expand all
152 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_; 150 const std::unique_ptr<RtcpBandwidthObserver> bandwidth_observer_;
153 // RtpRtcp modules, declared here as they use other members on construction. 151 // RtpRtcp modules, declared here as they use other members on construction.
154 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 152 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
155 PayloadRouter payload_router_; 153 PayloadRouter payload_router_;
156 VideoCaptureInput input_; 154 VideoCaptureInput input_;
157 }; 155 };
158 } // namespace internal 156 } // namespace internal
159 } // namespace webrtc 157 } // namespace webrtc
160 158
161 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 159 #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