Commit Graph

888 Commits

Author SHA1 Message Date
Jeff Tinker
2dffd3db32 am 88063a8d: Merge "Add additional MediaDrm API tests" into klp-dev
* commit '88063a8d20505d276d0700e705ea868c66ca3268':
  Add additional MediaDrm API tests
2013-12-12 11:27:15 -08:00
Jeff Tinker
4b9f05c131 am 38cc7122: Improve unit test build script
* commit '38cc7122fd9359bbda7428777d03bb51020e0c54':
  Improve unit test build script
2013-12-12 11:27:15 -08:00
Jeff Tinker
5d5d1baf7a Merge "Address unit test failures" into klp-dev 2013-12-12 19:26:03 +00:00
Jeff Tinker
88063a8d20 Merge "Add additional MediaDrm API tests" into klp-dev 2013-12-12 19:25:48 +00:00
Jeff Tinker
38cc7122fd Improve unit test build script
Make the build_and_run_all_unit_tests script push individual tests
instead of doing a full sync, makes it easier to run unit tests
against release builds.

Merge of https://widevine-internal-review.googlesource.com/#/c/8405/
from the widevine cdm repo.

Change-Id: I8efda77be9ab863f616fab88c4782b7c9edb8858
2013-12-12 10:58:42 -08:00
Jeff Tinker
4ab8efc21d Add additional MediaDrm API tests
bug: 12033958

Merge of https://widevine-internal-review.googlesource.com/#/c/8402/
from the Widevine CDM repo.

Change-Id: I441eb816db69620feff0bd72c485bd3ad7ec8031
2013-12-12 10:56:51 -08:00
Jeff Tinker
2db60fbb8c am 78d44c37: am 68e1e7c5: Merge "Generate a unique license request ID" into klp-dev
* commit '78d44c3792d19a74b4fd4bdcd509d785b86c1f83':
  Generate a unique license request ID
2013-12-12 18:28:36 +00:00
Jeff Tinker
78d44c3792 am 68e1e7c5: Merge "Generate a unique license request ID" into klp-dev
* commit '68e1e7c5784b8c189ff59c06517c7b5ae103631e':
  Generate a unique license request ID
2013-12-12 10:19:31 -08:00
Jeff Tinker
68e1e7c578 Merge "Generate a unique license request ID" into klp-dev 2013-12-12 18:17:34 +00:00
Rahul Frias
f32baf91b5 Address unit test failures
A number of failures were observed,
* GPlay dev license server is being worked on. This causes random
  failures when running unit tests. Switching to the staging
  server for now.
