widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
768 Commits 2 Branches 0 Tags
ccecfd7192f0f46ccaa4c4f1ee5b2b14c372b472
Commit Graph

302 Commits

Author SHA1 Message Date
Jeff Tinker
905db3c493 am 4bd9c256: Merge "Widevine library update 6.0.0-7012" into jb-dev 
* commit '4bd9c25643d258fb0b33e85abe8352944e3481e7':
  Widevine library update 6.0.0-7012
 2012-05-04 22:41:18 -07:00
Jeff Tinker
4bd9c25643 Merge "Widevine library update 6.0.0-7012" into jb-dev 2012-05-04 22:36:01 -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
d35a541636 Fix WV CryptoPlugin exports invalid entrypoint 
Change-Id: I812fbdb4035953385166105506be865c1eee6812
related-to-bug: 6440292
 2012-05-03 16:05:45 -07:00
Jean-Baptiste Queru
5b42863796 Merge "liboemcrypto only exists in vendor/ builds" 2012-05-03 06:28:00 -07:00
Jean-Baptiste Queru
85acf5d879 liboemcrypto only exists in vendor/ builds 
Change-Id: I62f7106cbc31015ee382f6901460dd3c46832813
 2012-05-02 18:03:03 -07:00
Jeff Tinker
1eaccb6669 Fix intermittent native fault in Widevine 
Change-Id: I19e0b19eb9e53ca19dea10a46cf286fb091d7542
related-to-bug: 6432496
 2012-05-02 13:10:29 -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
b48d5e3ab9 Merge "Part of fix for build break - missing WVCryptoPlugin.h in full_tuna build" into jb-dev 2012-05-01 17:07:31 -07:00
Jeff Tinker
cb5f8fa7eb Part of fix for build break - missing WVCryptoPlugin.h in full_tuna build 
Change-Id: I7c4212bf2970eddc3c00d6da00af39f73f199964

related-to-bug: 6427841
 2012-05-01 16:54:00 -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
d4241dddd3 Merge "Add CryptoPluginMode to WV extractor" into jb-dev 2012-04-27 08:27:31 -07:00
Andreas Huber
6473768dcb [WVDRM] Support new Java API crypto HAL 
Implements WV crypto plugin core lib build

Change-Id: I4f3fb06a4a9cf7c9c663d3dcee9cfd2c2900ebc2
related-to-bug: 5986621
 2012-04-26 18:11:12 -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
e3e41ac5fd Fix for x86 build error on lunch target vbox_x86-eng 
Excludes widevine drm libs from build for now, will
re-enable when the libs are available.

Change-Id: I51521afd073029bb0e5bcf0d00ea770c2bf18001
 2012-04-12 10:58:05 -07:00
Jeff Tinker
e91ac5af7a Merge "Remove the annoying WVStreamControl version prints from command line test apps" 2012-04-12 09:24:13 -07:00
Jeff Tinker
86ecba13ef Remove the annoying WVStreamControl version prints from command line test apps 
Change-Id: I946c4e62a68b2bf9a10ad957feb9424aa606755e
 2012-04-11 20:30:23 -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
176a13e8cc Merge "Fix for HLS live streaming" into ics-mr1 2012-04-09 22:56:36 -07:00
Jeff Tinker
9a7a7879f1 Merge "Upgrade of Widevine libraries from 4.5.0 to 6.0.0" 2012-04-06 18:11:18 -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
83be76c303 Merge "Fix an intermittent issue with HLS live streaming" 2012-04-05 12:02:45 -07:00
Jeff Tinker
ce5b9f777d Fix for HLS live streaming 
An uninitialized return code was causing intermittent
playback failure during Widevine HLS live playback.

This change supports vendors doing Widevine integration
on their devices from the ICS code base.  It has been
confirmed to resolve the HLS streaming issue by 3
vendors.

Change-Id: Ib5bd1aa92f577a0e759e11cb154359686943a903
related-to-bug: 6277231
 2012-04-05 11:53:38 -07:00
Jeff Tinker
efd3647691 /vendor/widevine portion of removing YouTube-specific error codes 
Multi-repository change. See also update to MediaErrors.h in
a separate CL.

related-to-bug: 5883949

Change-Id: I505486a86a87b690aa13f813f4b88edd386382ce
 2012-04-03 16:09:05 -07:00
