Commit Graph

119 Commits

Author SHA1 Message Date
Ying Wang
e36b59b8d3 Use board config variable BOARD_WIDEVINE_OEMCRYPTO_LEVEL
Instead of grepping out the oemcrypto level from PRODUCT_PACKAGES, which
is very fragile.

Change-Id: I1ac5b8ace25dd4798d3383304f01496f12193526
2012-06-05 14:29:27 -07:00
Fred Gylys-Colwell
b8dbc29f7a am 87718450: Fix Show Rights for HLS content
* commit '87718450ac16621b17ec1cda9e3695b6d1f05b5c':
  Fix Show Rights for HLS content
2012-05-17 20:56:54 -07:00
Fred Gylys-Colwell
87718450ac Fix Show Rights for HLS content
In WVMDrmPlugin.cpp, the supported suffixes was only .wvm.  I changed this to
include .m3u8, .vob, .smil, and the empty extension.  This allows the
WVMDrmPlugin to register itself as handling these files.  If the plugin is not
registered, the "show rights" feature will not query the plugin.

related-to-bug: 6507440

Change-Id: Ib655760e46cfa4125d21beb9ff77e38b444ddc5a
2012-05-16 17:38:21 -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
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
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
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
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
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
4b10b77fa1 am 444dc2a8: 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.
* commit '444dc2a84539f100689642f5756e5e6d6e5cd705':
  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.
2011-12-14 13:53:32 -08: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
e6aa26e7cf am c00a26a0: Fix OMX codec error playing Widevine content on Nexus S
* commit 'c00a26a05f59c352dc457a211284dc2c697ae2fd':
  Fix OMX codec error playing Widevine content on Nexus S
2011-12-12 15:39:25 -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
Jeff Tinker
e314afcb95 am 95d4dc77: Fix ANRs due to Widevine DRM plugin sniff taking too long.
* commit '95d4dc7776b0202f22bd743e1e2b86a444a247a3':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
2011-12-09 14:25:42 -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
b2ecb1899e am e8951bc6: Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244
* commit 'e8951bc6843f66da6a8eae106c54e7a4d22904e9':
  Fixed 5207482, 5414035, 5489515 and 5489833; increase delay before converting 2014 warning to error Include Widevine library version 4.5.0.5244
2011-11-13 16:27:59 -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
2f6a27e20f am d8e21430: Merge "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." into ics-mr1
* commit 'd8e2143022157c44465bae4d124642db540332fa':
  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.
2011-11-10 19:39:25 +00:00
Edwin Wong
d8e2143022 Merge "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." into ics-mr1 2011-11-10 07:09:58 -08:00
Jeff Tinker
b860f7ab7e am 5fe2e2fd: Upload Ed Schacker\'s fix for ANR on expired assets
* commit '5fe2e2fdb759b4102a1614e761a0db8eecc3aa27':
  Upload Ed Schacker's fix for ANR on expired assets
2011-11-09 14:34:20 +00:00
Jeff Tinker
5fe2e2fdb7 Upload Ed Schacker's fix for ANR on expired assets
Bug: 5207528
Change-Id: I59b531d744da2046bb0698c4e45f031c3c476114
2011-11-01 10:16:50 -07: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
6482fc3269 am 80daed61: am 82d675f1: [DRM] Terminate HTTPClient thread after content type sniff
* commit '80daed61a501498eb237a492d55441062132a518':
  [DRM] Terminate HTTPClient thread after content type sniff
2011-10-26 15:27:19 +00: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
Steve Block
1f5802779b Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: Ief4bbf031cabfd10f23082d57a7608f01b8229c1
2011-10-25 18:17:14 +01:00
Jeff Tinker
c2f26b79d4 Merge "Include a dummy jar in widevine distribution." 2011-10-20 09:57:00 -07:00
James Dong
f27dd7f355 am ddf12aa7: Merge "Fix segfault during Widevine playback on switch between .wvm and live" into ics-mr0
* commit 'ddf12aa7a6c4680a926a6adf53044c63d79c83bd':
  Fix segfault during Widevine playback on switch between .wvm and live
2011-10-20 01:52:55 -07:00
James Dong
ddf12aa7a6 Merge "Fix segfault during Widevine playback on switch between .wvm and live" into ics-mr0 2011-10-20 01:49:10 -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
Bryan Mawhinney
163d39278f Include a dummy jar in widevine distribution.
This suppresses the errors currently caused by
uses-library pointing to a .so

Bug: 4553918
Change-Id: I646456facae908c7937d4768010aef88d7389eee
2011-10-20 00:53:28 -07:00
Bryan Mawhinney
e8ab892b7e Include a dummy jar in widevine distribution.
This suppresses the errors currently caused by
uses-library pointing to a .so

Already submitted to master

DO NOT MERGE

Bug: 4553918
Change-Id: I646456facae908c7937d4768010aef88d7389eee
2011-10-20 00:49:08 -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