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

Side by Side Diff: webrtc/api/mediatypes.h

Issue 2675173003: Adding "adapter" ORTC objects on top of ChannelManager/BaseChannel/etc. (Closed)
Patch Set: Add memcheck suppression for end-to-end tests. Created 3 years, 9 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/BUILD.gn ('k') | webrtc/api/mediatypes.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 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2016 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_API_MEDIATYPES_H_ 11 #ifndef WEBRTC_API_MEDIATYPES_H_
12 #define WEBRTC_API_MEDIATYPES_H_ 12 #define WEBRTC_API_MEDIATYPES_H_
13 13
14 #include <string> 14 #include <string>
15 15
16 namespace cricket { 16 namespace cricket {
17 17
18 enum MediaType { 18 enum MediaType {
19 MEDIA_TYPE_AUDIO, 19 MEDIA_TYPE_AUDIO,
20 MEDIA_TYPE_VIDEO, 20 MEDIA_TYPE_VIDEO,
21 MEDIA_TYPE_DATA 21 MEDIA_TYPE_DATA
22 }; 22 };
23 23
24 std::string MediaTypeToString(MediaType type); 24 std::string MediaTypeToString(MediaType type);
25 // Aborts on invalid string. Only expected to be used on strings that are
26 // guaranteed to be valid, such as MediaStreamTrackInterface::kind().
27 MediaType MediaTypeFromString(const std::string& type_str);
25 28
26 } // namespace cricket 29 } // namespace cricket
27 30
28 #endif // WEBRTC_API_MEDIATYPES_H_ 31 #endif // WEBRTC_API_MEDIATYPES_H_
OLDNEW
« no previous file with comments | « webrtc/api/BUILD.gn ('k') | webrtc/api/mediatypes.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698