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

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

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/mediatypes.h ('k') | webrtc/api/ortc/ortcfactoryinterface.h » ('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 #include "webrtc/api/mediatypes.h" 11 #include "webrtc/api/mediatypes.h"
12
13 #include "webrtc/api/mediastreaminterface.h"
12 #include "webrtc/base/checks.h" 14 #include "webrtc/base/checks.h"
13 15
16 namespace {
17 static const char* kMediaTypeData = "data";
18 } // namespace
19
14 namespace cricket { 20 namespace cricket {
15 21
16 std::string MediaTypeToString(MediaType type) { 22 std::string MediaTypeToString(MediaType type) {
17 std::string type_str;
18 switch (type) { 23 switch (type) {
19 case MEDIA_TYPE_AUDIO: 24 case MEDIA_TYPE_AUDIO:
20 type_str = "audio"; 25 return webrtc::MediaStreamTrackInterface::kAudioKind;
21 break;
22 case MEDIA_TYPE_VIDEO: 26 case MEDIA_TYPE_VIDEO:
23 type_str = "video"; 27 return webrtc::MediaStreamTrackInterface::kVideoKind;
24 break;
25 case MEDIA_TYPE_DATA: 28 case MEDIA_TYPE_DATA:
26 type_str = "data"; 29 return kMediaTypeData;
27 break;
28 default:
29 RTC_NOTREACHED();
30 break;
31 } 30 }
32 return type_str; 31 // Not reachable; avoids compile warning.
32 FATAL();
33 }
34
35 MediaType MediaTypeFromString(const std::string& type_str) {
36 if (type_str == webrtc::MediaStreamTrackInterface::kAudioKind) {
37 return MEDIA_TYPE_AUDIO;
38 } else if (type_str == webrtc::MediaStreamTrackInterface::kVideoKind) {
39 return MEDIA_TYPE_VIDEO;
40 } else if (type_str == kMediaTypeData) {
41 return MEDIA_TYPE_DATA;
42 } else {
43 FATAL();
44 }
33 } 45 }
34 46
35 } // namespace cricket 47 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/api/mediatypes.h ('k') | webrtc/api/ortc/ortcfactoryinterface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698