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

Side by Side Diff: webrtc/api/call/audio_send_stream.h

Issue 2405183002: Moving WebRtcVoiceMediaChannel::SendSetCodec to AudioSendStream. (Closed)
Patch Set: removing ApplyMaxSendBitrate Created 4 years, 2 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 | « no previous file | webrtc/audio/audio_send_stream.h » ('j') | webrtc/audio/audio_send_stream.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 // passed to Call::CreateAudioSendStream(). 87 // passed to Call::CreateAudioSendStream().
88 // TODO(solenberg): Implement, once we configure codecs through the new API. 88 // TODO(solenberg): Implement, once we configure codecs through the new API.
89 // std::unique_ptr<AudioEncoder> encoder; 89 // std::unique_ptr<AudioEncoder> encoder;
90 int cng_payload_type = -1; // pt, or -1 to disable Comfort Noise Generator. 90 int cng_payload_type = -1; // pt, or -1 to disable Comfort Noise Generator.
91 91
92 // Bitrate limits used for variable audio bitrate streams. Set both to -1 to 92 // Bitrate limits used for variable audio bitrate streams. Set both to -1 to
93 // disable audio bitrate adaptation. 93 // disable audio bitrate adaptation.
94 // Note: This is still an experimental feature and not ready for real usage. 94 // Note: This is still an experimental feature and not ready for real usage.
95 int min_bitrate_kbps = -1; 95 int min_bitrate_kbps = -1;
96 int max_bitrate_kbps = -1; 96 int max_bitrate_kbps = -1;
97
98 int max_send_bitrate_bps = 0;
the sun 2016/10/13 13:15:05 is it possible to use the field above - max_bitrat
minyue-webrtc 2016/10/14 13:32:56 left over, to remove
99
100 struct SendCodecSpec {
101 SendCodecSpec() {
102 webrtc::CodecInst empty_inst = {0};
103 codec_inst = empty_inst;
104 codec_inst.pltype = -1;
105 }
106 bool operator==(const SendCodecSpec& rhs) const {
107 {
108 if (nack_enabled != rhs.nack_enabled) {
109 return false;
110 }
111 if (transport_cc_enabled != rhs.transport_cc_enabled) {
112 return false;
113 }
114 if (enable_codec_fec != rhs.enable_codec_fec) {
115 return false;
116 }
117 if (enable_opus_dtx != rhs.enable_opus_dtx) {
118 return false;
119 }
120 if (opus_max_playback_rate != rhs.opus_max_playback_rate) {
121 return false;
122 }
123 if (red_payload_type != rhs.red_payload_type) {
the sun 2016/10/13 13:15:05 I don't think this is used anymore
minyue-webrtc 2016/10/14 13:32:56 ok. but, it may be out of the scope of this CL.
124 return false;
125 }
126 if (cng_payload_type != rhs.cng_payload_type) {
127 return false;
128 }
129 if (cng_plfreq != rhs.cng_plfreq) {
130 return false;
131 }
132 if (codec_inst != rhs.codec_inst) {
133 return false;
134 }
135 return true;
136 }
137 }
138 bool operator!=(const SendCodecSpec& rhs) const {
139 return !(*this == rhs);
140 }
141
142 bool nack_enabled = false;
143 bool transport_cc_enabled = false;
144 bool enable_codec_fec = false;
145 bool enable_opus_dtx = false;
146 int opus_max_playback_rate = 0;
147 int red_payload_type = -1;
148 int cng_payload_type = -1;
149 int cng_plfreq = -1;
the sun 2016/10/13 13:15:05 expand to cng_payload_freq
minyue-webrtc 2016/10/14 13:32:56 ok. but, it may be out of the scope of this CL.
150 webrtc::CodecInst codec_inst;
151 } send_codec_spec;
97 }; 152 };
98 153
99 // Starts stream activity. 154 // Starts stream activity.
100 // When a stream is active, it can receive, process and deliver packets. 155 // When a stream is active, it can receive, process and deliver packets.
101 virtual void Start() = 0; 156 virtual void Start() = 0;
102 // Stops stream activity. 157 // Stops stream activity.
103 // When a stream is stopped, it can't receive, process or deliver packets. 158 // When a stream is stopped, it can't receive, process or deliver packets.
104 virtual void Stop() = 0; 159 virtual void Stop() = 0;
105 160
106 // TODO(solenberg): Make payload_type a config property instead. 161 // TODO(solenberg): Make payload_type a config property instead.
107 virtual bool SendTelephoneEvent(int payload_type, int event, 162 virtual bool SendTelephoneEvent(int payload_type, int event,
108 int duration_ms) = 0; 163 int duration_ms) = 0;
109 164
110 virtual void SetMuted(bool muted) = 0; 165 virtual void SetMuted(bool muted) = 0;
111 166
112 virtual Stats GetStats() const = 0; 167 virtual Stats GetStats() const = 0;
113 168
114 protected: 169 protected:
115 virtual ~AudioSendStream() {} 170 virtual ~AudioSendStream() {}
116 }; 171 };
117 } // namespace webrtc 172 } // namespace webrtc
118 173
119 #endif // WEBRTC_API_CALL_AUDIO_SEND_STREAM_H_ 174 #endif // WEBRTC_API_CALL_AUDIO_SEND_STREAM_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/audio/audio_send_stream.h » ('j') | webrtc/audio/audio_send_stream.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698