Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 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 881 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 892 virtual std::string ToString() const { | 892 virtual std::string ToString() const { |
| 893 std::ostringstream ost; | 893 std::ostringstream ost; |
| 894 ost << "{"; | 894 ost << "{"; |
| 895 ost << "codecs: " << VectorToString(codecs) << ", "; | 895 ost << "codecs: " << VectorToString(codecs) << ", "; |
| 896 ost << "extensions: " << VectorToString(extensions); | 896 ost << "extensions: " << VectorToString(extensions); |
| 897 ost << "}"; | 897 ost << "}"; |
| 898 return ost.str(); | 898 return ost.str(); |
| 899 } | 899 } |
| 900 | 900 |
| 901 std::vector<Codec> codecs; | 901 std::vector<Codec> codecs; |
| 902 // TODO(nisse): Delete, RTP extensions are really per-transport, not | |
| 903 // per stream. Now unused for video receive streams. | |
|
pthatcher1
2017/04/29 00:25:18
These are not per-stream, these are per-m-line. W
| |
| 902 std::vector<webrtc::RtpExtension> extensions; | 904 std::vector<webrtc::RtpExtension> extensions; |
| 903 // TODO(pthatcher): Add streams. | 905 // TODO(pthatcher): Add streams. |
| 904 RtcpParameters rtcp; | 906 RtcpParameters rtcp; |
| 905 virtual ~RtpParameters() = default; | 907 virtual ~RtpParameters() = default; |
| 906 }; | 908 }; |
| 907 | 909 |
| 908 // TODO(deadbeef): Rename to RtpSenderParameters, since they're intended to | 910 // TODO(deadbeef): Rename to RtpSenderParameters, since they're intended to |
| 909 // encapsulate all the parameters needed for an RtpSender. | 911 // encapsulate all the parameters needed for an RtpSender. |
| 910 template <class Codec> | 912 template <class Codec> |
| 911 struct RtpSendParameters : RtpParameters<Codec> { | 913 struct RtpSendParameters : RtpParameters<Codec> { |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1205 const char*, | 1207 const char*, |
| 1206 size_t> SignalDataReceived; | 1208 size_t> SignalDataReceived; |
| 1207 // Signal when the media channel is ready to send the stream. Arguments are: | 1209 // Signal when the media channel is ready to send the stream. Arguments are: |
| 1208 // writable(bool) | 1210 // writable(bool) |
| 1209 sigslot::signal1<bool> SignalReadyToSend; | 1211 sigslot::signal1<bool> SignalReadyToSend; |
| 1210 }; | 1212 }; |
| 1211 | 1213 |
| 1212 } // namespace cricket | 1214 } // namespace cricket |
| 1213 | 1215 |
| 1214 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ | 1216 #endif // WEBRTC_MEDIA_BASE_MEDIACHANNEL_H_ |
| OLD | NEW |