Commit Graph

446 Commits

Author SHA1 Message Date
Edwin Wong
f7c043f32d resolve merge conflicts of fea63b4062 to jb-mr1-dev.
Change-Id: Ia5dd0316bb057dbc2e185f720d194548d2a370a6
2015-10-19 18:22:48 -07:00
Edwin Wong
fea63b4062 am 1e4bfd6f: Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
* commit '1e4bfd6f593877467514657c065e897b49db8a75':
  Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
2014-08-25 18:28:46 +00:00
Edwin Wong
769288d009 Update Widevine Classic Library to 4.5.0.10109 **** DO NOT MERGE ****
Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10863/

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

bug: 15932110
Change-Id: Ibdeccd4de9625b6bbb57e5b8c35deb9f51a2b65d
2014-08-20 16:39:49 -07:00
Edwin Wong
1e4bfd6f59 Update Widevine Classic Library to 601_AndroidOS_J.7809 **** DO NOT MERGE ****
The toolchains that built the previous x86 libraries are no longer available.
Attempt to patch the tools was unsuccessful and the output will be greatly different
from previous build, and we do not have any jb-dev x86 devices in house for testing.
The x86 libraries were a special build for specific vendors. Therefore, the x86
libraries will not be updated in this CL.

The arm libraries were built using the same toolchains and svn revision as the previous
version, with updated Jam files pointing to openssl-0.9.8za.

Add reference to openssl-0.9.8za submodule.
https://widevine-internal-review.googlesource.com/#/c/10863/

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

bug: 15932110
Change-Id: I72ef476d8900418aae76e05eb9cb30154c911ede
2014-08-20 11:12:45 -07: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
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
Rahul Frias
67e5153805 Add Widevine jb-mr1 libraries for x86 (DO NOT MERGE)
The widevine library version is 4.5.0.10095. This includes,

Correct tool version for x86 jb-mr1 builds
https://widevine-internal-review.googlesource.com/3154

Update Build Script for Android
https://widevine-internal-review.googlesource.com/3340

Fixes to Jenkins build script for Android JBMR1 builds.
https://widevine-internal-review.googlesource.com/3551

Add Android property os.build.fingerprint to license request
https://widevine-internal-review.googlesource.com/3390

b/7594544 - Support x86 build on jb-mr1

Change-Id: I99f969470314c37359772de9471315dc5a6565cd
2013-03-29 09:51:12 -07:00
Jean-Baptiste Queru
bdf5e47391 Reconcile with jb-mr1-release - do not merge 2013-03-11 12:28:39 -07:00
Edwin Wong
d0c2e46e42 am 63f5ec89: (-s ours) am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
* commit '63f5ec89537598b885a88b9e74d8ef2029159005':
  Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 10:00:20 -08:00
Edwin Wong
63f5ec8953 am 583b50d5: Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
* commit '583b50d5d3a87c48d42b3d604ea7cadc1b0102be':
  Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
2012-11-16 09:57:46 -08:00
Edwin Wong
583b50d5d3 Widevine library Version 4.5.0.1 AES 601_AndroidOS_J_MR0; DO NOT MERGE
Initial library release for Intel Medfield x86 SOC

Change-Id: I4a8e5f98fb46e19a664602dd3d406df774103956
related-to-bug: 6842444
2012-11-15 14:51:13 -08:00
The Android Automerger
536517cfa7 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-23 23:36:27 -07:00
Jeff Tinker
aac6868830 Update Widevine Libraries Version 4.5.0.10087
This change updates the Widevine binary libraries.

It includes the change:
Correct error returned by ProcessDrmInfo
https://widevine-internal-review.googlesource.com/#/c/1870/

bug:7320744
Change-Id: Ic73a5dfa70140093224e9ce651947b224bdeccb9
2012-10-23 12:33:51 -07:00
Fred Gylys-Colwell
607d91108f am f4ca146c: (-s ours) am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
* commit 'f4ca146ca9d0c388b83c083ad6dd1c8fef81231f':
  Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 13:54:55 -07:00
Fred Gylys-Colwell
f4ca146ca9 am 87fa1829: Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
* commit '87fa1829685aeebd340edf0bf1b501f438e9dc30':
  Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
2012-10-05 13:52:23 -07:00
John "Juce" Bruce
f1da185ed4 [WVDRM] Fix effectively-unlimited memory usage
Change 14f0d to read the maximum buffer size from a device property did not
work correctly on Mako and Prime devices, as they did not have the property
set, and the code to fall back to a default value was not working. An empty
string would be read instead of the default value, resulting in a maximum of
zero. Because Widevine Media Kit would then subtract a few megabytes from this,
it would underflow, giving a maximum buffer size of several gigabytes. This
would lead to the download code trying to pre-buffer the entire, many-gigabyte
movie. As the media server's memory usage grew and grew, other programs would
become starved for memory, leading to most other processes on the phone being
forced to close. Eventually, the playback app, the media server, or some other
crucial piece of functionality would be starved, resulting in a crash.

