widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,892 Commits 2 Branches 0 Tags
26bdf1cb7fee0c05d044b282c63959e75d5c91bb
Commit Graph

7892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Gylys-Colwell
f0349e5225 am 59e30852: Update Widevine Libraries Version 4.5.0.10085 
* commit '59e30852ddaa2d1922b1189f8664368705ed1167':
  Update Widevine Libraries Version 4.5.0.10085
 2012-10-01 10:24:40 -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
Jean-Baptiste Queru
0ce4a3155d am 9ff76e70: Merge from jb-mr1-aah-dev 
* commit '9ff76e701579206850692de7634aab6b52ae12b2':
 2012-09-28 15:52:46 -07:00
Jean-Baptiste Queru
9ff76e7015 Merge from jb-mr1-aah-dev 
Change-Id: I63020e77683503de6c8a95c0e7f03ba18c31610d
 2012-09-28 14:48:21 -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
6df02b1e98 am 4fffa0ff: Fixed mediacodec mode\'s fatal error when eos is encountered. 
* commit '4fffa0ff6ab7777db634b3f0cb9b38525a801169':
  Fixed mediacodec mode's fatal error when eos is encountered.
 2012-09-26 22:50:05 -07:00
Edwin Wong
d264a2ad55 am 4fffa0ff: Fixed mediacodec mode\'s fatal error when eos is encountered. 
* commit '4fffa0ff6ab7777db634b3f0cb9b38525a801169':
  Fixed mediacodec mode's fatal error when eos is encountered.
 2012-09-26 22:48:33 -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
dadcf0c492 am 4e3efb41: Keep local file open for DrmManagerService::acquireDrmInfo(). 
* commit '4e3efb415b17573e1e08f57ead6a436690d74fa7':
  Keep local file open for DrmManagerService::acquireDrmInfo().
 2012-09-24 10:10:36 -07:00
Gene Morgan
28dac9d034 am 4e3efb41: Keep local file open for DrmManagerService::acquireDrmInfo(). 
* commit '4e3efb415b17573e1e08f57ead6a436690d74fa7':
  Keep local file open for DrmManagerService::acquireDrmInfo().
 2012-09-24 10:08:35 -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
Fred Gylys-Colwell
77da47c4cd am 845e53e6: Update Widevine Libraries Version 4.5.0.10082 
* commit '845e53e68420439c1c5bbb66e80f4febaecb8915':
  Update Widevine Libraries Version 4.5.0.10082
 2012-09-21 13:34:02 -07:00
Gene Morgan
ab8c97b194 am 8cd5d091: Allow DRM client to pass the FD of an open file to the DRM server. 
* commit '8cd5d09119cd789846f9ddedfdc31439109d5c1c':
  Allow DRM client to pass the FD of an open file to the DRM server.
 2012-09-21 13:34:02 -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
f329eaff4d am 845e53e6: Update Widevine Libraries Version 4.5.0.10082 
* commit '845e53e68420439c1c5bbb66e80f4febaecb8915':
  Update Widevine Libraries Version 4.5.0.10082
 2012-09-20 20:31:08 -07:00
Gene Morgan
08c9cc199e am 8cd5d091: Allow DRM client to pass the FD of an open file to the DRM server. 
* commit '8cd5d09119cd789846f9ddedfdc31439109d5c1c':
  Allow DRM client to pass the FD of an open file to the DRM server.
 2012-09-20 20:31:07 -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
69d2a7c651 am b092b158: Merge "When Running in MediaCodec Mode, Widevine Freezes If You Rewind" into jb-mr1-dev 
* commit 'b092b158d2cb5be6428694e5581d19472b2ec244':
  When Running in MediaCodec Mode, Widevine Freezes If You Rewind
 2012-09-18 14:49:16 -07:00
John "Juce" Bruce
92a7778b0a am b092b158: Merge "When Running in MediaCodec Mode, Widevine Freezes If You Rewind" into jb-mr1-dev 
* commit 'b092b158d2cb5be6428694e5581d19472b2ec244':
  When Running in MediaCodec Mode, Widevine Freezes If You Rewind
 2012-09-18 14:45:29 -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
b2fa5c4552 am 86cddd37: Merge "[WVDRM] Allow adaptive logging of more than 10 tracks" into jb-mr1-dev 
* commit '86cddd376b403b7b3de13af4850f7398812e5561':
  [WVDRM] Allow adaptive logging of more than 10 tracks
 2012-09-18 12:27:35 -07:00
Jeff Tinker
5c4feda5fa am 86cddd37: Merge "[WVDRM] Allow adaptive logging of more than 10 tracks" into jb-mr1-dev 
* commit '86cddd376b403b7b3de13af4850f7398812e5561':
  [WVDRM] Allow adaptive logging of more than 10 tracks
 2012-09-18 12:16:36 -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
