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

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

Issue 2651883010: Adding C++ versions of currently spec'd "RtpParameters" structs. (Closed)
Patch Set: Update unit tests (due to switch from special-case values to rtc::Optional) Created 3 years, 10 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/rtpparameters.h ('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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 VideoCodec(VideoCodec&& c); 155 VideoCodec(VideoCodec&& c);
156 virtual ~VideoCodec() = default; 156 virtual ~VideoCodec() = default;
157 157
158 // Indicates if this video codec is the same as the other video codec, e.g. if 158 // Indicates if this video codec is the same as the other video codec, e.g. if
159 // they are both VP8 or VP9, or if they are both H264 with the same H264 159 // they are both VP8 or VP9, or if they are both H264 with the same H264
160 // profile. H264 levels however are not compared. 160 // profile. H264 levels however are not compared.
161 bool Matches(const VideoCodec& codec) const; 161 bool Matches(const VideoCodec& codec) const;
162 162
163 std::string ToString() const; 163 std::string ToString() const;
164 164
165 webrtc::RtpCodecParameters ToCodecParameters() const override;
166
165 VideoCodec& operator=(const VideoCodec& c); 167 VideoCodec& operator=(const VideoCodec& c);
166 VideoCodec& operator=(VideoCodec&& c); 168 VideoCodec& operator=(VideoCodec&& c);
167 169
168 bool operator==(const VideoCodec& c) const; 170 bool operator==(const VideoCodec& c) const;
169 171
170 bool operator!=(const VideoCodec& c) const { 172 bool operator!=(const VideoCodec& c) const {
171 return !(*this == c); 173 return !(*this == c);
172 } 174 }
173 175
174 static VideoCodec CreateRtxCodec(int rtx_payload_type, 176 static VideoCodec CreateRtxCodec(int rtx_payload_type,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 bool HasTransportCc(const Codec& codec); 225 bool HasTransportCc(const Codec& codec);
224 // Returns the first codec in |supported_codecs| that matches |codec|, or 226 // Returns the first codec in |supported_codecs| that matches |codec|, or
225 // nullptr if no codec matches. 227 // nullptr if no codec matches.
226 const VideoCodec* FindMatchingCodec( 228 const VideoCodec* FindMatchingCodec(
227 const std::vector<VideoCodec>& supported_codecs, 229 const std::vector<VideoCodec>& supported_codecs,
228 const VideoCodec& codec); 230 const VideoCodec& codec);
229 231
230 } // namespace cricket 232 } // namespace cricket
231 233
232 #endif // WEBRTC_MEDIA_BASE_CODEC_H_ 234 #endif // WEBRTC_MEDIA_BASE_CODEC_H_
OLDNEW
« no previous file with comments | « webrtc/api/rtpparameters.h ('k') | webrtc/media/base/codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698