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

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

Issue 2408153002: Remove cricket::VideoCodec with, height and framerate properties (Closed)
Patch Set: Rebased Created 4 years, 2 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/api/webrtcsdp_unittest.cc ('k') | 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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 AudioCodec& operator=(const AudioCodec& c); 132 AudioCodec& operator=(const AudioCodec& c);
133 133
134 bool operator==(const AudioCodec& c) const; 134 bool operator==(const AudioCodec& c) const;
135 135
136 bool operator!=(const AudioCodec& c) const { 136 bool operator!=(const AudioCodec& c) const {
137 return !(*this == c); 137 return !(*this == c);
138 } 138 }
139 }; 139 };
140 140
141 struct VideoCodec : public Codec { 141 struct VideoCodec : public Codec {
142 int width;
143 int height;
144 int framerate;
145
146 // Creates a codec with the given parameters. 142 // Creates a codec with the given parameters.
147 VideoCodec(int id,
148 const std::string& name,
149 int width,
150 int height,
151 int framerate);
152 VideoCodec(int id, const std::string& name); 143 VideoCodec(int id, const std::string& name);
153 // Creates an empty codec. 144 // Creates an empty codec.
154 VideoCodec(); 145 VideoCodec();
155 VideoCodec(const VideoCodec& c); 146 VideoCodec(const VideoCodec& c);
156 virtual ~VideoCodec() = default; 147 virtual ~VideoCodec() = default;
157 148
158 // Indicates if this codec is compatible with the specified codec. 149 // Indicates if this codec is compatible with the specified codec.
159 bool Matches(const VideoCodec& codec) const; 150 bool Matches(const VideoCodec& codec) const;
160 151
161 std::string ToString() const; 152 std::string ToString() const;
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 } 203 }
213 204
214 bool CodecNamesEq(const std::string& name1, const std::string& name2); 205 bool CodecNamesEq(const std::string& name1, const std::string& name2);
215 bool HasNack(const Codec& codec); 206 bool HasNack(const Codec& codec);
216 bool HasRemb(const Codec& codec); 207 bool HasRemb(const Codec& codec);
217 bool HasTransportCc(const Codec& codec); 208 bool HasTransportCc(const Codec& codec);
218 209
219 } // namespace cricket 210 } // namespace cricket
220 211
221 #endif // WEBRTC_MEDIA_BASE_CODEC_H_ 212 #endif // WEBRTC_MEDIA_BASE_CODEC_H_
OLDNEW
« no previous file with comments | « webrtc/api/webrtcsdp_unittest.cc ('k') | webrtc/media/base/codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698