Commit Graph

359 Commits

Author SHA1 Message Date
Jeff Tinker
1a5103c739 Include WV classic L3 libraries for x86 in Lollipop branches
bug: 18985145
Change-Id: I659c10b33dc79bf44a6da907d168e1ef61df2172
2015-01-14 12:21:51 -08:00
Jeff Tinker
b3650a9661 Ensure crypto gets terminated on error.
Change-Id: If5ade69f98eb4511064b649fa5a8544065753d97
related-to-bug: 17062671
2014-10-18 00:48:54 +00:00
Jeff Tinker
e82044e05d Report WOULD_BLOCK if buffer is non-empty instead of ERROR_IO
Bug: 17423087
Change-Id: I4b1c5ead919649be3b820f63a030acac729fb06e
2014-09-25 01:39:29 +00:00
Edwin Wong
7bf1daa432 Update Widevine classic integration guide.
Update "Deliverables" section.

Bug: 17405306
Change-Id: I0532aeee7b634c0a13b930efe2dbe8c7e264e561
2014-09-11 18:29:53 -07:00
Edwin Wong
c6723c564a Remove Widevine Classic MediaCodec mode from application.
bug: 17303948
Change-Id: Ia0db7be1d99f8fab968641cbf57438ee1dd364ab
2014-09-03 18:06:00 -07:00
Edwin Wong
96721d7145 Update Widevine Classic Library to 4.5.0.10127.
Add openssl-0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10828/

Update openssl lib to 0.9.8za.
https://widevine-internal-review.googlesource.com/#/c/10862/

Update Version string to 601_AndroidOS_L.
https://widevine-internal-review.googlesource.com/#/c/10950/

Fix Build On lmp-dev.
https://widevine-internal-review.googlesource.com/#/c/10837/

Translate widevine:// Protocol In getConstrains() and checkRightsStatus().
https://widevine-internal-review.googlesource.com/#/c/10838/

Convert "widevine:" prefix for lm->Register() as well.
https://widevine-internal-review.googlesource.com/#/c/11080/

bug: 9835684
bug: 15932110

Change-Id: I1f996355cf13ffca8d0b6ed464aa7b59b5fe4458
2014-09-03 20:55:34 +00:00
Edwin Wong
5800ecc15e Revert "Remove Widevine Classic MediaCodec mode from application."
This reverts commit a9071cd4bd.

Change-Id: Ibbfc30579bb665a18fa98cc453df956ea7c4e558
2014-08-29 13:29:40 +00:00
Edwin Wong
a9071cd4bd Remove Widevine Classic MediaCodec mode from application.
Hide MediaCodec mode for Build.VERSION_CODES.L and forward.

bug: 17303948
Change-Id: Iae8381ee67950a3f0c1bb9e273e3e45be24a3352
2014-08-27 18:39:06 -07:00
Lajos Molnar
174a218b30 Support nonblocking reads for secure source (video)
Bug: 15699665
Change-Id: If67c3196b42b24333ace1373711dc3f4eb30f0da
2014-07-17 20:32:28 -07:00
Jeff Tinker
8a8feb747c am ccc0ebc4: am ec3cf9d1: am 54155e3d: am 9a9da0e0: Update license and content server URLs due to server migration.
* commit 'ccc0ebc470f2178339ff7c18a38ff2f763011edc':
  Update license and content server URLs due to server migration.
2014-06-19 00:40:40 +00:00
Jeff Tinker
54155e3d68 am 9a9da0e0: Update license and content server URLs due to server migration.
* commit '9a9da0e040ee73fb38375e0a27be4e021d8887d5':
  Update license and content server URLs due to server migration.
2014-06-19 00:23:09 +00:00
Jeff Tinker
9a9da0e040 Update license and content server URLs due to server migration.
Only affects OEM integration tests, not production code.

bug: 15600077
Change-Id: Id534cec663366f639d934baf8d366615a2d97b64
(cherry picked from commit a53677d27c)
2014-06-17 11:46:37 -07:00
Jeff Tinker
2a5754f338 Revert "Update license and content server URLs due to server migration."
This reverts commit a53677d27c.

Change-Id: I9afbc9aa95cc0cf518ef1fd378dccdc5874afaa4
2014-06-17 17:59:40 +00:00
Jeff Tinker
a53677d27c Update license and content server URLs due to server migration.
Only affects OEM integration tests, not production code.

bug: 15600077
Change-Id: Id534cec663366f639d934baf8d366615a2d97b64
2014-06-13 14:09:31 -07:00
Edwin Wong
0b6b0372c0 am f6dd49f0: am 9ba13504: am cf4cd549: am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'f6dd49f04a81cde7d4e241c15f8b2b2328bf9d9e':
  Fixed intermittent failure in GTS test.
2014-06-11 22:51:28 +00:00
Edwin Wong
cf4cd54924 am 1c68225d: am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '1c68225dac88b0fe75b11a651613dc776f471ea8':
  Fixed intermittent failure in GTS test.