Jeff Tinker
ba32a8ddb8 Fix an intermittent issue with HLS live streaming 
An uninitialized return code was causing intermittent
playback failure during Widevine HLS live playback

Change-Id: Ib45176e7f91e2b6ccf0eb4185c6d58d3be0229b4
related-to-bug: 6277231
 2012-04-02 22:10:04 -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
James Dong
e9ff127d78 Makefile change because media and drm header files are relocated 
o related-to-bug: 6214141

Change-Id: I5d5e4169eb05f75c19c1598e05b72e251b2899fb
 2012-03-23 21:51:16 -07:00
Jeff Tinker
c2f46759cc DO NOT MERGE Fix Widevine HLS live streaming 
Change-Id: I566b693f7f0e9a7b7c8111fb654f79bcd927e02d
related-to-bug: 6178393
 2012-03-16 18:22:17 -07:00
Jeff Tinker
f71be04d59 Merge "Fix Widevine HLS live streaming" 2012-03-16 12:15:51 -07:00
Jeff Tinker
c5a49d2e73 Fix Widevine HLS live streaming 
Change-Id: I566b693f7f0e9a7b7c8111fb654f79bcd927e02d
related-to-bug: 6178393
 2012-03-15 17:34:58 -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
8f4420fcea TYPE_ALL_RIGHTS_REMOVED must not be used as an error type. 
related-to-bug: 6060863

Change-Id: I9a3c4724c88dc5a642dfa936843d847a4ae53de3
 2012-03-02 15:06:23 -08:00
Edwin Wong
a4d2b1b37c Change portal used by test-wvplayer. 
related-to-bug: 6030747

Change-Id: I570d126750438f08bfdb0f29c71a6a9b5976c281
 2012-02-28 13:47:56 -08:00
Edwin Wong
96ccef64bb Fixed native crash observed on L3 devices by Jeff Tinker. 
Change-Id: If78b7e9b5b5f4b87c5b2c55f75a00704e8536ce6
related-to-bug: 5952202
 2012-02-08 17:25:29 -08:00
James Dong
bab8ed4582 Move away from MediaDebug and use ADebug instead 
Change-Id: Id904857259a5de0b77f09716315ceb8f665af4e0
 2012-02-08 15:17:27 -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
c3949b1967 Changed license headers from AOSP to Google copyright 
Change-Id: I3587e290cf49755e06354118fbf877d189508ce8
related-to-bug: 5833045
 2012-01-24 15:27:50 -08:00
Jeff Tinker
c634a709f9 am 65d4c7ab: Fix security hole and hang on movie playback 
* commit '65d4c7ab2031833cf82331aa375da0bdec282303':
  Fix security hole and hang on movie playback
 2012-01-23 09:18:02 -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
James Dong
ec3d3d9f47 Remove excessive warning log message from IsWidevineMedia() method 
Change-Id: I0358541c10c9807332579c80a1111074b38a721e
 2012-01-17 10:52:11 -08:00
James Dong
9fd21a7798 Implement WV side of the separation of sniffing and decrypt session initialization. 
Further optimization may be done to further speed up a drm content playback session

related-to-bug: 5725548

Change-Id: Ife69deaf5d2d70bba812fe1a48d9268d8e9530f7
 2012-01-12 16:12:39 -08:00
Steve Block
7284b7e7f3 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I9b2273ef758c78d927591c1a0a9f988de739742c
 2012-01-08 10:17:01 +00:00
Steve Block
b443024341 Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 2012-01-05 14:08:24 -08:00
Jeff Tinker
ddf87803c7 am f66301bd: Report correct decrypted video length to OMX codec 
* commit 'f66301bddb27f6dc5abb0fa0b4d368d7ff6c6840':
  Report correct decrypted video length to OMX codec
 2012-01-04 21:51:51 -08:00
Steve Block
8d8df85113 Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib8dfa140669788229a5a59d5849907c92393225c
 2012-01-04 20:06:42 +00:00
Steve Block
efe632956d Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I2d28198c2fc4622a090f4d830cbb311fe522749c
 2012-01-03 22:33:09 +00:00
Jeff Tinker
f66301bddb Report correct decrypted video length to OMX codec 
Change-Id: I8f869cfbb0ee74d03d1b0cb14c422c4b78b3692d
related-to-bug: 5772593
 2011-12-16 16:10:32 -08:00