| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_MEDIA_BASE_CODEC_H_ | 11 #ifndef WEBRTC_MEDIA_BASE_CODEC_H_ |
| 12 #define WEBRTC_MEDIA_BASE_CODEC_H_ | 12 #define WEBRTC_MEDIA_BASE_CODEC_H_ |
| 13 | 13 |
| 14 #include <map> | 14 #include <map> |
| 15 #include <set> | 15 #include <set> |
| 16 #include <string> | 16 #include <string> |
| 17 #include <vector> | 17 #include <vector> |
| 18 | 18 |
| 19 #include "webrtc/api/rtpparameters.h" | 19 #include "webrtc/api/rtpparameters.h" |
| 20 #include "webrtc/common_types.h" | 20 #include "webrtc/common_types.h" |
| 21 #include "webrtc/media/base/mediaconstants.h" | 21 #include "webrtc/media/base/mediaconstants.h" |
| 22 | 22 |
| 23 namespace cricket { | 23 namespace cricket { |
| 24 | 24 |
| 25 typedef std::map<std::string, std::string> CodecParameterMap; | 25 typedef std::map<std::string, std::string> CodecParameterMap; |
| 26 | 26 |
| 27 class FeedbackParam { | 27 class FeedbackParam { |
| 28 public: | 28 public: |
| 29 FeedbackParam() {} |
| 29 FeedbackParam(const std::string& id, const std::string& param) | 30 FeedbackParam(const std::string& id, const std::string& param) |
| 30 : id_(id), | 31 : id_(id), |
| 31 param_(param) { | 32 param_(param) { |
| 32 } | 33 } |
| 33 explicit FeedbackParam(const std::string& id) | 34 explicit FeedbackParam(const std::string& id) |
| 34 : id_(id), | 35 : id_(id), |
| 35 param_(kParamValueEmpty) { | 36 param_(kParamValueEmpty) { |
| 36 } | 37 } |
| 37 bool operator==(const FeedbackParam& other) const; | 38 bool operator==(const FeedbackParam& other) const; |
| 38 | 39 |
| (...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 bool HasTransportCc(const Codec& codec); | 226 bool HasTransportCc(const Codec& codec); |
| 226 // Returns the first codec in |supported_codecs| that matches |codec|, or | 227 // Returns the first codec in |supported_codecs| that matches |codec|, or |
| 227 // nullptr if no codec matches. | 228 // nullptr if no codec matches. |
| 228 const VideoCodec* FindMatchingCodec( | 229 const VideoCodec* FindMatchingCodec( |
| 229 const std::vector<VideoCodec>& supported_codecs, | 230 const std::vector<VideoCodec>& supported_codecs, |
| 230 const VideoCodec& codec); | 231 const VideoCodec& codec); |
| 231 | 232 |
| 232 } // namespace cricket | 233 } // namespace cricket |
| 233 | 234 |
| 234 #endif // WEBRTC_MEDIA_BASE_CODEC_H_ | 235 #endif // WEBRTC_MEDIA_BASE_CODEC_H_ |
| OLD | NEW |