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

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

Issue 2726633004: Fixing "control reaches end of non-void function" compile warning. (Closed)
Patch Set: 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 | « no previous file | no next file » | 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
(...skipping 10 matching lines...) Expand all
21 21
22 std::string MediaTypeToString(MediaType type) { 22 std::string MediaTypeToString(MediaType type) {
23 switch (type) { 23 switch (type) {
24 case MEDIA_TYPE_AUDIO: 24 case MEDIA_TYPE_AUDIO:
25 return webrtc::MediaStreamTrackInterface::kAudioKind; 25 return webrtc::MediaStreamTrackInterface::kAudioKind;
26 case MEDIA_TYPE_VIDEO: 26 case MEDIA_TYPE_VIDEO:
27 return webrtc::MediaStreamTrackInterface::kVideoKind; 27 return webrtc::MediaStreamTrackInterface::kVideoKind;
28 case MEDIA_TYPE_DATA: 28 case MEDIA_TYPE_DATA:
29 return kMediaTypeData; 29 return kMediaTypeData;
30 } 30 }
31 FATAL();
31 // Not reachable; avoids compile warning. 32 // Not reachable; avoids compile warning.
32 FATAL(); 33 return "";
33 } 34 }
34 35
35 MediaType MediaTypeFromString(const std::string& type_str) { 36 MediaType MediaTypeFromString(const std::string& type_str) {
36 if (type_str == webrtc::MediaStreamTrackInterface::kAudioKind) { 37 if (type_str == webrtc::MediaStreamTrackInterface::kAudioKind) {
37 return MEDIA_TYPE_AUDIO; 38 return MEDIA_TYPE_AUDIO;
38 } else if (type_str == webrtc::MediaStreamTrackInterface::kVideoKind) { 39 } else if (type_str == webrtc::MediaStreamTrackInterface::kVideoKind) {
39 return MEDIA_TYPE_VIDEO; 40 return MEDIA_TYPE_VIDEO;
40 } else if (type_str == kMediaTypeData) { 41 } else if (type_str == kMediaTypeData) {
41 return MEDIA_TYPE_DATA; 42 return MEDIA_TYPE_DATA;
42 } else {
43 FATAL();
44 } 43 }
44 FATAL();
45 // Not reachable; avoids compile warning.
46 return static_cast<MediaType>(-1);
45 } 47 }
46 48
47 } // namespace cricket 49 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698