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

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

Issue 1409133006: Make SendStatisticsProxy outlive ViEChannel. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void NormalUsage() override; 65 void NormalUsage() override;
66 66
67 typedef std::map<uint32_t, RtpState> RtpStateMap; 67 typedef std::map<uint32_t, RtpState> RtpStateMap;
68 RtpStateMap GetRtpStates() const; 68 RtpStateMap GetRtpStates() const;
69 69
70 int64_t GetRtt() const; 70 int64_t GetRtt() const;
71 71
72 private: 72 private:
73 bool SetSendCodec(VideoCodec video_codec); 73 bool SetSendCodec(VideoCodec video_codec);
74 void ConfigureSsrcs(); 74 void ConfigureSsrcs();
75
76 SendStatisticsProxy stats_proxy_;
75 TransportAdapter transport_adapter_; 77 TransportAdapter transport_adapter_;
76 EncodedFrameCallbackAdapter encoded_frame_proxy_; 78 EncodedFrameCallbackAdapter encoded_frame_proxy_;
77 const VideoSendStream::Config config_; 79 const VideoSendStream::Config config_;
78 VideoEncoderConfig encoder_config_; 80 VideoEncoderConfig encoder_config_;
79 std::map<uint32_t, RtpState> suspended_ssrcs_; 81 std::map<uint32_t, RtpState> suspended_ssrcs_;
80 82
81 ProcessThread* const module_process_thread_; 83 ProcessThread* const module_process_thread_;
82 CallStats* const call_stats_; 84 CallStats* const call_stats_;
83 CongestionController* const congestion_controller_; 85 CongestionController* const congestion_controller_;
84 86
85 rtc::scoped_ptr<VideoCaptureInput> input_; 87 rtc::scoped_ptr<VideoCaptureInput> input_;
86 rtc::scoped_ptr<ViEChannel> vie_channel_; 88 rtc::scoped_ptr<ViEChannel> vie_channel_;
87 rtc::scoped_ptr<ViEEncoder> vie_encoder_; 89 rtc::scoped_ptr<ViEEncoder> vie_encoder_;
88 rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_; 90 rtc::scoped_ptr<EncoderStateFeedback> encoder_feedback_;
89 91
90 // Used as a workaround to indicate that we should be using the configured 92 // Used as a workaround to indicate that we should be using the configured
91 // start bitrate initially, instead of the one reported by VideoEngine (which 93 // start bitrate initially, instead of the one reported by VideoEngine (which
92 // defaults to too high). 94 // defaults to too high).
93 bool use_config_bitrate_; 95 bool use_config_bitrate_;
94
95 SendStatisticsProxy stats_proxy_;
96 }; 96 };
97 } // namespace internal 97 } // namespace internal
98 } // namespace webrtc 98 } // namespace webrtc
99 99
100 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 100 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/video/video_send_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698