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

Side by Side Diff: components/cdm/renderer/android_key_systems.cc

Issue 923283002: Implement checks for distinctiveIdentifier and persistentState in requestMediaKeySystemAccess(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderer/android_key_systems.h" 5 #include "components/cdm/renderer/android_key_systems.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 info.supported_codecs = response.compositing_codecs; 68 info.supported_codecs = response.compositing_codecs;
69 // Here we assume that support for a container implies support for the 69 // Here we assume that support for a container implies support for the
70 // associated initialization data type. KeySystems handles validating 70 // associated initialization data type. KeySystems handles validating
71 // |init_data_type| x |container| pairings. 71 // |init_data_type| x |container| pairings.
72 if (response.compositing_codecs & media::EME_CODEC_WEBM_ALL) 72 if (response.compositing_codecs & media::EME_CODEC_WEBM_ALL)
73 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM; 73 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_WEBM;
74 #if defined(USE_PROPRIETARY_CODECS) 74 #if defined(USE_PROPRIETARY_CODECS)
75 if (response.compositing_codecs & media::EME_CODEC_MP4_ALL) 75 if (response.compositing_codecs & media::EME_CODEC_MP4_ALL)
76 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC; 76 info.supported_init_data_types |= media::EME_INIT_DATA_TYPE_CENC;
77 #endif // defined(USE_PROPRIETARY_CODECS) 77 #endif // defined(USE_PROPRIETARY_CODECS)
78 // Prevent creation thorugh the requestMediaKeySystemAccess() API.
jrummell 2015/02/14 01:28:35 s/thorugh/through/
ddorwin 2015/02/17 20:56:46 Until https://github.com/w3c/encrypted-media/issue
sandersd (OOO until July 31) 2015/02/18 23:41:17 Previously there was a specific check for this, bu
sandersd (OOO until July 31) 2015/02/18 23:41:17 Done.
79 info.supported_session_types = media::EME_SESSION_TYPE_NONE;
78 concrete_key_systems->push_back(info); 80 concrete_key_systems->push_back(info);
79 } 81 }
80 } 82 }
81 } 83 }
82 84
83 } // namespace cdm 85 } // namespace cdm
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698