| 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 910 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 921 virtual std::string ToString() const { | 921 virtual std::string ToString() const { |
| 922 std::ostringstream ost; | 922 std::ostringstream ost; |
| 923 ost << "{"; | 923 ost << "{"; |
| 924 ost << "codecs: " << VectorToString(codecs) << ", "; | 924 ost << "codecs: " << VectorToString(codecs) << ", "; |
| 925 ost << "extensions: " << VectorToString(extensions); | 925 ost << "extensions: " << VectorToString(extensions); |
| 926 ost << "}"; | 926 ost << "}"; |
| 927 return ost.str(); | 927 return ost.str(); |
| 928 } | 928 } |
| 929 | 929 |
| 930 std::vector<Codec> codecs; | 930 std::vector<Codec> codecs; |
| 931 // TODO(nisse): Delete, RTP extensions are really per-transport, not |
| 932 // per stream. Now unused for video receive streams. |
| 931 std::vector<webrtc::RtpExtension> extensions; | 933 std::vector<webrtc::RtpExtension> extensions; |
| 932 // TODO(pthatcher): Add streams. | 934 // TODO(pthatcher): Add streams. |
| 933 RtcpParameters rtcp; | 935 RtcpParameters rtcp; |
| 934 virtual ~RtpParameters() = default; | 936 virtual ~RtpParameters() = default; |
| 935 }; | 937 }; |
| 936 | 938 |
| 937 // TODO(deadbeef): Rename to RtpSenderParameters, since they're intended to | 939 // TODO(deadbeef): Rename to RtpSenderParameters, since they're intended to |
| 938 // encapsulate all the parameters needed for an RtpSender. | 940 // encapsulate all the parameters needed for an RtpSender. |
| 939 template <class Codec> | 941 template <class Codec> |
| 940 struct RtpSendParameters : RtpParameters<Codec> { | 942 struct RtpSendParameters : RtpParameters<Codec> { |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1245 const char*, | 1247 const char*, |
| 1246 size_t> SignalDataReceived; | 1248 size_t> SignalDataReceived; |
| 1247 // Signal when the media channel is ready to send the stream. Arguments are: | 1249 // Signal when the media channel is ready to send the stream. Arguments are: |
| 1248 // writable(bool) | 1250 // writable(bool) |
| 1249 sigslot::signal1<bool> SignalReadyToSend; | 1251 sigslot::signal1<bool> SignalReadyToSend; |
| 1250 }; | 1252 }; |
| 1251 | 1253 |
| 1252 } // namespace cricket | 1254 } // namespace cricket |
| 1253 | 1255 |
| 1254 #endif // MEDIA_BASE_MEDIACHANNEL_H_ | 1256 #endif // MEDIA_BASE_MEDIACHANNEL_H_ |
| OLD | NEW |