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

Side by Side Diff: talk/media/base/mediachannel.h

Issue 1308023004: Add support for negotiating RTCP with reduced size. Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 | « talk/app/webrtc/webrtcsdp.cc ('k') | talk/media/webrtc/webrtcvideoengine2.h » ('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 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after
1002 1002
1003 struct DataMediaInfo { 1003 struct DataMediaInfo {
1004 void Clear() { 1004 void Clear() {
1005 senders.clear(); 1005 senders.clear();
1006 receivers.clear(); 1006 receivers.clear();
1007 } 1007 }
1008 std::vector<DataSenderInfo> senders; 1008 std::vector<DataSenderInfo> senders;
1009 std::vector<DataReceiverInfo> receivers; 1009 std::vector<DataReceiverInfo> receivers;
1010 }; 1010 };
1011 1011
1012 struct RtcpParameters {
1013 bool reduced_size = false;
1014 };
1015
1012 template <class Codec> 1016 template <class Codec>
1013 struct RtpParameters { 1017 struct RtpParameters {
1014 virtual std::string ToString() { 1018 virtual std::string ToString() {
1015 std::ostringstream ost; 1019 std::ostringstream ost;
1016 ost << "{"; 1020 ost << "{";
1017 ost << "codecs: " << VectorToString(codecs) << ", "; 1021 ost << "codecs: " << VectorToString(codecs) << ", ";
1018 ost << "extensions: " << VectorToString(extensions); 1022 ost << "extensions: " << VectorToString(extensions);
1019 ost << "}"; 1023 ost << "}";
1020 return ost.str(); 1024 return ost.str();
1021 } 1025 }
1022 1026
1023 std::vector<Codec> codecs; 1027 std::vector<Codec> codecs;
1024 std::vector<RtpHeaderExtension> extensions; 1028 std::vector<RtpHeaderExtension> extensions;
1025 // TODO(pthatcher): Add streams. 1029 // TODO(pthatcher): Add streams.
1030 RtcpParameters rtcp;
1026 }; 1031 };
1027 1032
1028 template <class Codec, class Options> 1033 template <class Codec, class Options>
1029 struct RtpSendParameters : RtpParameters<Codec> { 1034 struct RtpSendParameters : RtpParameters<Codec> {
1030 std::string ToString() override { 1035 std::string ToString() override {
1031 std::ostringstream ost; 1036 std::ostringstream ost;
1032 ost << "{"; 1037 ost << "{";
1033 ost << "codecs: " << VectorToString(this->codecs) << ", "; 1038 ost << "codecs: " << VectorToString(this->codecs) << ", ";
1034 ost << "extensions: " << VectorToString(this->extensions) << ", "; 1039 ost << "extensions: " << VectorToString(this->extensions) << ", ";
1035 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", "; 1040 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", ";
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
1362 // Signal when the media channel is ready to send the stream. Arguments are: 1367 // Signal when the media channel is ready to send the stream. Arguments are:
1363 // writable(bool) 1368 // writable(bool)
1364 sigslot::signal1<bool> SignalReadyToSend; 1369 sigslot::signal1<bool> SignalReadyToSend;
1365 // Signal for notifying that the remote side has closed the DataChannel. 1370 // Signal for notifying that the remote side has closed the DataChannel.
1366 sigslot::signal1<uint32> SignalStreamClosedRemotely; 1371 sigslot::signal1<uint32> SignalStreamClosedRemotely;
1367 }; 1372 };
1368 1373
1369 } // namespace cricket 1374 } // namespace cricket
1370 1375
1371 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1376 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/webrtcsdp.cc ('k') | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698