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

Side by Side Diff: webrtc/ortc/rtpparametersconversion.h

Issue 3011943002: Move optional.h to webrtc/api/ (Closed)
Patch Set: Created 3 years, 3 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/ortc/BUILD.gn ('k') | webrtc/p2p/BUILD.gn » ('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 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2017 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_ORTC_RTPPARAMETERSCONVERSION_H_ 11 #ifndef WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_
12 #define WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ 12 #define WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/api/optional.h"
17 #include "webrtc/api/rtcerror.h" 18 #include "webrtc/api/rtcerror.h"
18 #include "webrtc/api/rtpparameters.h" 19 #include "webrtc/api/rtpparameters.h"
19 #include "webrtc/media/base/codec.h" 20 #include "webrtc/media/base/codec.h"
20 #include "webrtc/pc/mediasession.h" 21 #include "webrtc/pc/mediasession.h"
21 #include "webrtc/rtc_base/optional.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 // NOTE: Some functions are templated for convenience, such that template-based 25 // NOTE: Some functions are templated for convenience, such that template-based
26 // code dealing with AudioContentDescription and VideoContentDescription can 26 // code dealing with AudioContentDescription and VideoContentDescription can
27 // use this easily. Such methods are usable with cricket::AudioCodec and 27 // use this easily. Such methods are usable with cricket::AudioCodec and
28 // cricket::VideoCodec. 28 // cricket::VideoCodec.
29 29
30 //*************************************************************************** 30 //***************************************************************************
31 // Functions for converting from new webrtc:: structures to old cricket:: 31 // Functions for converting from new webrtc:: structures to old cricket::
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 template <class C> 100 template <class C>
101 RtpParameters ToRtpParameters( 101 RtpParameters ToRtpParameters(
102 const std::vector<C>& cricket_codecs, 102 const std::vector<C>& cricket_codecs,
103 const cricket::RtpHeaderExtensions& cricket_extensions, 103 const cricket::RtpHeaderExtensions& cricket_extensions,
104 const cricket::StreamParamsVec& stream_params); 104 const cricket::StreamParamsVec& stream_params);
105 105
106 } // namespace webrtc 106 } // namespace webrtc
107 107
108 #endif // WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_ 108 #endif // WEBRTC_ORTC_RTPPARAMETERSCONVERSION_H_
OLDNEW
« no previous file with comments | « webrtc/ortc/BUILD.gn ('k') | webrtc/p2p/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698