Fred Gylys-Colwell
6bddcff940 am 38e5d591: Merge "Add InfoListener to Widevine Test Application" into jb-mr1-dev 
* commit '38e5d5912cb4b654577f63970b9bfbd49f22e83e':
  Add InfoListener to Widevine Test Application
 2012-09-17 11:09:58 -07:00
James Dong
831ab1f6a5 am be20f248: Revert "Update Widevine Libraries to Version 4.5.0.10079" 
* commit 'be20f24819ce816fa9176d06935e8113562910f6':
  Revert "Update Widevine Libraries to Version 4.5.0.10079"
 2012-09-17 10:27:57 -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
e3655bb021 am 38e5d591: Merge "Add InfoListener to Widevine Test Application" into jb-mr1-dev 
* commit '38e5d5912cb4b654577f63970b9bfbd49f22e83e':
  Add InfoListener to Widevine Test Application
 2012-09-14 12:57:24 -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
06293eb191 am be20f248: Revert "Update Widevine Libraries to Version 4.5.0.10079" 
* commit 'be20f24819ce816fa9176d06935e8113562910f6':
  Revert "Update Widevine Libraries to Version 4.5.0.10079"
 2012-09-14 09:26:22 -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
Edwin Wong
dcbf6e38fd am d72b67cd: Add getError and setError to propagate error code from WVMMediaExtractor up to player. 
* commit 'd72b67cdeb4f0293769fa8faeb9d5f7fc976f087':
  Add getError and setError to propagate error code from WVMMediaExtractor up to player.
 2012-09-12 15:35:25 -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
7755340394 am d72b67cd: Add getError and setError to propagate error code from WVMMediaExtractor up to player. 
* commit 'd72b67cdeb4f0293769fa8faeb9d5f7fc976f087':
  Add getError and setError to propagate error code from WVMMediaExtractor up to player.
 2012-09-11 17:55:13 -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
The Android Automerger
e1e8eaaad4 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-09 07:03:08 -07:00
Fred Gylys-Colwell
bb467a81ac am d3c2b6f0: (-s ours) am 2740be7d: (-s ours) am 4bdfcc99: Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE) 
* commit 'd3c2b6f098c2274597a245b69b6f3da92e447b67':
  Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)
 2012-09-07 13:46:11 -07:00
Fred Gylys-Colwell
b91dc87862 am d3c2b6f0: (-s ours) am 2740be7d: (-s ours) am 4bdfcc99: Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE) 
* commit 'd3c2b6f098c2274597a245b69b6f3da92e447b67':
  Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)
 2012-09-06 21:59:21 -07:00
Fred Gylys-Colwell
d3c2b6f098 am 2740be7d: (-s ours) am 4bdfcc99: Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE) 
* commit '2740be7d97473c67ee03e1c350bc69f103cbfac2':
  Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)
 2012-09-06 21:56:00 -07:00
Fred Gylys-Colwell
2740be7d97 am 4bdfcc99: Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE) 
* commit '4bdfcc990b098264d78b56339c722df0b1e68643':
  Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE)
 2012-09-06 21:54:58 -07:00
Fred Gylys-Colwell
e9d53c003e am 8bbea70f: Update Widevine Libraries to Version 4.5.0.10079 
* commit '8bbea70f797e40656feafb64e38139d2fdb588a6':
  Update Widevine Libraries to Version 4.5.0.10079
 2012-09-06 19:32:51 -07:00
Fred Gylys-Colwell
8bbea70f79 Update Widevine Libraries to Version 4.5.0.10079 
Widevine Library for Level 1 and 3: Version 4.5.0.10079 AES 601_AndroidOS_J

This library has the following changes:

https://widevine-internal-review.googlesource.com/1320
Fix multicore synchronization issue in Pump.cpp

https://widevine-internal-review.googlesource.com/1343
Call OEMCrypto_Terminate in DRM Plugin After Setup. (JB MR1)

related-to-bug: 7078790
related-to-bug: 7092908
related-to-bug: 6769768
Change-Id: I4a03b60a1f030d710a2b2dd7f2a1ac3746ec846b
 2012-09-06 19:25:05 -07:00
Fred Gylys-Colwell
4bdfcc990b Update Widevine Libraries to Version 4.5.0.10059 AES 601_AndroidOS_J_MR0 (DO NOT MERGE) 
This library has the following changes:

https://widevine-internal-review.googlesource.com/1317
Update Jamfiles for new Build Environment

https://widevine-internal-review.googlesource.com/1344
Call OEMCrypto_Terminate in DRM Plugin After Setup. (JB MR0)

Change-Id: I9b9850c4601284cafd968d591b9036d46edc460f
related-to-bug: 7092908
related-to-bug: 6769768
 2012-09-06 16:59:24 -07:00