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

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 patch conflicts Created 5 years 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_unittest.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 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
921 921
922 struct DataMediaInfo { 922 struct DataMediaInfo {
923 void Clear() { 923 void Clear() {
924 senders.clear(); 924 senders.clear();
925 receivers.clear(); 925 receivers.clear();
926 } 926 }
927 std::vector<DataSenderInfo> senders; 927 std::vector<DataSenderInfo> senders;
928 std::vector<DataReceiverInfo> receivers; 928 std::vector<DataReceiverInfo> receivers;
929 }; 929 };
930 930
931 struct RtcpParameters {
932 bool reduced_size = false;
933 };
934
931 template <class Codec> 935 template <class Codec>
932 struct RtpParameters { 936 struct RtpParameters {
933 virtual std::string ToString() const { 937 virtual std::string ToString() const {
934 std::ostringstream ost; 938 std::ostringstream ost;
935 ost << "{"; 939 ost << "{";
936 ost << "codecs: " << VectorToString(codecs) << ", "; 940 ost << "codecs: " << VectorToString(codecs) << ", ";
937 ost << "extensions: " << VectorToString(extensions); 941 ost << "extensions: " << VectorToString(extensions);
938 ost << "}"; 942 ost << "}";
939 return ost.str(); 943 return ost.str();
940 } 944 }
941 945
942 std::vector<Codec> codecs; 946 std::vector<Codec> codecs;
943 std::vector<RtpHeaderExtension> extensions; 947 std::vector<RtpHeaderExtension> extensions;
944 // TODO(pthatcher): Add streams. 948 // TODO(pthatcher): Add streams.
949 RtcpParameters rtcp;
945 }; 950 };
946 951
947 template <class Codec, class Options> 952 template <class Codec, class Options>
948 struct RtpSendParameters : RtpParameters<Codec> { 953 struct RtpSendParameters : RtpParameters<Codec> {
949 std::string ToString() const override { 954 std::string ToString() const override {
950 std::ostringstream ost; 955 std::ostringstream ost;
951 ost << "{"; 956 ost << "{";
952 ost << "codecs: " << VectorToString(this->codecs) << ", "; 957 ost << "codecs: " << VectorToString(this->codecs) << ", ";
953 ost << "extensions: " << VectorToString(this->extensions) << ", "; 958 ost << "extensions: " << VectorToString(this->extensions) << ", ";
954 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", "; 959 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", ";
(...skipping 249 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
« no previous file with comments | « talk/app/webrtc/webrtcsdp_unittest.cc ('k') | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698