2014-06-11 22:35:46 +00:00
Edwin Wong
1c68225dac am 50bfcfdb: am e8fbb466: am 8daed73e: am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '50bfcfdbf8218fe878d5c135a27879d8977c5092':
  Fixed intermittent failure in GTS test.
2014-06-11 22:25:08 +00:00
Edwin Wong
8daed73ef7 am 4f962df0: am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '4f962df0b93564d3dbf62855279e2ea2ac4f1191':
  Fixed intermittent failure in GTS test.
2014-06-11 22:15:56 +00:00
Edwin Wong
4f962df0b9 am c1dee5d8: am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'c1dee5d84735b41dfd92f956418b833e1842a2be':
  Fixed intermittent failure in GTS test.
2014-06-11 22:12:24 +00:00
Edwin Wong
c1dee5d847 am 35ebeec7: am f6ffee47: Fixed intermittent failure in GTS test.
* commit '35ebeec71f3f0d0b763f1ef8cf3b98bae2aeee2e':
  Fixed intermittent failure in GTS test.
2014-06-11 22:08:36 +00:00
Edwin Wong
35ebeec71f am f6ffee47: Fixed intermittent failure in GTS test.
* commit 'f6ffee472c33b85d21c820862c398406e1c964b5':
  Fixed intermittent failure in GTS test.
2014-06-11 22:05:25 +00:00
Edwin Wong
f6ffee472c Fixed intermittent failure in GTS test.
Need to clear mEncKey in constructor, otherwise, decrypted data is wrong.

bug: 15540382
Change-Id: I0e2d4d6edd8a5800fa2a36e9f258782edc493e13
2014-06-11 11:39:28 -07:00
Jeff Tinker
8611de4ead Fix AUPT: Native crash in /system/bin/mediaserver
Protect against invalid memcpy to NULL

bug: 15163357
Change-Id: Ifab17714473f45cb714a0ee765638733b3236ec8
2014-05-30 17:06:13 -07:00
Jeff Tinker
6f35b0b86c Fix multilib issues
Change-Id: I069c8681d2b25221e8767db9437dbfded5618283
2014-05-21 22:25:02 +00:00
Colin Cross
ad27688791 cryptoPlugin: only build libwvdecryptcommon for 32-bit
WVCryptoPlugin::decrypt stores a pointer in a uint32, so it cannot
be built for 64-bit until the api is changed.  Force it to only
build for 32-bit for now.

Also set -Wno-unused-parameter to silence unnecessary warnings
so I can see the build error.

Change-Id: I7cc13cc1d8a06b17468fab6f3b28886f9af02e24
2014-05-05 18:48:18 -07:00
Edwin Wong
e17c61edb1 am ebce9a58: am 7eb1a295: am 77fcf29b: am 35c8fc94: am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit 'ebce9a58de23c0883fb4f5d02bc4c699d697e87a':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:37:20 +00:00
Edwin Wong
77fcf29b15 am 35c8fc94: am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '35c8fc94708ea1a476014035b66d372051d509db':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:23:11 +00:00
Edwin Wong
35c8fc9470 am 15d45e0c: am 8ca56c3f: am 01403eff: am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '15d45e0c77c6bd6f7f6931957b254b01339d69ea':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:13:18 +00:00
Edwin Wong
01403eff12 am c9c20cc6: am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit 'c9c20cc64803bf885746b3c9ebe6b8f19bff9bfd':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:05:17 +00:00
Edwin Wong
c9c20cc648 am 62d84540: am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '62d845404c0b5cfb5bb0e0e3f4fcd12970a5ba72':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 18:01:34 +00:00
Edwin Wong
62d845404c am 1825fda8: am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '1825fda8fda9c5037cacc175f3d2ef1579fd7cb0':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:59:32 +00:00
Edwin Wong
1825fda8fd am 96449440: Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
* commit '964494409f2ce720557eb617ef44caf9ac10c05d':
  Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
2014-04-25 17:56:16 +00:00
Edwin Wong
964494409f Add Widevine Classic Security Integration Guide docs to /vendor/widevine/proprietary/docs.
To make the information readily accessible for vendors who have signed the IDA
and to better sync the doc to our code base.

Access to /vendor/widevine is controlled and vendors need to sign the IDA.

bug: 14228621
Change-Id: I3aaa2574d99c0123cb5e0fe0f093763a973aefaf
2014-04-24 15:32:29 -07:00
Edwin Wong
0c0c21bb47 Upgrade Widevine Classic to 4.5.0.10120
Fix crash in WV_Teardown() causes by deleting shared output parser object.

We used to have a single output parser object and a single memory chunk object
that are shared by multiple sessions. When we delete the output parser, another
session may still be using it. The deletion causes a native crash intermittently.

The fix addresses these two issues: i)output parser object is now created per
session, and ii)add reference count to keep track of the single memory chunk
object use so we do not delet it while other sessions are still using it.

Merge of https://widevine-internal-review.googlesource.com/#/c/9253/ and
https://widevine-internal-review.googlesource.com/#/c/9271/ from widevine repo
RC/4.5.0/601_AndroidOS_K branch.

