| Index: webrtc/api/mediatypes.cc
|
| diff --git a/webrtc/api/mediatypes.cc b/webrtc/api/mediatypes.cc
|
| index 97b0189b7a9349396219aa69a6df3adf5a124520..0fe5f5e7edb9ba80c63af7b0a79bc5f5d02cbdd9 100644
|
| --- a/webrtc/api/mediatypes.cc
|
| +++ b/webrtc/api/mediatypes.cc
|
| @@ -14,22 +14,26 @@
|
| namespace cricket {
|
|
|
| std::string MediaTypeToString(MediaType type) {
|
| - std::string type_str;
|
| switch (type) {
|
| case MEDIA_TYPE_AUDIO:
|
| - type_str = "audio";
|
| - break;
|
| + return "audio";
|
| case MEDIA_TYPE_VIDEO:
|
| - type_str = "video";
|
| - break;
|
| + return "video";
|
| case MEDIA_TYPE_DATA:
|
| - type_str = "data";
|
| - break;
|
| - default:
|
| - RTC_NOTREACHED();
|
| - break;
|
| + return "data";
|
| + }
|
| +}
|
| +
|
| +MediaType MediaTypeFromString(const std::string& type_str) {
|
| + if (type_str == "audio") {
|
| + return MEDIA_TYPE_AUDIO;
|
| + } else if (type_str == "video") {
|
| + return MEDIA_TYPE_VIDEO;
|
| + } else if (type_str == "data") {
|
| + return MEDIA_TYPE_DATA;
|
| + } else {
|
| + FATAL();
|
| }
|
| - return type_str;
|
| }
|
|
|
| } // namespace cricket
|
|
|