Commit Graph

57 Commits

Author SHA1 Message Date
Jeff Tinker
df066c0634 Widevine library update for Jellybean DO NOT MERGE
This release contains widevine library version 4.5.0-7201

Fix NPE in videos app due to missing license status
Resolve SIGPIPE fault in mediaserver

Change-Id: Ib51f4ca5560d3e50363ed4933e07e29e8ab74c7c
related-to-bug: 6512128
related-to-bug: 6528820
2012-05-22 17:36:25 -07:00
Jeff Tinker
cf425f5bbc Fix file descriptor leak in WV library
In ICS we overloaded the curl fd close callout to enable
attributing bandwidth usage to the proper app instead of
the OS.  When you use the curl close callout, you are
expected to explicitly close the file, curl does not do
it for you.  This change adds an explicit fd close on the
curl callout.

Includes widevine library 4.5.0.7147

Change-Id: Ie22e6186f88b55a96e06f63e07f2746349aeae4e
related-to-bug: 6500752
2012-05-17 06:59:58 -07:00
Jeff Tinker
35064be9c6 Revert Widevine 6.0.0 -> 4.5.0 libraries
DO NOT MERGE

Source and library changes to roll back to 4.5.0, including
maintaining the DRM HAL support.

Includes Widevine libraries 4.5.0-7111

Change-Id: I420c6990748e95ad7516ecb2397ebf7707a157f4
related-to-bug: 6492434
2012-05-14 15:06:13 -07:00
Jeff Tinker
c7214ed13e [WVDRM] Fix buffering gets stuck late into movies
Includes Widevine libraries version 6.0.0.7036

Change-Id: I84a6d6853b999571bb7cde812cd44b31436ae972
related-to-bug: 6449713
2012-05-07 18:35:22 -07:00
Jeff Tinker
0b993f0ae4 Widevine library update 6.0.0-7012
This widevine library release includes fixes for the
following defects:

6422432 Unable to watch video due to stream buffering
5543268 DRM: Stuttering in playback of HD movie rental
6444359 [WVDRM] Excessively long startup on movie playback in JellyBean
6448147 [WVDRM] Short and Long Clocks are Identical
5571083 Lot of stuttering when on mobile network

Change-Id: I0ad4e8dbfc73df81e708591158d4c6189048f154
related-to-bug: 6422432
related-to-bug: 5543268
related-to-bug: 6444359
related-to-bug: 6448147
related-to-bug: 5571083
2012-05-04 22:06:03 -07:00
Jeff Tinker
e3c3350281 Fix Widevine error reporting in JellyBean
Includes Widevine library version 6.0.0-6969

Change-Id: I4a606cd730251bfa449f67e8214c3cb411bd3311
related-to-bug: 6429947
2012-05-02 12:22:02 -07:00
Jeff Tinker
92dda7e094 Fix android build for Widevine L3 devices (crespo, trygon)
This patch includes Widevine libraries Version 6.0.0-6859
for L3 devices.

Change-Id: Iddc667393ffe9bd06dc665a8ed3a52f35fb93516
related-to-bug: 6428219
2012-05-01 17:46:22 -07:00
Jeff Tinker
3397e72468 Fix offline license requests and error events
Corrected a regression in error event reporting and a
mismatch in asset paths during rights acquisition.

Also requires https://android-git.corp.google.com/g/#/c/185898/

Contains Widevine libraries version 6.0.0-6957

Change-Id: I4a7603a86feaf437673fc73f0cccb6065dbcce67
related-to-bug: 6414503
2012-05-01 15:46:14 -07:00
Jeff Tinker
ec2d703970 Fix ERROR_IO due to timeout on video stream and corrupt samples
This change applies to the wv extractor when used in conjunction
with new MediaCodec model.

Change-Id: I999990ff41d35641110a58472f1cdb8c4c7db02e
related-to-bug: 5986621
2012-05-01 13:10:42 -07:00
Jeff Tinker
a9f82e979f Add CryptoPluginMode to WV extractor
Allows the WV extractor to run in a mode that is compatible with
the DRM CryptoPlugin HAL API, where decryption is deferred
until the encrypted data is sent through the CryptoPlugin to
the codec.

This patch does:
 (1) Adds a flag mCryptoPluginMode that controls this behavior
     [Note: need framework support to enable/disable this]
 (2) Accumulates information in track metadata to delineate
     crypto unit boundaries for the CryptoPlugin

related-to-bug: 5986621