Change-Id: I7ce467a514904c9087f0da5cea74e4b85fcac1b3
related-to-bug: 13208359
2014-03-14 20:10:16 -07:00
Edwin Wong
dc3eebafa6 Upgrade Widevine Classic to 4.5.0.10120
Fix crash in WV_Teardown() causes by deleting shared output parser object.

We used to have a single output parser object and a single memory chunk object
that are shared by multiple sessions. When we delete the output parser, another
session may still be using it. The deletion causes a native crash intermittently.

The fix addresses these two issues: i)output parser object is now created per
session, and ii)add reference count to keep track of the single memory chunk
object use so we do not delet it while other sessions are still using it.

Merge of https://widevine-internal-review.googlesource.com/#/c/9253/ and
https://widevine-internal-review.googlesource.com/#/c/9271/ from widevine repo
RC/4.5.0/601_AndroidOS_K branch.

Change-Id: I6426b544a6d0c264ec91a89e92153862b87607f3
related-to-bug: 13208359
2014-03-13 20:30:05 -07:00
Rahul Frias
21304f16fe Correct encoding of make/model information
Some make and model information was not being reported correctly to the
license server. "HTC One X+" was encoded as "HTC+One+X+" instead of
"HTC+One+X%2B", which when decoded becomes "HTC One X ". Make and model
information is now correctly url encoded.

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

b/12722013

Change-Id: I987691c850648f92b408f8749327ff43b13b43a7
2014-03-13 11:14:44 -07:00
Colin Cross
6386692315 am d6b79557: widevine: support multilib builds
* commit 'd6b79557aba05ad10f5ad4dda01800f07c11a888':
  widevine: support multilib builds
2014-02-21 13:54:20 +00:00
Colin Cross
d6b79557ab widevine: support multilib builds
Support builds for multiple architectures the same time:
Use LOCAL_MODULE_TARGET_ARCH to restrict building to specific arches
Use LOCAL_C_INCLUDES_x86 to set the include path for only x86 builds

Change-Id: I7c33c27f1c9bfb6e3318a07514698992482f6cd7
2014-02-20 12:48:45 -08:00
Andy Hung
641456cdcc Handle IOException from MediaCodec factory methods
Bug: 11364276
Change-Id: I930f37e8c2cba77e1da3d6a6878186182282b51e
Signed-off-by: Andy Hung <hunga@google.com>
2014-01-16 12:15:26 -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
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
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
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
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
acb47e0f9a Move OEMCrypto_Initialize earlier
Some OEMCrypto calls are happening before OEMCrypto_Initialize.
This change moves initialization earlier so it occurs before
any other calls to OEMCrypto.

bug: 10582250
Change-Id: Ic8992e8f0738dbfeb10074a4e1543bb9931a49d5
2013-10-28 15:53:52 -07:00
John "Juce" Bruce
071f699892 DO NOT MERGE - Update Widevine Classic on JB-MR1.1 to 4.5.0.10107
This updates the Widevine Classic libraries to version 4.5.0.10107.
This version backports the bugfix for the IPv6 issue from JB-MR2.
Also, the Widevine build system has been updated to support all six
flavors. (2 security levels x 3 instruction sets)

This change adds x86 L1 binaries and MIPS L3 binaries, as these have
been validated by partners.

Bug: 10246711
Change-Id: Ic0cf32ffd82fc8dacced84cecdee059afa1049ca
2013-10-01 15:12:21 -07:00
John "Juce" Bruce
67a83a22f7 DO NOT MERGE - Update Widevine Classic to 4.5.0.10107
This updates the Widevine Classic libraries to version 4.5.0.10107.
This version has identical functionality to the previous version,
however the version number has changed because the Widevine build
system has been updated to support all six flavors. (2 security
levels x 3 instruction sets)

This change adds x86 L1 binaries and MIPS L3 binaries, as these have
been validated by partners.

Bug: 10246711
Change-Id: Ie14e48aec33b0cc5d63752e24ba88284c6e37aa9
2013-08-28 12:03:42 -07:00
Jeff Tinker
ddf957faa5 Removing usage of a deprecated error code
A widevine-specific error should not have been defined in frameworks.
Submit before https://googleplex-android-review.git.corp.google.com/#/c/338406/

Change-Id: Ie47250ef987a028e09ff553881ac166214244927
2013-08-02 23:34:30 -07:00
Lajos Molnar
d5f85fd131 Really fix stop() in samplePlayer when using MediaCodec mode
Make getBufferPercentage() and getPosition() work when the
media is reset.

Change-Id: I7d696fd9b5c62b42aa0d29348e73f1f5755eb075
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9516405
2013-06-28 08:07:02 -07:00
Lajos Molnar
39fa902e87 Fix stop() in samplePlayer when using MediaCodec mode
When stopping media, getBufferPercentage() and getPosition() may
still be called by MediaController, unless we disable it.

Change-Id: I947fbfb2de724bdcb3121ca9fb204c8bea2a84b2
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9516405
2013-06-27 14:00:16 -07:00