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

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

Issue 1418123003: Adding reduced size RTCP configuration down to the video stream level. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month 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 * 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 950 matching lines...) Expand 10 before | Expand all | Expand 10 after
961 961
962 struct DataMediaInfo { 962 struct DataMediaInfo {
963 void Clear() { 963 void Clear() {
964 senders.clear(); 964 senders.clear();
965 receivers.clear(); 965 receivers.clear();
966 } 966 }
967 std::vector<DataSenderInfo> senders; 967 std::vector<DataSenderInfo> senders;
968 std::vector<DataReceiverInfo> receivers; 968 std::vector<DataReceiverInfo> receivers;
969 }; 969 };
970 970
971 struct RtcpParameters {
972 bool reduced_size = false;
973 };
974
971 template <class Codec> 975 template <class Codec>
972 struct RtpParameters { 976 struct RtpParameters {
973 virtual std::string ToString() { 977 virtual std::string ToString() {
974 std::ostringstream ost; 978 std::ostringstream ost;
975 ost << "{"; 979 ost << "{";
976 ost << "codecs: " << VectorToString(codecs) << ", "; 980 ost << "codecs: " << VectorToString(codecs) << ", ";
977 ost << "extensions: " << VectorToString(extensions); 981 ost << "extensions: " << VectorToString(extensions);
978 ost << "}"; 982 ost << "}";
979 return ost.str(); 983 return ost.str();
980 } 984 }
981 985
982 std::vector<Codec> codecs; 986 std::vector<Codec> codecs;
983 std::vector<RtpHeaderExtension> extensions; 987 std::vector<RtpHeaderExtension> extensions;
984 // TODO(pthatcher): Add streams. 988 // TODO(pthatcher): Add streams.
989 RtcpParameters rtcp;
985 }; 990 };
986 991
987 template <class Codec, class Options> 992 template <class Codec, class Options>
988 struct RtpSendParameters : RtpParameters<Codec> { 993 struct RtpSendParameters : RtpParameters<Codec> {
989 std::string ToString() override { 994 std::string ToString() override {
990 std::ostringstream ost; 995 std::ostringstream ost;
991 ost << "{"; 996 ost << "{";
992 ost << "codecs: " << VectorToString(this->codecs) << ", "; 997 ost << "codecs: " << VectorToString(this->codecs) << ", ";
993 ost << "extensions: " << VectorToString(this->extensions) << ", "; 998 ost << "extensions: " << VectorToString(this->extensions) << ", ";
994 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", "; 999 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", ";
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 // Signal when the media channel is ready to send the stream. Arguments are: 1253 // Signal when the media channel is ready to send the stream. Arguments are:
1249 // writable(bool) 1254 // writable(bool)
1250 sigslot::signal1<bool> SignalReadyToSend; 1255 sigslot::signal1<bool> SignalReadyToSend;
1251 // Signal for notifying that the remote side has closed the DataChannel. 1256 // Signal for notifying that the remote side has closed the DataChannel.
1252 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1257 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1253 }; 1258 };
1254 1259
1255 } // namespace cricket 1260 } // namespace cricket
1256 1261
1257 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1262 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698