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

40 Commits

Author SHA1 Message Date
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
1eaccb6669 Fix intermittent native fault in Widevine 
Change-Id: I19e0b19eb9e53ca19dea10a46cf286fb091d7542
related-to-bug: 6432496
 2012-05-02 13:10:29 -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
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
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
c5a49d2e73 Fix Widevine HLS live streaming 
Change-Id: I566b693f7f0e9a7b7c8111fb654f79bcd927e02d
related-to-bug: 6178393
 2012-03-15 17:34:58 -07:00
James Dong
bab8ed4582 Move away from MediaDebug and use ADebug instead 
Change-Id: Id904857259a5de0b77f09716315ceb8f665af4e0
 2012-02-08 15:17:27 -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
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
Jeffrey Tinker
f5fa8f2017 Changes for calling the level 1 decrypt callout 
Change-Id: Iccf76b59a64491952ee11ee2ed1a0e707a529f88
 2011-10-07 19:25:20 -07:00
Edwin Wong
6aaee145d8 Additional changes for b/5081725 as per code review by Jeff Tinker. Missed allocating buffer for HLS case. 
BUG: 5081725

Change-Id: I21439a5dcce38102a943ade966b5fa79f3d1a686
 2011-09-12 14:07:45 -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
Jeff Tinker
ba335957e9 Widevine extractor changes to support secure media buffer playback. 
Supports either secure or insecure buffer configurations, depending
on the build-time flag REQUIRE_SECURE_BUFFERS.

Change-Id: I5b8150315eced4ed9be656b73d91485a6216819d
 2011-06-30 15:47:43 -07:00
Jeffrey Tinker
40d160cc3f am 66d9ff5f: Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive) 
* commit '66d9ff5fb5f99ba77e02a4719e4c65aec2aa8c4a':
  Fix for 4198445 HC - Support for Widevine Live Streaming (adaptive)
 2011-06-02 13:58:08 -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
Jeffrey Tinker
bf52c8873a am e262a49b: Merge "Fix for b/4279535 Seeking in a video causes it to start form beginning" into honeycomb-mr1 
* commit 'e262a49b8dd85317efad07cfe17abc2b71d3caad':
  Fix for b/4279535 Seeking in a video causes it to start form beginning
 2011-04-28 13:04:56 -07:00
Jeffrey Tinker
e7768d52b0 Fix for b/4279535 Seeking in a video causes it to start form beginning 
Use a longer timeout than normal when seeking

Change-Id: I8c1306818e5fffefc15c33bd4f412f9346e8dc7e
 2011-04-27 19:31:18 -07:00
Jeffrey Tinker
cc09fa33d4 am 88aa52ff: Merge "Implement new heartbeat error codes" into honeycomb-mr1 
* commit '88aa52ffdfbb40fcd29059011259a3ba76e51e1d':
  Implement new heartbeat error codes
 2011-04-27 12:28:57 -07:00
Jeffrey Tinker
a6758ad20e Implement new heartbeat error codes 
Related to defect b/4322415

Change-Id: I2bd41e70dcb64a03a94b3770732149a6f2489a8e
 2011-04-27 11:14:13 -07:00
Jeffrey Tinker
68d1266b52 am c78c1461: Merge "Partial fix for 4181654 hang in seeking after seeking to the end" into honeycomb-mr1 
* commit 'c78c1461df1e5b36374bb6f5a1da2090a5baba88':
  Partial fix for 4181654 hang in seeking after seeking to the end
 2011-03-30 16:33:34 -07:00
Jeffrey Tinker
f9eea89828 Partial fix for 4181654 hang in seeking after seeking to the end 
Also prevents player from becoming unresponsive as described in 3510047.

Change-Id: I3350990c46641e48c34e9a64598157c8af77dcc5
 2011-03-29 08:32:29 -07:00
Jeffrey Tinker
a39b73cec3 am ba5fa0ef: Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes Also includes b/3500025: A/V resync issues 
* commit 'ba5fa0ef570f6ca3524f8158a23371528930f0fc':
  Fixes for b/4149416:expired license refresh, b/4126624:heartbeats, b/4171055: inconsistent license modes Also includes b/3500025: A/V resync issues
 2011-03-25 10:13:54 -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
d0eca66cc7 am 1dd66696: Merge "Fix for b/3504638 wv - when the Widevine client receives a stop play response from the heartbeat need an error event to pass to app" into honeycomb-mr1 
* commit '1dd666966d64c42f9e8d78424506eaf44071ed03':
  Fix for b/3504638 wv - when the Widevine client receives a stop play response from the heartbeat need an error event to pass to app
 2011-03-16 14:40:00 -07:00
Jeffrey Tinker
656ec45728 Fix for b/3504638 wv - when the Widevine client receives a stop play response from the heartbeat need an error event to pass to app 
Change-Id: I6d0635e791c0b8537318c47113d533841a1e5555
 2011-03-15 23:49:31 -07:00
Jeffrey Tinker
2d1694854c am 3a1e0f37: Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757). Also 3481645 - log spam and 3302187 - error handling 
* commit '3a1e0f3768f8c586700c00ac3b6a2a5f00cb32b5':
  Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757).  Also 3481645 -  log spam and 3302187 - error handling
 2011-03-14 17:45:50 -07:00
Jeffrey Tinker
3a1e0f3768 Integration with moto secure keybox storage and add obfuscation of security-related symbols (3513413, 4083757). Also 3481645 - log spam and 3302187 - error handling 
Change-Id: Ic11ed7ad57717e88b6f0f2991d8bbb9e1251d546
 2011-03-11 14:10:43 -08:00
Gloria Wang
14761c80a9 Fix for bug 3477330 
This patch fixs a crash bug caused by using a NULL DecryptHandle pointer in the DRM Framework.
Fix by using sp<DecryptHandle> instead.

Change-Id: I1355d4719857ab64ad6cd12803fcf19e45bb50a0
 2011-03-10 14:32:11 -08:00
Gloria Wang
c78f4380f9 To return correct status in WVMMediaSource::start() and WVMMediaSource::stop() 
Change-Id: I09db9ba58a4e375128bb3b60bd375b887e11ac05
 2011-02-22 10:59:19 -08:00
Gloria Wang
0f9922ff77 Move all Widevine code which have dependency on vendor modules from framework/base to vendor/widevine 
Change-Id: I2b43e90c279391436f1bbb18ebd64961bec4f9ee
 2011-02-18 22:52:12 -08:00