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

Unified Diff: media/base/key_system_info.h

Issue 1953803002: Remove remaining uses of KeySystemInfo and InitDataTypeMask (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 7 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 | « media/base/eme_constants.h ('k') | media/base/key_system_info.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/key_system_info.h
diff --git a/media/base/key_system_info.h b/media/base/key_system_info.h
deleted file mode 100644
index fe4dae7a418b5da141d630121c751161d2a78f10..0000000000000000000000000000000000000000
--- a/media/base/key_system_info.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2013 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 MEDIA_BASE_KEY_SYSTEM_INFO_H_
-#define MEDIA_BASE_KEY_SYSTEM_INFO_H_
-
-#include <string>
-
-#include "build/build_config.h"
-#include "media/base/eme_constants.h"
-#include "media/base/media_export.h"
-
-// Definitions:
-// * Key system
-// https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#key-system
-// * Concrete key system
-// A key system string that can be instantiated, such as
-// via the MediaKeys constructor. Examples include "org.w3.clearkey" and
-// "com.widevine.alpha".
-// * Abstract key system
-// A key system string that cannot be instantiated like a concrete key system
-// but is otherwise useful, such as in discovery using isTypeSupported().
-
-namespace media {
-
-// Contains information about an EME key system as well as how to instantiate
-// the corresponding CDM.
-struct MEDIA_EXPORT KeySystemInfo {
- KeySystemInfo();
- KeySystemInfo(const KeySystemInfo& other);
- ~KeySystemInfo();
-
- std::string key_system;
-
- InitDataTypeMask supported_init_data_types = kInitDataTypeMaskNone;
- SupportedCodecs supported_codecs = EME_CODEC_NONE;
-#if defined(OS_ANDROID)
- SupportedCodecs supported_secure_codecs = EME_CODEC_NONE;
-#endif // defined(OS_ANDROID)
- EmeRobustness max_audio_robustness = EmeRobustness::INVALID;
- EmeRobustness max_video_robustness = EmeRobustness::INVALID;
- EmeSessionTypeSupport persistent_license_support =
- EmeSessionTypeSupport::INVALID;
- EmeSessionTypeSupport persistent_release_message_support =
- EmeSessionTypeSupport::INVALID;
- EmeFeatureSupport persistent_state_support = EmeFeatureSupport::INVALID;
- EmeFeatureSupport distinctive_identifier_support = EmeFeatureSupport::INVALID;
-
- // The following indicate how the corresponding CDM should be instantiated.
- bool use_aes_decryptor = false;
-#if defined(ENABLE_PEPPER_CDMS)
- std::string pepper_type;
-#endif
-};
-
-} // namespace media
-
-#endif // MEDIA_BASE_KEY_SYSTEM_INFO_H_
« no previous file with comments | « media/base/eme_constants.h ('k') | media/base/key_system_info.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698