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

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

Issue 2440123002: Revert of H264 codec: Check profile-level-id when matching (Closed)
Patch Set: Rebase 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') | 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
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 }; 139 };
140 140
141 struct VideoCodec : public Codec { 141 struct VideoCodec : public Codec {
142 // Creates a codec with the given parameters. 142 // Creates a codec with the given parameters.
143 VideoCodec(int id, const std::string& name); 143 VideoCodec(int id, const std::string& name);
144 // Creates an empty codec. 144 // Creates an empty codec.
145 VideoCodec(); 145 VideoCodec();
146 VideoCodec(const VideoCodec& c); 146 VideoCodec(const VideoCodec& c);
147 virtual ~VideoCodec() = default; 147 virtual ~VideoCodec() = default;
148 148
149 // Indicates if this codec is compatible with the specified codec.
150 bool Matches(const VideoCodec& codec) const;
151
152 std::string ToString() const; 149 std::string ToString() const;
153 150
154 VideoCodec& operator=(const VideoCodec& c); 151 VideoCodec& operator=(const VideoCodec& c);
155 152
156 bool operator==(const VideoCodec& c) const; 153 bool operator==(const VideoCodec& c) const;
157 154
158 bool operator!=(const VideoCodec& c) const { 155 bool operator!=(const VideoCodec& c) const {
159 return !(*this == c); 156 return !(*this == c);
160 } 157 }
161 158
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 } 200 }
204 201
205 bool CodecNamesEq(const std::string& name1, const std::string& name2); 202 bool CodecNamesEq(const std::string& name1, const std::string& name2);
206 bool HasNack(const Codec& codec); 203 bool HasNack(const Codec& codec);
207 bool HasRemb(const Codec& codec); 204 bool HasRemb(const Codec& codec);
208 bool HasTransportCc(const Codec& codec); 205 bool HasTransportCc(const Codec& codec);
209 206
210 } // namespace cricket 207 } // namespace cricket
211 208
212 #endif // WEBRTC_MEDIA_BASE_CODEC_H_ 209 #endif // WEBRTC_MEDIA_BASE_CODEC_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/base/codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698