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

Side by Side Diff: media/cdm/cenc_utils.h

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 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 unified diff | Download patch
« no previous file with comments | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/cenc_utils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MEDIA_CDM_CENC_UTILS_H_ 5 #ifndef MEDIA_CDM_CENC_UTILS_H_
6 #define MEDIA_CDM_CENC_UTILS_H_ 6 #define MEDIA_CDM_CENC_UTILS_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "media/base/media_export.h" 11 #include "media/base/media_export.h"
12 #include "media/cdm/json_web_key.h"
12 13
13 namespace media { 14 namespace media {
14 15
15 // Validate that |input| is a set of concatenated 'pssh' boxes and the sizes 16 // Validate that |input| is a set of concatenated 'pssh' boxes and the sizes
16 // match. Returns true if |input| looks valid, false otherwise. 17 // match. Returns true if |input| looks valid, false otherwise.
17 MEDIA_EXPORT bool ValidatePsshInput(const uint8* input, size_t input_length); 18 MEDIA_EXPORT bool ValidatePsshInput(const std::vector<uint8_t>& input);
18 19
19 // Gets the Key Ids from a 'pssh' box for the Common SystemID among one or 20 // Gets the Key Ids from a 'pssh' box for the Common SystemID among one or
20 // more concatenated 'pssh' boxes. If |input| looks valid, then true is 21 // more concatenated 'pssh' boxes. If |input| looks valid, then true is
21 // returned and |key_ids| is updated to contain the values found. Otherwise 22 // returned and |key_ids| is updated to contain the values found. Otherwise
22 // return false. 23 // return false.
23 // TODO(jrummell): This returns true if no Common SystemID 'pssh' boxes are 24 // TODO(jrummell): This returns true if no Common SystemID 'pssh' boxes are
24 // found, or are included but don't contain any key IDs. This should be 25 // found, or are included but don't contain any key IDs. This should be
25 // fixed once the test files are updated to include correct 'pssh' boxes. 26 // fixed once the test files are updated to include correct 'pssh' boxes.
26 // http://crbug.com/460308 27 // http://crbug.com/460308
27 MEDIA_EXPORT bool GetKeyIdsForCommonSystemId( 28 MEDIA_EXPORT bool GetKeyIdsForCommonSystemId(const std::vector<uint8_t>& input,
28 const uint8* input, 29 KeyIdList* key_ids);
29 int input_length,
30 std::vector<std::vector<uint8>>* key_ids);
31 30
32 } // namespace media 31 } // namespace media
33 32
34 #endif // MEDIA_CDM_CENC_UTILS_H_ 33 #endif // MEDIA_CDM_CENC_UTILS_H_
OLDNEW
« no previous file with comments | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/cenc_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698