Commit Graph

40 Commits

Author SHA1 Message Date
James Dong
79e250e999 If number of audio channels returned is 0, report an error
related-to-bug: 6500580

Change-Id: I55cab0bde30841c31f671d03f99c59d337fea564
2012-05-15 17:54:59 -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
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
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
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
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
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
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
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
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
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
James Dong
444dc2a845 Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
We need to do this because with this patch, SHA/MD5 module may get stuck and cause power consumption regression.

This reverts commit 95d4dc7776.

related-to-bug: 5739618
2011-12-14 11:05:53 -08:00
Jeff Tinker
95d4dc7776 Fix ANRs due to Widevine DRM plugin sniff taking too long.
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

related-to-bug: 5725548

Change-Id: I622e39930f8d243111e4731557b0df17c4e2651d
2011-12-07 21:09:04 -08:00
Edwin Wong
94edc18bde Fixed session not terminated when bandwidth goes below the supported encoded bitrate (preload error).
Change-Id: Ib7bddaaaac7d48df7f18fab0c5d486624abe3119
related-to-bug: 5564453
2011-11-15 09:45:56 -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
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
Jeffrey Tinker
f5fa8f2017 Changes for calling the level 1 decrypt callout
Change-Id: Iccf76b59a64491952ee11ee2ed1a0e707a529f88
2011-10-07 19:25:20 -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
Gloria Wang
0ca8f17a2e Change the DRM error code name
Merge to master

Change-Id: I9851b24b5327476e1c20c13ab166bc3fc0f98eb9
2011-06-27 10:26:20 -07:00
Jeff Tinker
61cf3d5049 am 77856588: Merge "Fixed 4515636: Playback stops short of end of video." into honeycomb-mr2
* commit '77856588ceebe02b72968c2e157b1c387ac7b6fa':
  Fixed 4515636: Playback stops short of end of video.
2011-06-09 13:42:28 -07:00
Edwin Wong
bc9604da1f Fixed 4515636: Playback stops short of end of video.
Change-Id: I798fe266fa2fb09ed37e6cb559d87111c9e33639
2011-06-08 18:10:29 -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
fda2f64112 am 8c5545ef: Merge "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 "licens
* commit '8c5545ef76f39094b016986c7deec02df682356d':
  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"
2011-05-24 12:57:28 -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
Gloria Wang
50c2a6b0d8 Change the DRM error code name
DO NOT MERGE

Change-Id: I9851b24b5327476e1c20c13ab166bc3fc0f98eb9
2011-05-13 15:11:40 -07:00
Jeffrey Tinker
767717376d am 18617b93: fix for b/4126624 Widevine DRM client not sending heartbeats
* commit '18617b93c67b87bd4b8a6eb5e5d0c6e23fe82d32':
  fix for b/4126624 Widevine DRM client not sending heartbeats
2011-03-25 14:54:18 -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
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
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
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