Aaron Vaage
5cfb0a7477
Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba am: 72618085fc am: 313f07a1b9
...
am: d7d30f75bd
2015-12-16 23:44:38 +00:00
Aaron Vaage
d7d30f75bd
Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba am: 72618085fc
...
am: 313f07a1b9
2015-12-16 14:32:41 -08:00
Aaron Vaage
313f07a1b9
Updating asset names link in sample player readme DO NOT MERGE am: 62c80f89ba
...
am: 72618085fc
2015-12-16 22:20:19 +00:00
Aaron Vaage
72618085fc
Updating asset names link in sample player readme DO NOT MERGE
...
am: 62c80f89ba
2015-12-16 22:06:32 +00:00
Fred Gylys-Colwell
12db6099d2
Merge "Merge CE Device Changes"
2015-12-10 21:45:24 +00:00
Aaron Vaage
62c80f89ba
Updating asset names link in sample player readme DO NOT MERGE
...
bug: 25673423
Change-Id: I9fc07f9d65237f0906f97eff6bce47672e38dde3
2015-12-09 23:23:21 +00:00
Fred Gylys-Colwell
0dc746a380
OEMCrypto v11 Documentation and Headers
...
Merge from widevine repo of http://go/wvgerrit/16186
These are the OEMCrypto v11 documents and header files. I have updated
just enough code so that existing unit tests pass. New unit tests,
the reference implementation, and the level 3 implementation are in
future CLs.
Change-Id: I9bbf1909e047f63a5877320a2d06740a3c4a3e32
2015-12-09 13:51:18 -08:00
Fred Gylys-Colwell
a99825b7aa
Unit Test for OEMCrypto to Reject Future Key Control Block
...
Merge from widevine repo of http://go/wvgerrit/16250
The verification string in the key control block has an obvious
pattern that is incremented every time we update the API. This CL
adds a unit test to make sure an implementation of OEMCrypto is not
casually accepting a future version of the key control block before
the API has even been defined.
Change-Id: I3f837f7346ef7de399441f5fcda9b13b65fa51f4
2015-12-09 09:58:36 -08:00
Fred Gylys-Colwell
6d7dcb8cba
Updates to OEMCrytpo Mock
...
Squash merge from the widevine repo of several changes to oemcrypto
unit tests and the mock reference code.
http://go/wvgerrit/16264 Use unsigned int for count in usage table (more mock)
http://go/wvgerrit/16262 Use unsigned int for count in usage table (mock version)
http://go/wvgerrit/16247 Fix mock OEMCrypto_DeleteUsageTable
http://go/wvgerrit/16070 Fix OEMCrypto_GenerateRSASignature return values
http://go/wvgerrit/15991 Fix buffer overflow for 32-bit systems
http://go/wvgerrit/15993 Return Correct Value from OEMCrypto_RefreshKeys
http://go/wvgerrit/15880 Cast RSA_size() to int
http://go/wvgerrit/15831 Be strict about warnings for CE CDM
b/23729420
b/25221168
Change-Id: I97b91dfc672db8c586ae317977871b7d6afac4bb
2015-12-07 15:33:56 -08:00
Fred Gylys-Colwell
e4513f4a59
Merge CE Device Changes
...
This is a merge of the following changes made for CE devices in the
widevine share repo:
http://go/wvgerrit/16211 Only load offline session if needed in GKR
http://go/wvgerrit/16245 Unreserve IDs in reservation test
http://go/wvgerrit/16242 Re-enable WebM tests
http://go/wvgerrit/16240 Un-reserve reserved license IDs
http://go/wvgerrit/16190 Add temporary session type
http://go/wvgerrit/16189 Enforce license type and can_persist for storage
Change-Id: I592416f66c0d1286844266c01cc9b4906c7b6b05
2015-12-07 14:12:46 -08:00
Kyle Alexander
6886b1fa12
Add HDCP, HEVC and VP9 content samples to ExoPlayer
...
Change-Id: I8a181ce9f617df52b5dafb974c7891b24610fece
2015-11-30 10:14:37 -08:00
Edwin Wong
c1894e8fa4
Remove usage reports upon factory reset of device.
...
(This is a merge of http://go/wvgerrit/16162 )
Usage tables on L3 devices are stored under IDM*. They will be removed
upon factory reset. However, we need to call OEMCrypto_DeleteUsageTable
for L1 devices because the usage tables are stored in secure storage.
bug: 25597957
Change-Id: I8533dfac60fad6ce7ddfd026a283633d6875dcf3
2015-11-20 17:34:34 -08:00
Tim Kilbourn
a53589c6fc
Rename the internal copy of gmock. am: 2b2337bb3c
...
am: 841aa35591
2015-11-20 00:16:02 +00:00
Tim Kilbourn
841aa35591
Rename the internal copy of gmock.
...
am: 2b2337bb3c
2015-11-19 23:01:10 +00:00
Tim Kilbourn
2b2337bb3c
Rename the internal copy of gmock.
...
The external/gmock project does not include the patches needed for
widevine, so renaming the internal copy allows both to coexist in the
build system.
(cherry-pick of commit 5b830f19b6
2015-11-17 17:29:52 +00:00
John "Juce" Bruce
1c1108c6ef
Update Widevine Android Version Number for M-MR1 (DO NOT MERGE) am: c2ce8f974f
...
am: 51468fd612
2015-10-28 19:41:46 +00:00
John "Juce" Bruce
51468fd612
Update Widevine Android Version Number for M-MR1 (DO NOT MERGE)
...
am: c2ce8f974f
2015-10-28 19:38:03 +00:00
John "Juce" Bruce
c2ce8f974f
Update Widevine Android Version Number for M-MR1 (DO NOT MERGE)
...
This updates Widevine's version number (and our canary test) for
M-MR1. Widevine will report its version as 3.1.0 instead of 3.0.0,
in order to distinguish it from the version released with Android M.
Bug: 25297264
Change-Id: I79c53b2d1a63753bce2aa5a77c46543c2804d95e
2015-10-28 01:06:55 +00:00
Marco Nelissen
c8d0ddadf5
Extractors are now binderized
...
Change-Id: I96030f2a345aa41193cea57e6f2f925eedea7957
2015-10-27 10:28:02 -07:00
John "Juce" Bruce
64ad54fdb0
Update Widevine Android Version Number to 4.0
...
(This is a merge of http://go/wvgerrit/15992 )
This also updates the canary so that it will be silent on master.
Bug: 25153516
Change-Id: I11163c98230c5a521609b5556b139f4508996858
2015-10-23 15:12:11 -07:00
Edwin Wong
c7bb93375b
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 am: 3efbeb28d7 am: c37606b47b am: d1b284b21c
...
am: 220816c7e2
2015-10-20 05:08:24 +00:00
Edwin Wong
2099e2a52b
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a am: fdc1ab381d am: 90d6be0170
...
am: 21f2393af0
2015-10-20 05:08:21 +00:00
Edwin Wong
220816c7e2
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 am: 3efbeb28d7 am: c37606b47b
...
am: d1b284b21c
2015-10-20 05:06:43 +00:00
Edwin Wong
21f2393af0
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a am: fdc1ab381d
...
am: 90d6be0170
2015-10-20 05:06:40 +00:00
Edwin Wong
d1b284b21c
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173 am: 3efbeb28d7
...
am: c37606b47b
2015-10-20 04:59:31 +00:00
Edwin Wong
90d6be0170
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09 am: a69baa961a
...
am: fdc1ab381d
2015-10-20 04:59:28 +00:00
Edwin Wong
c37606b47b
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82 am: 3b3b609173
...
am: 3efbeb28d7
2015-10-20 04:57:44 +00:00
Edwin Wong
fdc1ab381d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2 am: 4c2eb98d09
...
am: a69baa961a
2015-10-20 04:57:41 +00:00
Edwin Wong
3efbeb28d7
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e am: de6d223b82
...
am: 3b3b609173
2015-10-20 04:31:52 +00:00
Edwin Wong
a69baa961a
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989 am: fc1240bdc2
...
am: 4c2eb98d09
2015-10-20 04:30:09 +00:00
Edwin Wong
3b3b609173
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392 am: 10b2b36a1e
...
am: de6d223b82
2015-10-20 04:28:23 +00:00
Edwin Wong
4c2eb98d09
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0 am: ac1854b989
...
am: fc1240bdc2
2015-10-20 04:26:43 +00:00
Edwin Wong
de6d223b82
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc am: 2253f6c392
...
am: 10b2b36a1e
2015-10-20 04:26:42 +00:00
Edwin Wong
fc1240bdc2
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d am: 2ee45a97b0
...
am: ac1854b989
2015-10-20 04:24:53 +00:00
Edwin Wong
10b2b36a1e
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68 am: 1afb1066cc
...
am: 2253f6c392
2015-10-20 04:24:53 +00:00
Edwin Wong
ac1854b989
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1 am: d5a1d5d58d
...
am: 2ee45a97b0
2015-10-20 04:23:06 +00:00
Edwin Wong
2253f6c392
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905 am: ee415b7b68
...
am: 1afb1066cc
2015-10-20 04:23:06 +00:00
Edwin Wong
2ee45a97b0
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71 am: 5754438dc1
...
am: d5a1d5d58d
2015-10-20 04:21:24 +00:00
Edwin Wong
1afb1066cc
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968 am: 94dab9e905
...
am: ee415b7b68
2015-10-20 04:14:58 +00:00
Edwin Wong
d5a1d5d58d
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e am: 9617db4d71
...
am: 5754438dc1
2015-10-20 04:13:17 +00:00
Edwin Wong
ee415b7b68
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03 am: 655574d968
...
am: 94dab9e905
2015-10-20 04:13:17 +00:00
Edwin Wong
5754438dc1
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev. am: f78b0e780e
...
am: 9617db4d71
2015-10-20 04:11:35 +00:00
Edwin Wong
94dab9e905
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d am: 27133e7a03
...
am: 655574d968
2015-10-20 04:11:35 +00:00
Edwin Wong
655574d968
resolve merge conflicts of fea63b4062 to jb-mr1-dev. am: f7c043f32d
...
am: 27133e7a03
2015-10-20 04:08:24 +00:00
Edwin Wong
9617db4d71
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
am: f78b0e780e
2015-10-20 04:08:23 +00:00
Edwin Wong
f78b0e780e
resolve merge conflicts of c0b8030851 to jb-mr1.1-dev.
...
Change-Id: I3a89161de0bf84fc6257338a3e932b90feba3f82
2015-10-19 20:59:36 -07:00
Edwin Wong
27133e7a03
resolve merge conflicts of fea63b4062 to jb-mr1-dev.
...
am: f7c043f32d
2015-10-20 02:59:35 +00:00
Edwin Wong
c0b8030851
resolve merge conflicts of 769288d009 to jb-mr1.1-docs.
...
Change-Id: I26df84f2907bcd18a2646bec0fbe53d9624e5a9b
2015-10-19 18:32:07 -07:00
Edwin Wong
f7c043f32d
resolve merge conflicts of fea63b4062 to jb-mr1-dev.
...
Change-Id: Ia5dd0316bb057dbc2e185f720d194548d2a370a6
2015-10-19 18:22:48 -07:00
Rahul Frias
072cf7e711
Add level 3 libs and address build warnings
...
* Fix strict aliasing error in gcc
[ Merge of http://go/wvgerrit/15856 ]
This also ensures the alignment of 64-bit memory access in a portable
way, without using compiler-specific mechanisms like attributes or
platform-specific mechanisms like memalign.
(The aliasing error does not show up in clang.)
* Return kNotSupported for non-Widevine init data
[ Merge of http://go/wvgerrit/15853 ]
This also improves logging for the init data parser by including a
verbose message for non-Widevine PSSHs and by using a new IsEOF()
method to avoid misleading "Unable to read atom size" logs.
* Cast RSA_size() to int
[ Merge of http://go/wvgerrit/15880 ]
It has been suggested that this may be unsigned on some versions of
OpenSSL or BoringSSL.
* Be strict about warnings for CE CDM
[ Merge of http://go/wvgerrit/15831 ]
* Enable all warnings and treat warnings as errors in the CE build.
* Fix all existing warnings (mostly unused variables, consts, and
functions, and one signed/unsigned comparison).
* Exclude protobuf warnings rather than maintain a divergent copy.
* Fix release build errors
[ Merge of http://go/wvgerrit/15855 ]
* Level 3 Build With Android Emulator
[ Merge of http://go/wvgerrit/15778 ]
This CL rebuilds the level 3 libraries with the android emulator
sdk_phone_*. This seems to avoid problems with the x86 build using
incorrect compiler flags.
These libraries work for arm, x86, mips, arm64, and x86_64. The level
3 library is disabled for mips64.
Versions:
level3/mips/libwvlevel3.a Level3 Library Sep 30 2015 18:29:50
level3/arm/libwvlevel3.a Level3 Library Sep 28 2015 13:18:25
level3/x86/libwvlevel3.a Level3 Library Sep 28 2015 13:08:28
Change-Id: I1e50aa78bdc84ecb905f2e55297d4f48b140341c
2015-10-15 22:50:29 +00:00