The fix is to fix how we get the default, so that when the property is not
available, we get a sensible result. We check the return value of property_get.
If it is greater than zero, the property was read successfully, and we parse
the answer. If it is equal to (or less than) zero, we fall back to the default
value.

Bug: 7222769
Change-Id: Ie6186a0533036ab8fa45b1e467611d55f7c345ac
2012-10-04 18:06:44 -07:00
Fred Gylys-Colwell
87fa182968 Revert "Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)"
This reverts commit 4bdfcc990b

This change was causing some deadlock problems.
bug: 7144860
bug: 7132419

Change-Id: I6a45459b0be024c8c36ccca3b2e2d304ddd94ee9
2012-10-04 12:57:27 -07:00
John "Juce" Bruce
c671e40432 Merge "[WVDRM] Fix effectively-unlimited memory usage" into jb-mr1-dev 2012-10-04 11:37:33 -07:00
John "Juce" Bruce
2ce9ab8e67 [WVDRM] Fix effectively-unlimited memory usage
Change 14f0d to read the maximum buffer size from a device property did not
work correctly on Mako and Prime devices, as they did not have the property
set, and the code to fall back to a default value was not working. An empty
string would be read instead of the default value, resulting in a maximum of
zero. Because Widevine Media Kit would then subtract a few megabytes from this,
it would underflow, giving a maximum buffer size of several gigabytes. This
would lead to the download code trying to pre-buffer the entire, many-gigabyte
movie. As the media server's memory usage grew and grew, other programs would
become starved for memory, leading to most other processes on the phone being
forced to close. Eventually, the playback app, the media server, or some other
crucial piece of functionality would be starved, resulting in a crash.

The fix is to fix how we get the default, so that when the property is not
available, we get a sensible result. We check the return value of property_get.
If it is greater than zero, the property was read successfully, and we parse
the answer. If it is equal to (or less than) zero, we fall back to the default
value.

Bug: 7222769
Change-Id: Ie6186a0533036ab8fa45b1e467611d55f7c345ac
2012-10-03 19:12:35 -07:00
The Android Automerger
5563d9be8a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-03 07:01:13 -07:00
Fred Gylys-Colwell
b1a1aa7b86 Update Widevine Libraries Version 4.5.0.10086
This change updates the Widevine binary libraries.

It includes the change:

Corrected error returned on timeout
https://widevine-internal-review.googlesource.com/1617

b/6758866

Change-Id: I81ac5d14823499b83a237406e7c5d345a15f6434
2012-10-02 13:43:35 -07:00
The Android Automerger
056fa76db3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-02 07:01:17 -07:00
Jeff Tinker
71422e7a2a Merge "[WVDRM] Fix for stuttering on low bandwidth" into jb-mr1-dev 2012-10-02 01:26:13 -07:00
Edwin Wong
624f38bb0c Merge "Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"" into jb-mr1-dev 2012-10-01 15:20:10 -07:00
Jeff Tinker
54993c50e9 [WVDRM] Fix for stuttering on low bandwidth
Reintroduces the play/pause rebuffering logic we eliminated
in JB zero day to fix double spins and slow startup - but
activates that logic only based on a comparison of the
current bandwidth measurement and the lowest bitrate track
in the movie.

Needs to be submitted with related changes in /frameworks/av

bug: 7230071
Change-Id: Ib3859a961bd3901a9c4df01eeab2b8b75f49aefe
2012-10-01 15:17:07 -07:00
Fred Gylys-Colwell
59e30852dd Update Widevine Libraries Version 4.5.0.10085
This change updates the Widevine binary libraries.
It includes the change:
https://widevine-internal-review.googlesource.com/1400
Cleaned Up Locks and Removed Pause/Resume

bug: 6799914
Change-Id: I5e266e4d8bdc92e88e488d90aa5312ac740303b0
2012-09-28 18:11:34 -07:00
Edwin Wong
ca21c93f66 Revert "When Running in MediaCodec Mode, Widevine Freezes If You Rewind"
This reverts commit 2e0e32f9f7

Change-Id: I1362839633bca4260d83f470a780d93b8de431ca

related-to-bug: 7216099
related-to-bug: 7223566
2012-09-28 17:47:37 -07:00
The Android Automerger
18f9dccb46 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-27 07:01:46 -07:00
Edwin Wong
4fffa0ff6a Fixed mediacodec mode's fatal error when eos is encountered.
The FATAL EXCEPTION is caused by the decrypt function returning -EINVAL
when OEMCrypto decrypt returns an error. The fix is not to call
OEMCrypto decrypt when eos is reached.