* Occasionally, the license server times out. Introducing a retry
  mechanism do deal with HTTP responses (merge from master #45e8ddd5f)
* Release license tests are now disabled. Tests were previously passing,
  even though they were not in fact supported by the GPlay license server.
  The response included just enough information to be a valid license and
  passed minimal verification that was taking place. Additional verification
  was not necessary because session is torndown and resources released as
  soon as the response has been received.
  A change at the GPlay server now causes the release license request to be
  flagged as an error and the tests to fail. Work is in progress to
  support release of licenses at the GPlay server.
* The wrong message test (from request license tests) fails. This is
  because GPlay behaviour changed from returning a HTTP 500, when
  processing an invalid PSSH, to returning a HTTP 200 without any included
  license.
* Security level path backward compatibility tests on L3 which failed and
  caused the succeeding license request tests to fail.

b/12000457

Change-Id: I8e6adc490504475d1039793ea555a17799cb78c4
2013-12-11 16:22:58 -08:00
Madan Ankapura
89a3f84758 am 15c2973b: am 3567597a: Merge "Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE" into klp-dev
* commit '15c2973b43d5071d244fcd9ce5ef03a4f660ded5':
  Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE
2013-12-07 03:25:16 +00:00
Madan Ankapura
15c2973b43 am 3567597a: Merge "Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE" into klp-dev
* commit '3567597ada615fe8e914732284212e1e6a2569f3':
  Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE
2013-12-06 19:19:11 -08:00
Madan Ankapura
3567597ada Merge "Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE" into klp-dev 2013-12-07 02:33:12 +00:00
Rahul Frias
1b22c80568 Generate a unique license request ID
The request ID was set to a fixed value, which caused license requests
to be rejected by the YT server with TOO_MANY_STREAMS_PER_VIDEO

The request ID is now a combination of a randomly generated value and
a rolling index. This is based off a fix by gmorgan@ on the eureka
branch #98fa6e5e.

Merge of https://widevine-internal-review.googlesource.com/#/c/8496/
from the widevine cdm repo.

b/12018697

Change-Id: I6c05fea885d46aea53a07235c3e5ac65a6971eaf
2013-12-06 12:26:55 -08:00
John "Juce" Bruce
33a223dcf1 Add x86 Builds for Widevine Classic 4.5.0.10113 - DO NOT MERGE
Adds L1 x86 build of Widevine Classic that has been verified by partners.

Change-Id: Id85fea0e0311d06f0875a4aaedebaa9b00d17efa
2013-12-03 19:03:47 -08:00
Fred Gylys-Colwell
dadf69783a am 5905e530: am c53e0c77: Correct SelectKey return value when no keys loaded
* commit '5905e530c91b01ec43ed99752067c5431da12469':
  Correct SelectKey return value when no keys loaded
2013-11-20 18:40:23 -08:00
Fred Gylys-Colwell
5905e530c9 am c53e0c77: Correct SelectKey return value when no keys loaded
* commit 'c53e0c778c172ac3dc411726649a2e7de17b3d82':
  Correct SelectKey return value when no keys loaded
2013-11-20 18:32:58 -08:00
Fred Gylys-Colwell
c53e0c778c Correct SelectKey return value when no keys loaded
Previously, Level 3 SelectKey returned no error when called before
any keys were loaded.  After this CL, it will return
OEMCrypto_ERROR_NO_CONTENT_KEY.

Library version:
arm  - Level3 Library Nov 20 2013 18:09:31
mips - Level3 Library Nov 20 2013 17:58:56
x86  - Level3 Library Nov 20 2013 18:13:01

bug: 11769839
Change-Id: I1b3f057e3ae9f2f174cae91f6849080345f02003
2013-11-20 18:18:43 -08:00
Jeff Tinker
ff77c24030 am 4028bba8: am 113d4d07: Add end-to-end generic encrypt/decrypt/sign/verify tests
* commit '4028bba8a777d977f3bd0d28c5bc17a0ff2d8919':
  Add end-to-end generic encrypt/decrypt/sign/verify tests
2013-11-13 09:58:15 -08:00
Jeff Tinker
4028bba8a7 am 113d4d07: Add end-to-end generic encrypt/decrypt/sign/verify tests
* commit '113d4d0755dc47348db40ad5d9f73f13355f86c4':
  Add end-to-end generic encrypt/decrypt/sign/verify tests
2013-11-13 09:52:05 -08:00
Jeff Tinker
113d4d0755 Add end-to-end generic encrypt/decrypt/sign/verify tests
bug: 11534771

Merge of https://widevine-internal-review.googlesource.com/#/c/8291/
from the Widevine CDM repo.

Change-Id: I76110013838f91c8009fe710586226c96de890be
2013-11-12 14:19:58 -08:00
Jeff Tinker
235fb36f8a am 40311d0c: am 357e6c41: Merge "Haystack and Obfuscated OEMCrypto Level 3" into klp-dev
* commit '40311d0c6c44a3d876ce843534cd98c58f65ca4d':
  Haystack and Obfuscated OEMCrypto Level 3
2013-11-07 21:30:28 -08:00
Jeff Tinker
40311d0c6c am 357e6c41: Merge "Haystack and Obfuscated OEMCrypto Level 3" into klp-dev
* commit '357e6c419c55a492c8f79845664af68c9b4e7127':
  Haystack and Obfuscated OEMCrypto Level 3
2013-11-07 17:57:45 -08:00
Jeff Tinker
357e6c419c Merge "Haystack and Obfuscated OEMCrypto Level 3" into klp-dev 2013-11-08 01:54:44 +00:00
Jeff Tinker
ad51a53db4 am 48742bba: am 8e5bc02e: Merge "Allow license renewals after expiry" into klp-dev
* commit '48742bba5bd9b4c39fb41359a62e15a6503f1a5e':
  Allow license renewals after expiry
2013-11-07 15:13:05 -08:00
Jeff Tinker
48742bba5b am 8e5bc02e: Merge "Allow license renewals after expiry" into klp-dev
* commit '8e5bc02e51304ff6d093fbe1b06678e7fd2261bb':
  Allow license renewals after expiry
2013-11-07 11:13:19 -08:00
Jeff Tinker
8e5bc02e51 Merge "Allow license renewals after expiry" into klp-dev 2013-11-07 19:09:50 +00:00
Jeff Tinker
83b22d3030 am 98872de3: am 0553f411: Add ExoPlayerDemo.apk to vendor/widevine so partners can access it and use to verify integrations.
* commit '98872de379decad058bee872a37bf880144644e2':
  Add ExoPlayerDemo.apk to vendor/widevine so partners can access it and use to verify integrations.
2013-11-07 09:52:15 -08:00
Jeff Tinker
98872de379 am 0553f411: Add ExoPlayerDemo.apk to vendor/widevine so partners can access it and use to verify integrations.
* commit '0553f411db17ce24e2376c23deb333042431fbd7':
  Add ExoPlayerDemo.apk to vendor/widevine so partners can access it and use to verify integrations.
2013-11-07 09:46:44 -08:00
Andy Hung
1fda9bd213 Merge "Revert "Add "throws IOException" to MediaCodec constructors (8)"" 2013-11-07 05:06:01 +00:00
Andy Hung
b0c5ecc86d Revert "Add "throws IOException" to MediaCodec constructors (8)"
This reverts commit 35133e2bc5.

Change-Id: Iba6767447262ae092e4d38cccf9a4caf5aa75adb
2013-11-07 05:05:08 +00:00
Jeff Tinker
0553f411db Add ExoPlayerDemo.apk to vendor/widevine so partners can access
it and use to verify integrations.

bug: 11357407

Change-Id: Ie38cef1dfd2fe685721e7fb4f37e881326321727
2013-11-06 14:28:09 -08:00
John "Juce" Bruce
e1bbb87b38 am 94619260: am fd482527: L1 System Lowered to L3 Still Requires Secure Decoders
* commit '94619260179626fca69f1b65bda6683f9c561b7b':
  L1 System Lowered to L3 Still Requires Secure Decoders
2013-11-06 14:04:35 -08:00
John "Juce" Bruce
9461926017 am fd482527: L1 System Lowered to L3 Still Requires Secure Decoders
* commit 'fd482527e4b07c6664bd463785a3ec8ba554a788':
  L1 System Lowered to L3 Still Requires Secure Decoders
2013-11-06 13:58:56 -08:00
John "Juce" Bruce
fd482527e4 L1 System Lowered to L3 Still Requires Secure Decoders
Merge of https://widevine-internal-review.googlesource.com/#/c/8263
from the Widevine repo.

Changes the behavior of requiresSecureDecoderComponent() to query the
session for whether a lowered security level has been requested
before querying the system to see what its default security level is.

As part of this, we added a new QuerySessionStatus() method to the
CDM that gets status info on a session-specific level, such as the
effective security level of a session.

Bug: 11428937
Change-Id: I5549a2fdd400cc87f567d27fcf74c473451093d6
2013-11-06 19:31:24 +00:00
Andy Hung
d4a49382a7 Merge "Add "throws IOException" to MediaCodec constructors (8)" 2013-11-06 19:23:26 +00:00
Jeff Tinker
bf01a71a8a am a3d689d9: (-s ours) am 0a9f0b1d: Merge "Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE" into klp-dev
* commit 'a3d689d983d059ce713882b97f73789d4145cc5c':
  Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE
2013-11-06 10:15:25 -08:00
Jeff Tinker
a3d689d983 am 0a9f0b1d: Merge "Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE" into klp-dev
* commit '0a9f0b1dd86d23e8f24bd31077cb52b7a74d4dd6':
  Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE
2013-11-06 10:05:27 -08:00
Jeff Tinker
0a9f0b1dd8 Merge "Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE" into klp-dev 2013-11-06 18:00:53 +00:00
Jeff Tinker
6b51eee87c am 7db580d6: am dd672f0c: Merge "Use renewal URL in license tests" into klp-dev
* commit '7db580d6b9a96fff5567a6fc5d5db460872b76c2':
  Use renewal URL in license tests
2013-11-06 09:46:52 -08:00
Jeff Tinker
6308988a4a am cbcd885e: am 30469021: Merge "Search for keys in shared sessions only when content is encrypted" into klp-dev
* commit 'cbcd885e7cd0d7a34bd2128bdf8033b0751b3e97':
  Search for keys in shared sessions only when content is encrypted
2013-11-06 09:46:52 -08:00
Jeff Tinker
7db580d6b9 am dd672f0c: Merge "Use renewal URL in license tests" into klp-dev
* commit 'dd672f0c68cd72dd957d0cbfe15207afccbd98e6':
  Use renewal URL in license tests
2013-11-06 09:24:58 -08:00
Jeff Tinker
cbcd885e7c am 30469021: Merge "Search for keys in shared sessions only when content is encrypted" into klp-dev
* commit '30469021715ae8747801cc7622deb1d2d608e78c':
  Search for keys in shared sessions only when content is encrypted
2013-11-06 09:24:58 -08:00
Jeff Tinker
dd672f0c68 Merge "Use renewal URL in license tests" into klp-dev 2013-11-06 17:24:07 +00:00
Jeff Tinker
3046902171 Merge "Search for keys in shared sessions only when content is encrypted" into klp-dev 2013-11-06 17:22:33 +00:00
Rahul Frias
774a078f1d Allow license renewals after expiry
Licenses could be renewed uptil the point of expiry. After that point
we expected that the session would have to be closed and a new one
opened with a new license loaded. Clank requested that we support
renewal of sessions past expiry.

In addition, the error returned on decryption, if OEMCrypto
determines that the KCB duration has expired, is NEED_KEY rather than
KEY_ERROR.

Merge of https://widevine-internal-review.googlesource.com/#/c/8240
from the widevine cdm repo.

b/11390539

Change-Id: I023320f3f25514cd07b368701a92100429ce1c04
2013-11-05 16:40:17 -08:00
Andy Hung
35133e2bc5 Add "throws IOException" to MediaCodec constructors (8)
Change to add "throws IOException" to android.media.MediaCodec
(createByCodecName|createDecoderByType|createEncoderByType).  The exception was
previously thrown through the native JNI, but not explicitly declared.

Requires changes to existing code for declaration compatibility.

Bug: 11364276
Change-Id: I6487408709342b390bac2b935f4642d4aaf36102
Signed-off-by: Andy Hung <hunga@google.com>
2013-11-05 14:25:52 -08:00
Fred Gylys-Colwell
becb1bf0be Haystack and Obfuscated OEMCrypto Level 3
This CL contains working versions of the haystack tools and the
OEMCrypto Level 3 library for android ARM, MIPS and x86.

The version number of the level 3 library is:
android/level3/arm/libwvlevel3.a  Level3 Library Nov  4 2013 18:39:06
android/level3/mips/libwvlevel3.a Level3 Library Nov  4 2013 18:42:29
android/level3/x86/libwvlevel3.a  Level3 Library Nov  4 2013 18:41:07

bug: 9374954 MediaDrm haystack based L3 code hardening implementation.
Change-Id: Ifef13900a11e83e4257723d3c6fc7107550882a8
2013-11-05 10:32:11 -08:00
John "Juce" Bruce
84b79eccb6 Upgrade Widevine Classic to 4.5.0.10113 - DO NOT MERGE
Contains the following, BC-Triaged fixes:

Bug: 8767242
Media player error -1010 on playback

Bug: 8342523
Android Media player is able to play WVM content if license is
already acquired

Change-Id: I3ee7863a5bf214fb8c4e4aefdd05f5062d568617
2013-11-04 12:03:41 -08:00
Jeff Tinker
30ae166370 am 5d8a218d: am 84e83f4a: Merge "Move OEMCrypto_Initialize earlier" into klp-dev
* commit '5d8a218d3acad61f0168f4fe26b0ea2d094c66fb':
  Move OEMCrypto_Initialize earlier
2013-10-31 15:51:54 -07:00