OLD | NEW |
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
160 } | 160 } |
161 | 161 |
162 void Codec::IntersectFeedbackParams(const Codec& other) { | 162 void Codec::IntersectFeedbackParams(const Codec& other) { |
163 feedback_params.Intersect(other.feedback_params); | 163 feedback_params.Intersect(other.feedback_params); |
164 } | 164 } |
165 | 165 |
166 AudioCodec::AudioCodec(int id, | 166 AudioCodec::AudioCodec(int id, |
167 const std::string& name, | 167 const std::string& name, |
168 int clockrate, | 168 int clockrate, |
169 int bitrate, | 169 int bitrate, |
170 int channels, | 170 size_t channels, |
171 int preference) | 171 int preference) |
172 : Codec(id, name, clockrate, preference), | 172 : Codec(id, name, clockrate, preference), |
173 bitrate(bitrate), | 173 bitrate(bitrate), |
174 channels(channels) { | 174 channels(channels) { |
175 } | 175 } |
176 | 176 |
177 AudioCodec::AudioCodec() : Codec(), bitrate(0), channels(0) { | 177 AudioCodec::AudioCodec() : Codec(), bitrate(0), channels(0) { |
178 } | 178 } |
179 | 179 |
180 AudioCodec::AudioCodec(const AudioCodec& c) = default; | 180 AudioCodec::AudioCodec(const AudioCodec& c) = default; |
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
339 bool HasTransportCc(const VideoCodec& codec) { | 339 bool HasTransportCc(const VideoCodec& codec) { |
340 return codec.HasFeedbackParam( | 340 return codec.HasFeedbackParam( |
341 FeedbackParam(kRtcpFbParamTransportCc, kParamValueEmpty)); | 341 FeedbackParam(kRtcpFbParamTransportCc, kParamValueEmpty)); |
342 } | 342 } |
343 | 343 |
344 bool CodecNamesEq(const std::string& name1, const std::string& name2) { | 344 bool CodecNamesEq(const std::string& name1, const std::string& name2) { |
345 return _stricmp(name1.c_str(), name2.c_str()) == 0; | 345 return _stricmp(name1.c_str(), name2.c_str()) == 0; |
346 } | 346 } |
347 | 347 |
348 } // namespace cricket | 348 } // namespace cricket |
OLD | NEW |