related-to-bug: 7216928
related-to-bug: 7217609
Change-Id: I8f006905386e2cdfb907d4ab15c766ae69f20f00
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-26 22:46:35 -07:00
The Android Automerger
e396075c34 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-25 07:02:04 -07:00
Gene Morgan
4e3efb415b Keep local file open for DrmManagerService::acquireDrmInfo().
Bug: 7208979
Change-Id: I1b7798929f55b956e43bb9ed1a0f41dec9342be4
2012-09-21 17:50:10 -07:00
The Android Automerger
0afc221250 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-21 07:01:58 -07:00
Fred Gylys-Colwell
845e53e684 Update Widevine Libraries Version 4.5.0.10082
This change updates the Widevine binary libraries.

It includes
https://widevine-internal-review.googlesource.com/1330
Add an argument to AcquireDrmInfo() for passing in the FD of an open file.

IMPORTANT: This change should be merge at the same time as these two:

https://googleplex-android-review.googlesource.com/226382
https://googleplex-android-review.googlesource.com/222797

bug: 7092908
bug: 6769768

Change-Id: I6931f9e4783234348ab384275fdc2ba374f6b591
2012-09-20 11:54:02 -07:00
Gene Morgan
8cd5d09119 Allow DRM client to pass the FD of an open file to the DRM server.
This allows a DRM client to open a locally-cached file on behalf of the
DRM server so the DRM server no longer requires the sdcard_r permission
to access the file's metadata.  Specifically, this adds an optional
attribute FileDescriptorKey to the DrmInfoRequest.

This change is dependent on this Widevine CL:
https://widevine-internal-review.googlesource.com/#/c/1330/

Relevant bug reports:
bug: 6426185

Change-Id: Ia7bcb2455c7a55fa4c7c7061de4d672957c7ac0a
2012-09-20 11:42:09 -07:00
The Android Automerger
c09344ebe3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-19 07:02:51 -07:00
John "Juce" Bruce
b092b158d2 Merge "When Running in MediaCodec Mode, Widevine Freezes If You Rewind" into jb-mr1-dev 2012-09-18 14:37:52 -07:00
Jeff Tinker
86cddd376b Merge "[WVDRM] Allow adaptive logging of more than 10 tracks" into jb-mr1-dev 2012-09-18 11:23:58 -07:00
John "Juce" Bruce
2e0e32f9f7 When Running in MediaCodec Mode, Widevine Freezes If You Rewind
There was a subtle interaction between Widevine's libraries and MediaCodec
mode.  Widevine's code assumed (erroneously) that video seeks would always
happen before audio seeks, and because we can't seek audio and video
independently from each other, we would ignore audio seeks but respect video
seeks.  This led to a problem since MediaCodec mode calls seeks in arbitrary
order.

Fix is to always respect the first request we get to seek and ignore the
second.

Bug: 6793514
Change-Id: Ic9ec60e0e0f606c7a0de6283dd4c30318eebdbad
2012-09-17 15:54:42 -07:00
Jeff Tinker
33b24fba9d [WVDRM] Allow adaptive logging of more than 10 tracks
Change-Id: I9d2f8efcc658532dc2a0b1d69b8551444120f664
related-to-bug: 7173307
2012-09-17 15:08:42 -07:00
The Android Automerger
ce01a4bb65 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 14:11:27 -07:00
Fred Gylys-Colwell
38e5d5912c Merge "Add InfoListener to Widevine Test Application" into jb-mr1-dev 2012-09-14 12:54:36 -07:00
James Dong
151c96fe6d Revert "Update Widevine Libraries to Version 4.5.0.10079"
This reverts commit 8bbea70f79.

o related-to-bug: 7132419
2012-09-14 09:44:05 -07:00
James Dong
be20f24819 Revert "Update Widevine Libraries to Version 4.5.0.10079"
This reverts commit 8bbea70f79.

o related-to-bug: 7132419
2012-09-14 00:04:20 -07:00
Fred Gylys-Colwell
da4abe2680 Add InfoListener to Widevine Test Application
In order to test the MediaPlayer info events, an OnInfoListener was added to
the VideoPlayerView class.  It is set to listen to events coming from the
videoView.  This allows testers to verify that events are occuring.

Note: This change was made by Alexander Oliphant who does not have write
permission to commit to the Android tree.

Change-Id: Ia2faa927b4fe2850e15644bd332e50601a424c4a
2012-09-13 16:40:34 -07:00
The Android Automerger
d1edb8e0f5 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-12 07:01:18 -07:00
Edwin Wong
d72b67cdeb Add getError and setError to propagate error code from WVMMediaExtractor up to player.
Error code from the plugin is not propagated from WVMExtractorImpl.cpp to the MediaPlayer.
The two APIs addresses this issue and provide a path for the player to retrieve the last error.

Change-Id: I60040eaf2d396379eecca46bfe333c44a39c35ec
related-to-bug: 7073630
2012-09-11 17:38:57 -07:00