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

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

Issue 1754283002: Make ReconfigureVideoEncoder void. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 ~VideoSendStream() override; 55 ~VideoSendStream() override;
56 56
57 // webrtc::SendStream implementation. 57 // webrtc::SendStream implementation.
58 void Start() override; 58 void Start() override;
59 void Stop() override; 59 void Stop() override;
60 void SignalNetworkState(NetworkState state) override; 60 void SignalNetworkState(NetworkState state) override;
61 bool DeliverRtcp(const uint8_t* packet, size_t length) override; 61 bool DeliverRtcp(const uint8_t* packet, size_t length) override;
62 62
63 // webrtc::VideoSendStream implementation. 63 // webrtc::VideoSendStream implementation.
64 VideoCaptureInput* Input() override; 64 VideoCaptureInput* Input() override;
65 bool ReconfigureVideoEncoder(const VideoEncoderConfig& config) override; 65 void ReconfigureVideoEncoder(const VideoEncoderConfig& config) override;
66 Stats GetStats() override; 66 Stats GetStats() override;
67 67
68 // webrtc::CpuOveruseObserver implementation. 68 // webrtc::CpuOveruseObserver implementation.
69 void OveruseDetected() override; 69 void OveruseDetected() override;
70 void NormalUsage() override; 70 void NormalUsage() override;
71 71
72 typedef std::map<uint32_t, RtpState> RtpStateMap; 72 typedef std::map<uint32_t, RtpState> RtpStateMap;
73 RtpStateMap GetRtpStates() const; 73 RtpStateMap GetRtpStates() const;
74 74
75 int GetPaddingNeededBps() const; 75 int GetPaddingNeededBps() const;
76 76
77 private: 77 private:
78 bool SetSendCodec(VideoCodec video_codec);
79 void ConfigureSsrcs(); 78 void ConfigureSsrcs();
80 79
81 SendStatisticsProxy stats_proxy_; 80 SendStatisticsProxy stats_proxy_;
82 EncodedFrameCallbackAdapter encoded_frame_proxy_; 81 EncodedFrameCallbackAdapter encoded_frame_proxy_;
83 const VideoSendStream::Config config_; 82 const VideoSendStream::Config config_;
84 std::map<uint32_t, RtpState> suspended_ssrcs_; 83 std::map<uint32_t, RtpState> suspended_ssrcs_;
85 84
86 ProcessThread* const module_process_thread_; 85 ProcessThread* const module_process_thread_;
87 CallStats* const call_stats_; 86 CallStats* const call_stats_;
88 CongestionController* const congestion_controller_; 87 CongestionController* const congestion_controller_;
89 VieRemb* const remb_; 88 VieRemb* const remb_;
90 89
91 OveruseFrameDetector overuse_detector_; 90 OveruseFrameDetector overuse_detector_;
92 PayloadRouter payload_router_; 91 PayloadRouter payload_router_;
93 EncoderStateFeedback encoder_feedback_; 92 EncoderStateFeedback encoder_feedback_;
94 ViEChannel vie_channel_; 93 ViEChannel vie_channel_;
95 ViEReceiver* const vie_receiver_; 94 ViEReceiver* const vie_receiver_;
96 ViEEncoder vie_encoder_; 95 ViEEncoder vie_encoder_;
97 VideoCodingModule* const vcm_; 96 VideoCodingModule* const vcm_;
98 // TODO(pbos): Move RtpRtcp ownership to VideoSendStream. 97 // TODO(pbos): Move RtpRtcp ownership to VideoSendStream.
99 // RtpRtcp modules, currently owned by ViEChannel but ownership should 98 // RtpRtcp modules, currently owned by ViEChannel but ownership should
100 // eventually move here. 99 // eventually move here.
101 const std::vector<RtpRtcp*> rtp_rtcp_modules_; 100 const std::vector<RtpRtcp*> rtp_rtcp_modules_;
102 VideoCaptureInput input_; 101 VideoCaptureInput input_;
103 }; 102 };
104 } // namespace internal 103 } // namespace internal
105 } // namespace webrtc 104 } // namespace webrtc
106 105
107 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_ 106 #endif // WEBRTC_VIDEO_VIDEO_SEND_STREAM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698