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

Side by Side Diff: components/cdm/browser/widevine_drm_delegate_android.cc

Issue 1577433004: Flip proprietary codecs to false for Android chromium builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Undo comment change. Created 4 years, 9 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/cdm/browser/widevine_drm_delegate_android.h" 5 #include "components/cdm/browser/widevine_drm_delegate_android.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "media/cdm/cenc_utils.h" 8 #include "media/cdm/cenc_utils.h"
9 9
10 namespace cdm { 10 namespace cdm {
(...skipping 18 matching lines...) Expand all
29 } 29 }
30 30
31 bool WidevineDrmDelegateAndroid::OnCreateSession( 31 bool WidevineDrmDelegateAndroid::OnCreateSession(
32 const media::EmeInitDataType init_data_type, 32 const media::EmeInitDataType init_data_type,
33 const std::vector<uint8_t>& init_data, 33 const std::vector<uint8_t>& init_data,
34 std::vector<uint8_t>* init_data_out, 34 std::vector<uint8_t>* init_data_out,
35 std::vector<std::string>* /* optional_parameters_out */) { 35 std::vector<std::string>* /* optional_parameters_out */) {
36 if (init_data_type != media::EmeInitDataType::CENC) 36 if (init_data_type != media::EmeInitDataType::CENC)
37 return true; 37 return true;
38 38
39 #if defined(PROPRIETARY_CODECS)
39 // Widevine MediaDrm plugin only accepts the "data" part of the PSSH box as 40 // Widevine MediaDrm plugin only accepts the "data" part of the PSSH box as
40 // the init data when using MP4 container. 41 // the init data when using MP4 container.
41 return media::GetPsshData(init_data, GetUUID(), init_data_out); 42 return media::GetPsshData(init_data, GetUUID(), init_data_out);
43 #else
44 return false;
45 #endif
42 } 46 }
43 47
44 } // namespace cdm 48 } // namespace cdm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698