Change-Id: I3318d5cde38c7b02a7bdb56aca9aece852c9781c
2012-04-26 14:50:28 -07:00
Jean-Baptiste Queru
aaa8479c34 Allow disabling the generic implementation.
Some device like grouper have their own.

Change-Id: I3a2c7e00c1a3158bd4555fefea8c7cee3e426230
2012-04-13 17:11:16 -07:00
Jeff Tinker
300d172ba4 [WVDRM] Reorg of binary libs into proc-specific folders
Rahul's changes in preparation for adding x86 support

Change-Id: Ib51dfa72291857c44be37595be2205dd040fc0dd
related-to-bug: 6276794
2012-04-10 17:26:58 -07:00
Jeff Tinker
462dc030f8 Upgrade of Widevine libraries from 4.5.0 to 6.0.0
Upload for Dave Parsons

6.0.0 Widevine libraries contain the features required
to support multiple audio tracks and subtitles.  This
is establishing the baseline for those features.

Change-Id: If12074bb2e4364c8107339e2f69453c40698e91f
related-to-bug: 5880566
2012-04-05 15:49:32 -07:00
Jeff Tinker
c8a09dfe42 Protect against rollover of LICENSE_START_TIME when clock is set back
Contains Widevine library version 4.5.0.6480

Change-Id: I735d4a07c38f0eb781f7c5338229b179fdc3a550
related-to-bug: 6202995
2012-03-30 17:12:12 -07:00
Jeff Tinker
835420c31d Fix videos app bandwidth accounting for streaming over 4G
Attribute traffic on socket descriptors to UID of videos app

Multi-repository commit, see also changes in frameworks/base/media.

Includes Widevine library version 4.5.0.6153

Change-Id: I5ddf1b7b758edc82d48a788fc30616d90cab4bd0
related-to-bug: 5434244
2012-03-08 15:08:47 -08:00
Edwin Wong
beb9b7b603 Add support to query through DrmInfoRequest::TYPE_REGISTRATION_INFO to check if a device is provisioned.
Includes Widevine lib version: 4.5.0.5781 AES BR_PYTHON2

Change-Id: Id5e673b97e3ec80532e2d7f42aae687adfecc765
related-to-bug: 5152997
2012-01-27 09:40:36 -08:00
Jeff Tinker
65d4c7ab20 Fix security hole and hang on movie playback
Security hole is in /data/drm world writable directories
Hang on movie playback was found on ASUS TF201

Sorry, can't make these independent since binary libs aren't
mergeable.

Contains Widevine library Version 4.5.0.5753

Change-Id: I01ddfc5b2390f15d5d187dd6581b0a01743f4a68
related-to-bug: 5834297
related-to-bug: 5874137
2012-01-20 10:31:40 -08:00
Jeff Tinker
c00a26a05f Fix OMX codec error playing Widevine content on Nexus S
Includes Widevine library version 4.5.0.5561

Change-Id: I9c69466bd7d055c64a3e8be0804793fe38977161
related-to-bug: 5699816
2011-12-12 10:22:05 -08:00
Edwin Wong
e8951bc684 Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error
Include Widevine library version 4.5.0.5244

5489833 - live stream aborts early
  ignore continuity counter error warning (status=2014)

5414035 Telstra content cannot play, duplicate of 5489515
5489515 cannot play Disney content
  Telstra content has 4 bytes of AudioSpecificConfig instead of 2
  Disney content has 5 byte AudioSpecificConfig whereas 2 bytes appears to be correct for AAC-LC

5207482 SIGSEGV happens on pressing "Show Rights" during playback of expired movies

Change-Id: Iacc0d02d328c228d28b8cc8be93e63fe9f8b4600
related-to-bug: 5207482
related-to-bug: 5414035
related-to-bug: 5489515
related-to-bug: 5489833
2011-11-10 17:36:05 -08:00
Edwin Wong
111050c07d Adjusts seeks too close to the end in WV_Play, which allows processing of end-of-program markers.
Uploaded WV libs 4.5.0.5066 for Thomas Inskip. Fixed movies not restting to beginning after fastforward to end.

BUG: 5489972
Change-Id: Iad4b2933b47b6614db8e9d75c9d6a5f3f4bc3201
2011-10-28 13:45:14 -07:00
Jeffrey Tinker
82d675f15d [DRM] Terminate HTTPClient thread after content type sniff
Eliminates a measureable power increase after playing YouTube content

Includes Widevine library version 4.5.0.5033

