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

Side by Side Diff: webrtc/media/base/codec.h

Issue 2675173003: Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc. (Closed)
Patch Set: Add memcheck suppression for end-to-end tests. Created 3 years, 9 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 | « webrtc/config.cc ('k') | webrtc/media/base/fakemediaengine.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 * 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() = default;
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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 bool HasTransportCc(const Codec& codec); 248 bool HasTransportCc(const Codec& codec);
248 // Returns the first codec in |supported_codecs| that matches |codec|, or 249 // Returns the first codec in |supported_codecs| that matches |codec|, or
249 // nullptr if no codec matches. 250 // nullptr if no codec matches.
250 const VideoCodec* FindMatchingCodec( 251 const VideoCodec* FindMatchingCodec(
251 const std::vector<VideoCodec>& supported_codecs, 252 const std::vector<VideoCodec>& supported_codecs,
252 const VideoCodec& codec); 253 const VideoCodec& codec);
253 254
254 } // namespace cricket 255 } // namespace cricket
255 256
256 #endif // WEBRTC_MEDIA_BASE_CODEC_H_ 257 #endif // WEBRTC_MEDIA_BASE_CODEC_H_
OLDNEW
« no previous file with comments | « webrtc/config.cc ('k') | webrtc/media/base/fakemediaengine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698