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

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: Fixing TODO comments. 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 906 matching lines...) Expand 10 before | Expand all | Expand 10 after
917 917
918 struct DataMediaInfo { 918 struct DataMediaInfo {
919 void Clear() { 919 void Clear() {
920 senders.clear(); 920 senders.clear();
921 receivers.clear(); 921 receivers.clear();
922 } 922 }
923 std::vector<DataSenderInfo> senders; 923 std::vector<DataSenderInfo> senders;
924 std::vector<DataReceiverInfo> receivers; 924 std::vector<DataReceiverInfo> receivers;
925 }; 925 };
926 926
927 struct RtcpParameters {
928 bool reduced_size = false;
929 };
930
927 template <class Codec> 931 template <class Codec>
928 struct RtpParameters { 932 struct RtpParameters {
929 virtual std::string ToString() { 933 virtual std::string ToString() {
930 std::ostringstream ost; 934 std::ostringstream ost;
931 ost << "{"; 935 ost << "{";
932 ost << "codecs: " << VectorToString(codecs) << ", "; 936 ost << "codecs: " << VectorToString(codecs) << ", ";
933 ost << "extensions: " << VectorToString(extensions); 937 ost << "extensions: " << VectorToString(extensions);
934 ost << "}"; 938 ost << "}";
935 return ost.str(); 939 return ost.str();
936 } 940 }
937 941
938 std::vector<Codec> codecs; 942 std::vector<Codec> codecs;
939 std::vector<RtpHeaderExtension> extensions; 943 std::vector<RtpHeaderExtension> extensions;
940 // TODO(pthatcher): Add streams. 944 // TODO(pthatcher): Add streams.
945 RtcpParameters rtcp;
941 }; 946 };
942 947
943 template <class Codec, class Options> 948 template <class Codec, class Options>
944 struct RtpSendParameters : RtpParameters<Codec> { 949 struct RtpSendParameters : RtpParameters<Codec> {
945 std::string ToString() override { 950 std::string ToString() override {
946 std::ostringstream ost; 951 std::ostringstream ost;
947 ost << "{"; 952 ost << "{";
948 ost << "codecs: " << VectorToString(this->codecs) << ", "; 953 ost << "codecs: " << VectorToString(this->codecs) << ", ";
949 ost << "extensions: " << VectorToString(this->extensions) << ", "; 954 ost << "extensions: " << VectorToString(this->extensions) << ", ";
950 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", "; 955 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", ";
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 // 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:
1205 // writable(bool) 1210 // writable(bool)
1206 sigslot::signal1<bool> SignalReadyToSend; 1211 sigslot::signal1<bool> SignalReadyToSend;
1207 // Signal for notifying that the remote side has closed the DataChannel. 1212 // Signal for notifying that the remote side has closed the DataChannel.
1208 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1213 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1209 }; 1214 };
1210 1215
1211 } // namespace cricket 1216 } // namespace cricket
1212 1217
1213 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1218 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698