Edwin Wong
5d4184e85e
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142.
...
am: 0d1787e5a1
2016-09-22 00:30:50 +00:00
Edwin Wong
0d1787e5a1
DO NOT MERGE Update Classic Widevine libs to 4.5.0.10142.
...
Remove openssl external symbols from libssl.a and libcrypto.a.
Widevine repo reference:
https://widevine-internal-review.googlesource.com/#/c/17990/
https://widevine-internal-review.googlesource.com/#/c/18004/
bug: 28013024
Change-Id: I8a6dd5a17f896a65da8209680ef200a953b21e80
2016-09-19 15:17:46 -07:00
Rahul Frias
1eeb1ee359
DO NOT MERGE Only pass whole clear frames to OEMCrypto_CopyBuffer
...
am: 58bad94991
2016-03-04 18:20:31 +00:00
Rahul Frias
58bad94991
DO NOT MERGE Only pass whole clear frames to OEMCrypto_CopyBuffer
...
[ Merge from http://go/wvgerrit/16499 ]
Passing clear subsamples to OEMCrypto_CopyBuffer and encrypted subsamples
to OEMCrypto_DecryptCTR was causing performance issues as a lack of crypto
session information made it hard to associate clear and encrypted
subsamples with each other.
[ Based on a patch from Kelly Ren/Qualcomm ]
b/26538744
Change-Id: I4644f197b2ec481f6aa89d3fce29b22ebb7b0c06
(cherry picked from commit e3724815c6
2016-03-04 00:28:13 +00:00
Edwin Wong
311d3f75c0
Update Widevine classic integration guide.
...
am: 9790ffb8a8
2016-02-23 01:30:46 +00:00
Edwin Wong
9790ffb8a8
Update Widevine classic integration guide.
...
Update "Deliverables: section 7.5 to include instructions for M.
Update version to 2.3.
bug:27199720
Change-Id: I55b6177f3e3e97763c6c1721836ad19ff457351f
2016-02-22 15:22:11 -08:00
Kyle Alexander
7a7b7e1192
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours am: b7be833e68 -s ours
...
am: 168c9bec9b
2015-12-18 21:01:44 +00:00
Kyle Alexander
168c9bec9b
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours am: 0c660f33ef -s ours
...
am: b7be833e68
2015-12-18 20:59:05 +00:00
Kyle Alexander
b7be833e68
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours am: 62c9688118 -s ours
...
am: 0c660f33ef
2015-12-18 20:56:56 +00:00
Kyle Alexander
0c660f33ef
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours am: 4d84216089 -s ours
...
am: 62c9688118
2015-12-18 20:54:33 +00:00
Kyle Alexander
62c9688118
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours am: 12c6b681e5 -s ours
...
am: 4d84216089
2015-12-18 20:46:30 +00:00
Kyle Alexander
4d84216089
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours am: b58de75756 -s ours
...
am: 12c6b681e5
2015-12-18 20:44:32 +00:00
Kyle Alexander
12c6b681e5
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours am: e525aad042 -s ours
...
am: b58de75756
2015-12-18 20:42:43 +00:00
Kyle Alexander
b58de75756
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service am: 99941b86b6 -s ours
...
am: e525aad042
2015-12-18 20:40:32 +00:00
Kyle Alexander
e525aad042
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
...
am: 99941b86b6
2015-12-18 20:38:36 +00:00
Aaron Vaage
20cec67597
Updating asset names link in sample player readme DO NOT MERGE am: ba25949152 am: 032652fa0f -s ours
...
am: 83ac4b052f
2015-12-16 14:16:07 -08:00
Aaron Vaage
83ac4b052f
Updating asset names link in sample player readme DO NOT MERGE am: ba25949152
...
am: 032652fa0f
2015-12-16 22:11:14 +00:00
Aaron Vaage
032652fa0f
Updating asset names link in sample player readme DO NOT MERGE
...
am: ba25949152
2015-12-16 22:06:33 +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
Kyle Alexander
99941b86b6
DO NOT MERGE ANYWHERE Update license tests to use Widevine license service
...
Based from Widevine cl:
https://widevine-internal-review.googlesource.com/#/c/16322/
Bug: 26046529
Change-Id: Ib8a4fd1588de35a02973bca1914a298a62a71f7c
2015-12-15 17:46:18 +00:00
Aaron Vaage
ba25949152
Updating asset names link in sample player readme DO NOT MERGE
...
bug: 25673423
Change-Id: Ic394701da976371bbd2cb68074c3473f803624e6
2015-12-09 23:24:07 +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
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
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
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
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
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
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
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
Fred Gylys-Colwell
8f47dd6215
am a57b5cf8: (-s ours) am 4d34e02b: Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
* commit 'a57b5cf88b70a04abe2334a612ddc53e557d6419':
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
2015-10-03 15:31:19 +00:00
Fred Gylys-Colwell
a57b5cf88b
am 4d34e02b: Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
...
* commit '4d34e02b86a37aaf3c1630618d4a0b91ff1fc709':
Clarify HDCP Type (lmp-mr1-dev branch) DO NOT MERGE
2015-10-03 15:28:19 +00:00
