mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
99261af5a4
This reverts commit 3ce6391b38.
Reason for revert: Breaks downstream test
Original change's description:
> Define cricket::MediaType in terms of webrtc::MediaType
>
> This is one step in getting rid of cricket::MediaType.
>
> Bug: webrtc:12754
> Fixes: webrtc:12764
> Change-Id: Idee832572bdc4c0e3bfdec6fb31ec0ba9db3e995
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/218346
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#33994}
TBR=mbonadei@webrtc.org,hta@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com
Change-Id: I64772018dea55e4f0946464364a60a39cec7e9ec
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:12754
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/218603
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34000}
44 lines
1.1 KiB
C++
44 lines
1.1 KiB
C++
/*
|
|
* Copyright 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef API_MEDIA_TYPES_H_
|
|
#define API_MEDIA_TYPES_H_
|
|
|
|
#include <string>
|
|
|
|
#include "rtc_base/system/rtc_export.h"
|
|
|
|
// The cricket and webrtc have separate definitions for what a media type is.
|
|
// They're not compatible. Watch out for this.
|
|
|
|
namespace cricket {
|
|
|
|
enum MediaType {
|
|
MEDIA_TYPE_AUDIO,
|
|
MEDIA_TYPE_VIDEO,
|
|
MEDIA_TYPE_DATA,
|
|
MEDIA_TYPE_UNSUPPORTED
|
|
};
|
|
|
|
extern const char kMediaTypeAudio[];
|
|
extern const char kMediaTypeVideo[];
|
|
extern const char kMediaTypeData[];
|
|
|
|
RTC_EXPORT std::string MediaTypeToString(MediaType type);
|
|
|
|
} // namespace cricket
|
|
|
|
namespace webrtc {
|
|
|
|
enum class MediaType { ANY, AUDIO, VIDEO, DATA };
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // API_MEDIA_TYPES_H_
|