Bug: 5502951
Change-Id: I6ce1582d71d8e7598f1ea0b9d64b22eb6fde3caa
2011-10-25 18:33:47 -07:00
Jeffrey Tinker
073b6b2008 Fix segfault during Widevine playback on switch between .wvm and live
This build includes Widevine release libs version 4.5.0.4972

Bug 5487873

Change-Id: Id1e38de5716fc08758e0369d1f1378860972ed73
2011-10-20 01:05:54 -07:00
Jeffrey Tinker
782380915e Fix playback failure on sample HD 1080p Widevine DRM content
This change includes Widevine library release version 4.5.0.4968

Bug 5455559

Change-Id: I862669ab3a2f7bc33f69b9ea38fa6d1dbb838d35
2011-10-19 20:26:44 -07:00
Edwin Wong
7cc8cb25d2 Fixed always getting -1004 error and "Connection to server lost" on long seek bugs.
Includes Widevine release libs version 4.5.0.4957.

BUG: 5382956,5463212
Change-Id: Ieb28ed4d710f000e881b4a7160d3260d72323587
2011-10-19 12:41:50 -07:00
Jeffrey Tinker
8cecb914c3 Fix incorrect error returns from DRM plugin
Includes Widevine library release 4.5.0.4946

Bug 5223230

Change-Id: Ie68d3a821c22b3b0b9b720560fee6768838f1a08
2011-10-18 15:25:20 -07:00
Jeff Tinker
bcfe38dcb0 Fix failure to play through the end of wv videos
Properly compute the buffered and remaining time, also properly account
for the different old and new rates at adaptive switch and other
performance tuning related to b/5153227.

Includes Widevine release libs version 4.5.0.4936

Bug 5336777

Change-Id: I997ea353b7c320dca5e3f5c065395dca206d35a6
2011-10-17 15:11:06 -07:00
Edwin Wong
1fee8fd75a Install proprietary userspace modules under /vendor.
BUG: 5284436

Change-Id: I9921b8446626b7041a3fc66bff918d3adac5bbe1
2011-10-14 14:09:12 -07:00
Jeffrey Tinker
f5fa8f2017 Changes for calling the level 1 decrypt callout
Change-Id: Iccf76b59a64491952ee11ee2ed1a0e707a529f88
2011-10-07 19:25:20 -07:00
Edwin Wong
ceac204c61 Revert "Install proprietary userspace modules under system/vendor. BUG: 5284436"
This reverts commit 784469b355
2011-09-22 17:08:37 -07:00
Edwin Wong
784469b355 Install proprietary userspace modules under system/vendor.
BUG: 5284436

Change-Id: Ib338b4665a086abde83028a78f51372275ca83b7
2011-09-15 18:01:55 -07:00
Edwin Wong
ba14720f8e Widevine HLS live stream support for L1 secure playback.
Check in for Jeff Tinker.
BUG 5081725

Change-Id: If1d828e97319788ab52c6f15a7782a1da63d8f20
2011-09-08 15:11:37 -07:00
Doug Zongker
78a88a014f strip the widevine prebuilt .so's
Change-Id: I57c7622b321d04a89a1e7df291169f2c5c3ec15d
2011-09-06 09:53:12 -07:00
Edwin Wong
766d206a31 Address 5069044: non rooted device getting error 49.
This error is hard to reproduce, it can be caused by file system error at boot; with this change, the drm will reprovision the device when the file system error occurs.

Change-Id: Ibec7077913b7efe3be41542600b169bcdf5d0ba4
2011-09-01 19:35:26 -07:00
Jeff Tinker
4105c3c146 Fix for build break - trygon image size too large.
Change-Id: I118b4059feb1049f0017b5cad62acb3d2ab2cb6f
2011-08-13 07:38:26 -07:00
Jeff Tinker
9e8923789e Some restructuring of the build was required to support the different
OEM security levels used on tuna vs stingray & crespo. This is part of
the work for b/4598045 Implementing secure video path on TI OMAP4 chip
for ICS.

The Widevine libraries included here, 4.5.0.4321 also contain a fix
for b/4400696 Pinning and unpinning multiple movie for download behavior
is not uniform for multiple tries.

