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

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

Issue 1641863004: Consolidate setters into SetRecvParameters. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: dcheck Created 4 years, 10 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 | « no previous file | 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 933 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 RtcpParameters rtcp; 944 RtcpParameters rtcp;
945 }; 945 };
946 946
947 template <class Codec, class Options> 947 template <class Codec, class Options>
948 struct RtpSendParameters : RtpParameters<Codec> { 948 struct RtpSendParameters : RtpParameters<Codec> {
949 std::string ToString() const override { 949 std::string ToString() const override {
950 std::ostringstream ost; 950 std::ostringstream ost;
951 ost << "{"; 951 ost << "{";
952 ost << "codecs: " << VectorToString(this->codecs) << ", "; 952 ost << "codecs: " << VectorToString(this->codecs) << ", ";
953 ost << "extensions: " << VectorToString(this->extensions) << ", "; 953 ost << "extensions: " << VectorToString(this->extensions) << ", ";
954 ost << "max_bandiwidth_bps: " << max_bandwidth_bps << ", "; 954 ost << "max_bandwidth_bps: " << max_bandwidth_bps << ", ";
955 ost << "options: " << options.ToString(); 955 ost << "options: " << options.ToString();
956 ost << "}"; 956 ost << "}";
957 return ost.str(); 957 return ost.str();
958 } 958 }
959 959
960 int max_bandwidth_bps = -1; 960 int max_bandwidth_bps = -1;
961 Options options; 961 Options options;
962 }; 962 };
963 963
964 struct AudioSendParameters : RtpSendParameters<AudioCodec, AudioOptions> { 964 struct AudioSendParameters : RtpSendParameters<AudioCodec, AudioOptions> {
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 return "{}"; 1158 return "{}";
1159 } 1159 }
1160 }; 1160 };
1161 1161
1162 struct DataSendParameters : RtpSendParameters<DataCodec, DataOptions> { 1162 struct DataSendParameters : RtpSendParameters<DataCodec, DataOptions> {
1163 std::string ToString() const { 1163 std::string ToString() const {
1164 std::ostringstream ost; 1164 std::ostringstream ost;
1165 // Options and extensions aren't used. 1165 // Options and extensions aren't used.
1166 ost << "{"; 1166 ost << "{";
1167 ost << "codecs: " << VectorToString(codecs) << ", "; 1167 ost << "codecs: " << VectorToString(codecs) << ", ";
1168 ost << "max_bandiwidth_bps: " << max_bandwidth_bps; 1168 ost << "max_bandwidth_bps: " << max_bandwidth_bps;
1169 ost << "}"; 1169 ost << "}";
1170 return ost.str(); 1170 return ost.str();
1171 } 1171 }
1172 }; 1172 };
1173 1173
1174 struct DataRecvParameters : RtpParameters<DataCodec> { 1174 struct DataRecvParameters : RtpParameters<DataCodec> {
1175 }; 1175 };
1176 1176
1177 class DataMediaChannel : public MediaChannel { 1177 class DataMediaChannel : public MediaChannel {
1178 public: 1178 public:
(...skipping 29 matching lines...) Expand all
1208 // Signal when the media channel is ready to send the stream. Arguments are: 1208 // Signal when the media channel is ready to send the stream. Arguments are:
1209 // writable(bool) 1209 // writable(bool)
1210 sigslot::signal1<bool> SignalReadyToSend; 1210 sigslot::signal1<bool> SignalReadyToSend;
1211 // Signal for notifying that the remote side has closed the DataChannel. 1211 // Signal for notifying that the remote side has closed the DataChannel.
1212 sigslot::signal1<uint32_t> SignalStreamClosedRemotely; 1212 sigslot::signal1<uint32_t> SignalStreamClosedRemotely;
1213 }; 1213 };
1214 1214
1215 } // namespace cricket 1215 } // namespace cricket
1216 1216
1217 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_ 1217 #endif // TALK_MEDIA_BASE_MEDIACHANNEL_H_
OLDNEW
« no previous file with comments | « no previous file | talk/media/webrtc/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698