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

Unified Diff: components/cdm/browser/widevine_drm_delegate_android.cc

Issue 1907263003: media: Set MediaClientAndroid in the GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « components/cdm/browser/widevine_drm_delegate_android.h ('k') | components/cdm/common/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cdm/browser/widevine_drm_delegate_android.cc
diff --git a/components/cdm/browser/widevine_drm_delegate_android.cc b/components/cdm/browser/widevine_drm_delegate_android.cc
deleted file mode 100644
index d2e7f67bf69012e6037137913d9e70a91e6c0ba5..0000000000000000000000000000000000000000
--- a/components/cdm/browser/widevine_drm_delegate_android.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015 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.
-
-#include "components/cdm/browser/widevine_drm_delegate_android.h"
-
-#include "base/macros.h"
-#include "media/cdm/cenc_utils.h"
-
-namespace cdm {
-
-namespace {
-
-const uint8_t kWidevineUuid[16] = {
- 0xED, 0xEF, 0x8B, 0xA9, 0x79, 0xD6, 0x4A, 0xCE,
- 0xA3, 0xC8, 0x27, 0xDC, 0xD5, 0x1D, 0x21, 0xED };
-
-} // namespace
-
-WidevineDrmDelegateAndroid::WidevineDrmDelegateAndroid() {
-}
-
-WidevineDrmDelegateAndroid::~WidevineDrmDelegateAndroid() {
-}
-
-const std::vector<uint8_t> WidevineDrmDelegateAndroid::GetUUID() const {
- return std::vector<uint8_t>(kWidevineUuid,
- kWidevineUuid + arraysize(kWidevineUuid));
-}
-
-bool WidevineDrmDelegateAndroid::OnCreateSession(
- const media::EmeInitDataType init_data_type,
- const std::vector<uint8_t>& init_data,
- std::vector<uint8_t>* init_data_out,
- std::vector<std::string>* /* optional_parameters_out */) {
- if (init_data_type != media::EmeInitDataType::CENC)
- return true;
-
-#if defined(USE_PROPRIETARY_CODECS)
- // Widevine MediaDrm plugin only accepts the "data" part of the PSSH box as
- // the init data when using MP4 container.
- return media::GetPsshData(init_data, GetUUID(), init_data_out);
-#else
- return false;
-#endif
-}
-
-} // namespace cdm
« no previous file with comments | « components/cdm/browser/widevine_drm_delegate_android.h ('k') | components/cdm/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698