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

Unified Diff: webrtc/media/base/mediacommon.h

Issue 1587193006: Move talk/media to webrtc/media (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rename back test to libjingle_media_unittest Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/media/base/mediacommon.h
diff --git a/webrtc/p2p/base/sessionid.h b/webrtc/media/base/mediacommon.h
similarity index 61%
copy from webrtc/p2p/base/sessionid.h
copy to webrtc/media/base/mediacommon.h
index f69570039b4da7156a19e69960509dfec40cd844..5dd01f19f2e89f8de2e01abed0dba0e8b8e706a4 100644
--- a/webrtc/p2p/base/sessionid.h
+++ b/webrtc/media/base/mediacommon.h
@@ -8,13 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_P2P_BASE_SESSIONID_H_
-#define WEBRTC_P2P_BASE_SESSIONID_H_
+#ifndef WEBRTC_MEDIA_BASE_MEDIACOMMON_H_
+#define WEBRTC_MEDIA_BASE_MEDIACOMMON_H_
-// TODO: Remove this file.
+#include "webrtc/base/stringencode.h"
namespace cricket {
+enum MediaCapabilities {
+ AUDIO_RECV = 1 << 0,
+ AUDIO_SEND = 1 << 1,
+ VIDEO_RECV = 1 << 2,
+ VIDEO_SEND = 1 << 3,
+};
+
} // namespace cricket
-#endif // WEBRTC_P2P_BASE_SESSIONID_H_
+#endif // WEBRTC_MEDIA_BASE_MEDIACOMMON_H_

Powered by Google App Engine
This is Rietveld 408576698