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

7812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Automerger
c3e2d78d47 merge in jb-release history after reset to master 2012-04-16 07:09:48 -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
The Android Automerger
12c9dc9c7a merge in jb-release history after reset to master 2012-04-12 07:09:35 -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
791becda35 Merge "[WVDRM] Reorg of binary libs into proc-specific folders" 2012-04-11 14:43:27 -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
2ed002aded am 39c68596: am 176a13e8: Merge "Fix for HLS live streaming" into ics-mr1 
* commit '39c685965741638e3561fe2423b8861984f2a7f1':
  Fix for HLS live streaming
 2012-04-09 23:03:21 -07:00
Jeff Tinker
39c6859657 am 176a13e8: Merge "Fix for HLS live streaming" into ics-mr1 
* commit '176a13e8ccdaad196c1f738e89bdcbfc0fc90c80':
  Fix for HLS live streaming
 2012-04-09 23:00:57 -07:00
Jeff Tinker
176a13e8cc Merge "Fix for HLS live streaming" into ics-mr1 2012-04-09 22:56:36 -07:00
The Android Automerger
41f33fd4ca merge in jb-release history after reset to master 2012-04-09 07:13:34 -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
The Android Automerger
21db240a97 merge in jb-release history after reset to master 2012-04-05 07:12:21 -07:00
Jeff Tinker
e612ce59c4 Merge "/vendor/widevine portion of removing YouTube-specific error codes" 2012-04-04 10:17:10 -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
Mike Lockwood
b12c4a93f4 Merge remote-tracking branch 'goog/ics-aah' 2012-04-03 10:15:22 -07:00
The Android Automerger
833a68a434 merge in jb-release history after reset to master 2012-04-03 03:39:35 -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
The Android Automerger
b139e89759 merge in jb-release history after reset to master 2012-03-29 08:24:40 -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
79b8865e2c am c2f46759: (-s ours) DO NOT MERGE Fix Widevine HLS live streaming 
* commit 'c2f46759cc93e993100eb49f7c70b154e8ce033f':
  DO NOT MERGE Fix Widevine HLS live streaming
 2012-03-20 19:35:41 -07:00
The Android Automerger
9f4c07788d merge in jb-release history after reset to master 2012-03-19 07:11:01 -07:00
Jeff Tinker
df111fecda am c2f46759: DO NOT MERGE Fix Widevine HLS live streaming 
* commit 'c2f46759cc93e993100eb49f7c70b154e8ce033f':
  DO NOT MERGE Fix Widevine HLS live streaming
 2012-03-16 18:54:05 -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
The Android Automerger
e1ce674d7b merge in jb-release history after reset to master 2012-03-12 07:11:00 -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
The Android Automerger
37ce87816a merge in jb-release history after reset to master 2012-03-06 07:08:52 -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
The Android Automerger
47aa998760 merge in jb-release history after reset to master 2012-02-29 07:08:37 -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
The Android Automerger
36d4620a9c merge in jb-release history after reset to master 2012-02-13 09:05:25 -08:00
The Android Automerger
885dc27023 merge in jb-release history after reset to master 2012-02-09 07:05:29 -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
The Android Automerger
5c13341b43 merge in jb-release history after reset to master 2012-01-30 07:06:57 -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
The Android Automerger
9a8f1ac37f merge in ics-release history after reset to master 2012-01-24 07:02:15 -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
d3c089fe70 am 65d4c7ab: Fix security hole and hang on movie playback 
* commit '65d4c7ab2031833cf82331aa375da0bdec282303':
  Fix security hole and hang on movie playback
 2012-01-20 12:08:59 -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
The Android Automerger
65ba93bcd1 merge in ics-release history after reset to master 2012-01-18 07:02:15 -08:00