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

Unified Diff: content/public/common/eme_codec.h

Issue 557723003: Implement Chromium side of MediaKeys.isTypeSupported(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Work around performance warning. Created 6 years, 3 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
« no previous file with comments | « content/content_common.gypi ('k') | content/public/common/eme_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/eme_codec.h
diff --git a/content/public/common/eme_codec.h b/content/public/common/eme_codec.h
deleted file mode 100644
index 54ed0e600441a083c556c8d758048fc9d12acea8..0000000000000000000000000000000000000000
--- a/content/public/common/eme_codec.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_PUBLIC_COMMON_EME_CODEC_H_
-#define CONTENT_PUBLIC_COMMON_EME_CODEC_H_
-
-namespace content {
-
-// Defines bitmask values that specify codecs used in Encrypted Media Extension
-// (EME). Each value represents a codec within a specific container.
-// The mask values are stored in a SupportedCodecs.
-enum EmeCodec {
- EME_CODEC_NONE = 0,
- EME_CODEC_WEBM_VORBIS = 1 << 0,
- EME_CODEC_WEBM_AUDIO_ALL = EME_CODEC_WEBM_VORBIS,
- EME_CODEC_WEBM_VP8 = 1 << 1,
- EME_CODEC_WEBM_VP9 = 1 << 2,
- EME_CODEC_WEBM_VIDEO_ALL = (EME_CODEC_WEBM_VP8 | EME_CODEC_WEBM_VP9),
- EME_CODEC_WEBM_ALL = (EME_CODEC_WEBM_AUDIO_ALL | EME_CODEC_WEBM_VIDEO_ALL),
-#if defined(USE_PROPRIETARY_CODECS)
- EME_CODEC_MP4_AAC = 1 << 3,
- EME_CODEC_MP4_AUDIO_ALL = EME_CODEC_MP4_AAC,
- EME_CODEC_MP4_AVC1 = 1 << 4,
- EME_CODEC_MP4_VIDEO_ALL = EME_CODEC_MP4_AVC1,
- EME_CODEC_MP4_ALL = (EME_CODEC_MP4_AUDIO_ALL | EME_CODEC_MP4_VIDEO_ALL),
- EME_CODEC_ALL = (EME_CODEC_WEBM_ALL | EME_CODEC_MP4_ALL),
-#else
- EME_CODEC_ALL = EME_CODEC_WEBM_ALL,
-#endif // defined(USE_PROPRIETARY_CODECS)
-};
-
-typedef uint32 SupportedCodecs;
-
-} // namespace content
-
-#endif // CONTENT_PUBLIC_COMMON_EME_CODEC_H_
« no previous file with comments | « content/content_common.gypi ('k') | content/public/common/eme_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698