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

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

Issue 2483173002: Negotiate H264 profiles in SDP (Closed)
Patch Set: Created 4 years, 1 month 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 | webrtc/media/base/codec.cc » ('j') | webrtc/media/base/codec.cc » ('J')
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
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // Creates a codec with the given parameters. 147 // Creates a codec with the given parameters.
148 VideoCodec(int id, const std::string& name); 148 VideoCodec(int id, const std::string& name);
149 // Creates a codec with the given name and empty id. 149 // Creates a codec with the given name and empty id.
150 explicit VideoCodec(const std::string& name); 150 explicit VideoCodec(const std::string& name);
151 // Creates an empty codec. 151 // Creates an empty codec.
152 VideoCodec(); 152 VideoCodec();
153 VideoCodec(const VideoCodec& c); 153 VideoCodec(const VideoCodec& c);
154 VideoCodec(VideoCodec&& c); 154 VideoCodec(VideoCodec&& c);
155 virtual ~VideoCodec() = default; 155 virtual ~VideoCodec() = default;
156 156
157 // Indicates if this codec is compatible with the specified codec. For H264,
158 // the profiles must be the same. H264 levels however are not compared.
hta-webrtc 2016/11/08 13:59:53 if Codec has a Matches function, shouldn't there b
magjed_webrtc 2016/11/08 16:18:26 No, this is overloading, not overriding.
159 bool Matches(const VideoCodec& codec) const;
hta-webrtc 2016/11/08 13:59:53 This is actually an issue with the concept of "cod
magjed_webrtc 2016/11/08 16:18:26 The codec here does not really encompass both an e
160
157 std::string ToString() const; 161 std::string ToString() const;
158 162
159 VideoCodec& operator=(const VideoCodec& c); 163 VideoCodec& operator=(const VideoCodec& c);
160 VideoCodec& operator=(VideoCodec&& c); 164 VideoCodec& operator=(VideoCodec&& c);
161 165
162 bool operator==(const VideoCodec& c) const; 166 bool operator==(const VideoCodec& c) const;
163 167
164 bool operator!=(const VideoCodec& c) const { 168 bool operator!=(const VideoCodec& c) const {
165 return !(*this == c); 169 return !(*this == c);
166 } 170 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 webrtc::VideoCodecType CodecTypeFromName(const std::string& name); 220 webrtc::VideoCodecType CodecTypeFromName(const std::string& name);
217 bool HasNack(const Codec& codec); 221 bool HasNack(const Codec& codec);
218 bool HasRemb(const Codec& codec); 222 bool HasRemb(const Codec& codec);
219 bool HasTransportCc(const Codec& codec); 223 bool HasTransportCc(const Codec& codec);
220 bool IsCodecSupported(const std::vector<VideoCodec>& supported_codecs, 224 bool IsCodecSupported(const std::vector<VideoCodec>& supported_codecs,
221 const VideoCodec& codec); 225 const VideoCodec& codec);
222 226
223 } // namespace cricket 227 } // namespace cricket
224 228
225 #endif // WEBRTC_MEDIA_BASE_CODEC_H_ 229 #endif // WEBRTC_MEDIA_BASE_CODEC_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/base/codec.cc » ('j') | webrtc/media/base/codec.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698