Change-Id: I67f34c06a0353ac7f401f55c1ed4fc2493bc8ab7
2011-08-12 11:38:16 -07:00
Edwin Wong
7c45fff99a Fixed 3510047: MediaPlayer ANR if play or seek past end of file.
Change-Id: I733dbf20dc67a5f2c49fbb994291f98e2dce650a
2011-08-03 15:43:08 -07:00
Jeffrey Tinker
a2841093fd Merging fix for b/4520353 Move make/model usage in field provisioning to server whitelist from mr1 to mr2
Change-Id: I5227b166867855bafd0516175709ffb4cd1e5e94
2011-06-08 17:50:28 -07:00
Jeffrey Tinker
66d9ff5fb5 Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
Change-Id: Id3a8a997fb1186c6af6e94f2fc2d4788238a0452
2011-05-26 11:25:05 -07:00
Edwin Wong
a7d2e068b6 Fixed 4438229 Widevine extractor tries playing back non-WV .TS file over HTTP on HC MR1
Change-Id: If9b3e0469040b8c85b32a3196e995a38861a585b
2011-05-25 10:16:55 -07:00
Jeffrey Tinker
07b60098b3 Fix for b/4198446 HC - Support for Widevine Adaptive VOD
Fix for b/4075745 libWVStreamControlAPI crashes when dlopened() and dlclosed()
Added error logging to diagnose problems such as b/4430078 Playback of newly rented
    movie fails with "license expired"

Includes Widevine library build Version 4.5.0.3682

Change-Id: I5708bb3fb92f05a3dd1768620157a795ccebd57a
2011-05-23 18:05:39 -07:00
Jeffrey Tinker
b0543e305c Fix for b/4375037 Rental expired error message for the newly rented movie
Fix for b/4378589 Native crash on playback of same movie rented immediately after expiry
Fix for b/4394061 Intermittent license failure with client signature verification error

Change-Id: Ifafc768c1113ffeca5b0654cbb13db88273eda11
2011-05-06 21:32:06 -07:00
Jeffrey Tinker
d3679fa54b Edwin's fix for b/4282251: AACDecoder log spam after device key failure - required reboot
Change-Id: Id28dd6ecf10175dd21a13a3d455ffcf3b4ad8116
2011-04-27 23:06:31 -07:00
Jeffrey Tinker
e48b4f1797 Fix for b/4163352: STOPSHIP: DRM enforcement of secure device conditional on settings
Fix for b/4303904: HMJ19 ate my licenses after OTA

Change-Id: Ife18b525cb8166c618fca1c5932950a29437bbb4
2011-04-27 16:32:44 -07:00
Jeffrey Tinker
7f53ca1647 Fix for b/4330146: license corruption after OTA update
Fix for b/4217102: ANR after the movie expired
Fix for b/4202971 ANR upon expiry during playback, followed by license fetch failure

Change-Id: Ieb6e6392ca74333517889f7b14ec508234a8d805
2011-04-25 14:21:35 -07:00
Jeffrey Tinker
a342c0828c Fix for b/4331109, b/4332630, b/4274620 HTTPClient thread leak
Also added logging to heartbeats so we can detect failures better
    during testing.

    Resolved merge conflict from https://android-git.corp.google.com/g/#change,107298

Change-Id: I0d731f4d21555eff7c80e34fed4b8c335023edc1
2011-04-23 04:03:38 -07:00
Jeffrey Tinker
7c606db261 Fixes for b/4194032, b/4192318 and b/4190560
Found in online/offline testing with heartbeat server:

b/4194032 - when streaming playback is stopped the streaming license is not removed
b/4192318 - streaming licenses are allowing offline playback
b/4190560 - offline heartbeats stopping video playback

Change-Id: Iacf31f559d6b374752ca1b7f2b93d4ec8a4d7440
2011-03-30 10:31:09 -07:00
Jeffrey Tinker
18617b93c6 fix for b/4126624 Widevine DRM client not sending heartbeats
Added some missing parameters to the heartbeat message, found in end-to-end
testing with youtube.  Also enabled heartbeats on client builds.

Change-Id: I445fb0cb168e63a041f0ecf828eaad493143a648
2011-03-25 14:02:08 -07:00
Jeffrey Tinker
ba5fa0ef57 Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes
Also includes b/3500025: A/V resync issues

Change-Id: Ib885d7219d211b188f38e9427bdaecd10fbd7329
2011-03-25 07:20:49 -07:00
Jeffrey Tinker
7458d581cd Merge "Provide a default liboemcrypto called liboemstub for devices that do not have widevine OEM integration but still build the wv libs." into honeycomb-mr1 2011-03-18 16:08:59 -07:00
Jeffrey Tinker
6bed7bfe90 Fix for b/4132041 Widevine DRM plugin getConstraints not returning error
Change-Id: I07f02aabb4b68287eb7978abb5d106c86f2790b6
2011-03-18 13:29:28 -07:00